[6.x] Added support for separation between geometry and geography types (#30545)

* Added support for separation between geometry and geography types when using postgres with postgis-created types

* StyleCI fix

* StyleCI fix

* Refactored to use nested conditionals with an early return

* Refactored to be non-breaking and use the isGeometry fluent property, and cleaned logic

* StyleCI

* Update PostgresGrammar.php

Author: raymondtri

src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php

@@ -788,7 +788,7 @@ protected function typeMacAddress(Fluent $column)
      */
     protected function typeGeometry(Fluent $column)
     {
-        return $this->formatPostGisType('geometry');
+        return $this->formatPostGisType('geometry', $column);
     }
 
     /**
@@ -799,7 +799,7 @@ protected function typeGeometry(Fluent $column)
      */
     protected function typePoint(Fluent $column)
     {
-        return $this->formatPostGisType('point');
+        return $this->formatPostGisType('point', $column);
     }
 
     /**
@@ -810,7 +810,7 @@ protected function typePoint(Fluent $column)
      */
     protected function typeLineString(Fluent $column)
     {
-        return $this->formatPostGisType('linestring');
+        return $this->formatPostGisType('linestring', $column);
     }
 
     /**
@@ -821,7 +821,7 @@ protected function typeLineString(Fluent $column)
      */
     protected function typePolygon(Fluent $column)
     {
-        return $this->formatPostGisType('polygon');
+        return $this->formatPostGisType('polygon', $column);
     }
 
     /**
@@ -832,7 +832,7 @@ protected function typePolygon(Fluent $column)
      */
     protected function typeGeometryCollection(Fluent $column)
     {
-        return $this->formatPostGisType('geometrycollection');
+        return $this->formatPostGisType('geometrycollection', $column);
     }
 
     /**
@@ -843,7 +843,7 @@ protected function typeGeometryCollection(Fluent $column)
      */
     protected function typeMultiPoint(Fluent $column)
     {
-        return $this->formatPostGisType('multipoint');
+        return $this->formatPostGisType('multipoint', $column);
     }
 
     /**
@@ -854,7 +854,7 @@ protected function typeMultiPoint(Fluent $column)
      */
     public function typeMultiLineString(Fluent $column)
     {
-        return $this->formatPostGisType('multilinestring');
+        return $this->formatPostGisType('multilinestring', $column);
     }
 
     /**
@@ -865,7 +865,7 @@ public function typeMultiLineString(Fluent $column)
      */
     protected function typeMultiPolygon(Fluent $column)
     {
-        return $this->formatPostGisType('multipolygon');
+        return $this->formatPostGisType('multipolygon', $column);
     }
 
     /**
@@ -876,18 +876,23 @@ protected function typeMultiPolygon(Fluent $column)
      */
     protected function typeMultiPolygonZ(Fluent $column)
     {
-        return $this->formatPostGisType('multipolygonz');
+        return $this->formatPostGisType('multipolygonz', $column);
     }
 
     /**
      * Format the column definition for a PostGIS spatial type.
      *
      * @param  string  $type
+     * @param  \Illuminate\Support\Fluent  $column
      * @return string
      */
-    private function formatPostGisType(string $type)
+    private function formatPostGisType(string $type, Fluent $column)
     {
-        return "geography($type, 4326)";
+        if ($column->isGeometry !== null) {
+            return "geometry($type".($column->projection === null ? '' : ", $column->projection").')';
+        }
+
+        return "geography($type, ".($column->projection ?? '4326').')';
     }
 
     /**