Commit 59f4e3a

committed

Support MariaDB by removing 3rd parameter to ST_GeomFromText

MySQL allows 3 parameters, MariaDB only two: - https://dev.mysql.com/doc/refman/8.4/en/gis-wkt-functions.html#function_st-geomfromtext - https://mariadb.com/kb/en/st_geomfromtext/ Related: grimzy#152 Related: grimzy#138

1 parent 8989d93 commit 59f4e3aCopy full SHA for 59f4e3a

File tree

2 files changed

-9

lines changed

src/Eloquent
- SpatialExpression.php
- SpatialTrait.php

2 files changed

-9

lines changed

`‎src/Eloquent/SpatialExpression.php`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class SpatialExpression extends Expression`
`9`	`9`	`{`
`10`	`10`	`public function getValue(Grammar $grammar)`
`11`	`11`	`{`
`12`		`- return "ST_GeomFromText(?, ?, 'axis-order=long-lat')";`
	`12`	`+ return "ST_GeomFromText(?, ?)";`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`public function getSpatialValue()`

`‎src/Eloquent/SpatialTrait.php`

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ public function scopeDistance($query, $geometryColumn, $geometry, $distance)`
`134`	`134`	`{`
`135`	`135`	`$this->isColumnAllowed($geometryColumn);`
`136`	`136`
`137`		- $query->whereRaw("st_distance(`$geometryColumn`, ST_GeomFromText(?, ?, 'axis-order=long-lat')) <= ?", [
	`137`	+ $query->whereRaw("st_distance(`$geometryColumn`, ST_GeomFromText(?,?)) <= ?", [
`138`	`138`	`$geometry->toWkt(),`
`139`	`139`	`$geometry->getSrid(),`
`140`	`140`	`$distance,`
`@@ -149,7 +149,7 @@ public function scopeDistanceExcludingSelf($query, $geometryColumn, $geometry, $`
`149`	`149`
`150`	`150`	`$query = $this->scopeDistance($query, $geometryColumn, $geometry, $distance);`
`151`	`151`
`152`		- $query->whereRaw("st_distance(`$geometryColumn`, ST_GeomFromText(?, ?, 'axis-order=long-lat')) != 0", [
	`152`	+ $query->whereRaw("st_distance(`$geometryColumn`, ST_GeomFromText(?,?)) != 0", [
`153`	`153`	`$geometry->toWkt(),`
`154`	`154`	`$geometry->getSrid(),`
`155`	`155`	`]);`
`@@ -167,7 +167,7 @@ public function scopeDistanceValue($query, $geometryColumn, $geometry)`
`167`	`167`	`$query->select('*');`
`168`	`168`	`}`
`169`	`169`
`170`		- $query->selectRaw("st_distance(`$geometryColumn`, ST_GeomFromText(?, ?, 'axis-order=long-lat')) as distance", [
	`170`	+ $query->selectRaw("st_distance(`$geometryColumn`, ST_GeomFromText(?,?)) as distance", [
`171`	`171`	`$geometry->toWkt(),`
`172`	`172`	`$geometry->getSrid(),`
`173`	`173`	`]);`
`@@ -177,7 +177,7 @@ public function scopeDistanceSphere($query, $geometryColumn, $geometry, $distanc`
`177`	`177`	`{`
`178`	`178`	`$this->isColumnAllowed($geometryColumn);`
`179`	`179`
`180`		- $query->whereRaw("st_distance_sphere(`$geometryColumn`, ST_GeomFromText(?, ?, 'axis-order=long-lat')) <= ?", [
	`180`	+ $query->whereRaw("st_distance_sphere(`$geometryColumn`, ST_GeomFromText(?,?)) <= ?", [
`181`	`181`	`$geometry->toWkt(),`
`182`	`182`	`$geometry->getSrid(),`
`183`	`183`	`$distance,`
`@@ -192,7 +192,7 @@ public function scopeDistanceSphereExcludingSelf($query, $geometryColumn, $geome`
`192`	`192`
`193`	`193`	`$query = $this->scopeDistanceSphere($query, $geometryColumn, $geometry, $distance);`
`194`	`194`
`195`		`- $query->whereRaw("st_distance_sphere($geometryColumn, ST_GeomFromText(?, ?, 'axis-order=long-lat')) != 0", [`
	`195`	`+ $query->whereRaw("st_distance_sphere($geometryColumn, ST_GeomFromText(?,?)) != 0", [`
`196`	`196`	`$geometry->toWkt(),`
`197`	`197`	`$geometry->getSrid(),`
`198`	`198`	`]);`
`@@ -209,7 +209,7 @@ public function scopeDistanceSphereValue($query, $geometryColumn, $geometry)`
`209`	`209`	`if (!$columns) {`
`210`	`210`	`$query->select('*');`
`211`	`211`	`}`
`212`		- $query->selectRaw("st_distance_sphere(`$geometryColumn`, ST_GeomFromText(?, ?, 'axis-order=long-lat')) as distance", [
	`212`	+ $query->selectRaw("st_distance_sphere(`$geometryColumn`, ST_GeomFromText(?,?)) as distance", [
`213`	`213`	`$geometry->toWkt(),`
`214`	`214`	`$geometry->getSrid(),`
`215`	`215`	`]);`
`@@ -223,7 +223,7 @@ public function scopeComparison($query, $geometryColumn, $geometry, $relationshi`
`223`	`223`	`throw new UnknownSpatialRelationFunction($relationship);`
`224`	`224`	`}`
`225`	`225`
`226`		- $query->whereRaw("st_{$relationship}(`$geometryColumn`, ST_GeomFromText(?, ?, 'axis-order=long-lat'))", [
	`226`	+ $query->whereRaw("st_{$relationship}(`$geometryColumn`, ST_GeomFromText(?,?))", [
`227`	`227`	`$geometry->toWkt(),`
`228`	`228`	`$geometry->getSrid(),`
`229`	`229`	`]);`
`@@ -279,7 +279,7 @@ public function scopeOrderBySpatial($query, $geometryColumn, $geometry, $orderFu`
`279`	`279`	`throw new UnknownSpatialFunctionException($orderFunction);`
`280`	`280`	`}`
`281`	`281`
`282`		- $query->orderByRaw("st_{$orderFunction}(`$geometryColumn`, ST_GeomFromText(?, ?, 'axis-order=long-lat')) {$direction}", [
	`282`	+ $query->orderByRaw("st_{$orderFunction}(`$geometryColumn`, ST_GeomFromText(?, ?)) {$direction}", [
`283`	`283`	`$geometry->toWkt(),`
`284`	`284`	`$geometry->getSrid(),`
`285`	`285`	`]);`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 59f4e3a

File tree

2 files changed

2 files changed

`‎src/Eloquent/SpatialExpression.php`

`‎src/Eloquent/SpatialTrait.php`

0 commit comments