bugfix for postgis detection

mevdschee · mevdschee · commit 73e2d88e6ead · 2017-04-16T01:50:35.000+02:00
diff --git a/tests/MysqlTest.php b/tests/MysqlTest.php
@@ -92,7 +92,7 @@ public function seedDatabase($db, $capabilities)
         $contents = file_get_contents($fixture);
 
         if (!($capabilities & self::GIS)) {
-            $contents = preg_replace('/(POINT|POLYGON) NOT NULL/i', 'text NOT NULL', $contents);
+            $contents = preg_replace('/(POINT|POLYGON)( NOT)? NULL/i', 'text\2 NULL', $contents);
             $contents = preg_replace('/ST_GeomFromText/i', 'concat', $contents);
         }
         if (!($capabilities & self::JSON)) {
diff --git a/tests/PostgresqlTest.php b/tests/PostgresqlTest.php
@@ -93,7 +93,7 @@ public function seedDatabase($db, $capabilities)
         $contents = file_get_contents($fixture);
 
         if (!($capabilities & self::GIS)) {
-            $contents = preg_replace('/(geometry) NOT NULL/i', 'text NOT NULL', $contents);
+            $contents = preg_replace('/(geometry)( NOT)? NULL/i', 'text\2 NULL', $contents);
             $contents = preg_replace('/ST_GeomFromText/i', 'concat', $contents);
             $contents = preg_replace('/CREATE EXTENSION IF NOT EXISTS postgis;/i', '', $contents);
         }

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public function seedDatabase($db, $capabilities)`
`92`	`92`	`$contents = file_get_contents($fixture);`
`93`	`93`
`94`	`94`	`if (!($capabilities & self::GIS)) {`
`95`		`- $contents = preg_replace('/(POINT\|POLYGON) NOT NULL/i', 'text NOT NULL', $contents);`
	`95`	`+ $contents = preg_replace('/(POINT\|POLYGON)( NOT)? NULL/i', 'text\2 NULL', $contents);`
`96`	`96`	`$contents = preg_replace('/ST_GeomFromText/i', 'concat', $contents);`
`97`	`97`	`}`
`98`	`98`	`if (!($capabilities & self::JSON)) {`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public function seedDatabase($db, $capabilities)`
`93`	`93`	`$contents = file_get_contents($fixture);`
`94`	`94`
`95`	`95`	`if (!($capabilities & self::GIS)) {`
`96`		`- $contents = preg_replace('/(geometry) NOT NULL/i', 'text NOT NULL', $contents);`
	`96`	`+ $contents = preg_replace('/(geometry)( NOT)? NULL/i', 'text\2 NULL', $contents);`
`97`	`97`	`$contents = preg_replace('/ST_GeomFromText/i', 'concat', $contents);`
`98`	`98`	`$contents = preg_replace('/CREATE EXTENSION IF NOT EXISTS postgis;/i', '', $contents);`
`99`	`99`	`}`