[6.x] Improve formatPostGisType method readability (#30593)

* Improve readability * Improve geography type readability
laravel · Nov 15, 2019 · b12f4be · b12f4be
1 parent 274020b
commit b12f4be
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php b/src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php
@@ -888,11 +888,15 @@ protected function typeMultiPolygonZ(Fluent $column)
      */
     private function formatPostGisType(string $type, Fluent $column)
     {
-        if ($column->isGeometry !== null) {
-            return "geometry($type".($column->projection === null ? '' : ", $column->projection").')';
+        if ($column->isGeometry === null) {
+            return sprintf('geography(%s, %s)', $type, $column->projection ?? '4326');
         }
 
-        return "geography($type, ".($column->projection ?? '4326').')';
+        if ($column->projection !== null) {
+            return sprintf('geometry(%s, %s)', $type, $column->projection);
+        }
+
+        return "geometry({$type})";
     }
 
     /**