2626use Utopia \Database \Operator ;
2727use Utopia \Database \OperatorType ;
2828use Utopia \Database \Query ;
29- use Utopia \Database \Relationship ;
3029use Utopia \Database \RelationSide ;
3130use Utopia \Database \RelationType ;
3231use Utopia \Query \Builder \PostgreSQL as PostgreSQLBuilder ;
@@ -1427,7 +1426,7 @@ protected function getOperatorUpsertExpression(string $column, Operator $operato
14271426 *
14281427 * @param array<string, mixed> $binds
14291428 */
1430- protected function handleDistanceSpatialQueries (Query $ query , array &$ binds , string $ attribute , string $ alias , string $ placeholder ): string
1429+ protected function handleDistanceSpatialQueries (Query $ query , array &$ binds , string $ attribute , string $ type , string $ alias , string $ placeholder ): string
14311430 {
14321431 /** @var array<mixed> $distanceParams */
14331432 $ distanceParams = $ query ->getValues ()[0 ];
@@ -1461,7 +1460,7 @@ protected function handleDistanceSpatialQueries(Query $query, array &$binds, str
14611460 *
14621461 * @param array<string, mixed> $binds
14631462 */
1464- protected function handleSpatialQueries (Query $ query , array &$ binds , string $ attribute , string $ alias , string $ placeholder ): string
1463+ protected function handleSpatialQueries (Query $ query , array &$ binds , string $ attribute , string $ type , string $ alias , string $ placeholder ): string
14651464 {
14661465 $ spatialGeomRaw = $ query ->getValues ()[0 ];
14671466 $ binds [": {$ placeholder }_0 " ] = $ this ->convertArrayToWKT (\is_array ($ spatialGeomRaw ) ? $ spatialGeomRaw : []);
@@ -1473,7 +1472,7 @@ protected function handleSpatialQueries(Query $query, array &$binds, string $att
14731472 Method::DistanceEqual,
14741473 Method::DistanceNotEqual,
14751474 Method::DistanceGreaterThan,
1476- Method::DistanceLessThan => $ this ->handleDistanceSpatialQueries ($ query , $ binds , $ attribute , $ alias , $ placeholder ),
1475+ Method::DistanceLessThan => $ this ->handleDistanceSpatialQueries ($ query , $ binds , $ attribute , $ type , $ alias , $ placeholder ),
14771476 Method::Equal => "ST_Equals( {$ alias }. {$ attribute }, {$ geom }) " ,
14781477 Method::NotEqual => "NOT ST_Equals( {$ alias }. {$ attribute }, {$ geom }) " ,
14791478 Method::Intersects => "ST_Intersects( {$ alias }. {$ attribute }, {$ geom }) " ,
@@ -1567,7 +1566,7 @@ protected function getSQLCondition(Query $query, array &$binds): string
15671566 $ operator = null ;
15681567
15691568 if ($ query ->isSpatialAttribute ()) {
1570- return $ this ->handleSpatialQueries ($ query , $ binds , $ attribute , $ alias , $ placeholder );
1569+ return $ this ->handleSpatialQueries ($ query , $ binds , $ attribute , $ query -> getAttributeType (), $ alias , $ placeholder );
15711570 }
15721571
15731572 if ($ query ->isObjectAttribute () && ! $ isNestedObjectAttribute ) {
0 commit comments