From 4b101677eb35c095a49628b371a7d71fc251dea1 Mon Sep 17 00:00:00 2001 From: antonkomarev Date: Thu, 14 Nov 2019 19:06:16 +0300 Subject: [PATCH 1/2] Improve readability --- src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php b/src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php index 470cbe7462ae..f76f48cd3dcd 100755 --- a/src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php +++ b/src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php @@ -889,10 +889,10 @@ protected function typeMultiPolygonZ(Fluent $column) private function formatPostGisType(string $type, Fluent $column) { if ($column->isGeometry !== null) { - return "geometry($type".($column->projection === null ? '' : ", $column->projection").')'; + return sprintf('geometry(%s%s)', $type, $column->projection === null ? '' : ", {$column->projection}"); } - return "geography($type, ".($column->projection ?? '4326').')'; + return sprintf('geography(%s, %s)', $type, $column->projection ?? '4326'); } /** From 08e3469ceb3d09968b1f3af92b2d5d3c43ff6c95 Mon Sep 17 00:00:00 2001 From: antonkomarev Date: Thu, 14 Nov 2019 19:14:01 +0300 Subject: [PATCH 2/2] Improve geography type readability --- .../Database/Schema/Grammars/PostgresGrammar.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php b/src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php index f76f48cd3dcd..52762192959c 100755 --- 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 sprintf('geometry(%s%s)', $type, $column->projection === null ? '' : ", {$column->projection}"); + if ($column->isGeometry === null) { + return sprintf('geography(%s, %s)', $type, $column->projection ?? '4326'); } - return sprintf('geography(%s, %s)', $type, $column->projection ?? '4326'); + if ($column->projection !== null) { + return sprintf('geometry(%s, %s)', $type, $column->projection); + } + + return "geometry({$type})"; } /**