fix(graphile-postgis): emit ST_<op>(owner, target) — directional operand order

Tag grammar reads as '<owner_col> <op> <target_col>' so the PostGIS call must be ST_<op>(owner, target). Symmetric operators hid the bug; st_within/st_contains/st_covers/st_coveredby inverted the match set. Also corrects test filter operator name to equalTo (graphile idiom) instead of eq.

Author: pyramation

graphile/graphile-postgis/src/plugins/spatial-relations.ts

@@ -446,11 +446,17 @@ function buildSpatialJoinFragment(
   innerAlias: SQL,
   distanceValue: SQL | null
 ): SQL {
-  const inner = sql`${innerAlias}.${sql.identifier(rel.targetAttributeName)}`;
-  const outer = sql`${outerAlias}.${sql.identifier(rel.ownerAttributeName)}`;
+  // Tag grammar reads as "<owner_col> <op> <target_col>" (e.g. "location
+  // st_within counties.geom"), so the emitted PostGIS call is always
+  // `ST_<op>(owner_col, target_col)`. For symmetric operators
+  // (st_intersects, st_dwithin, st_equals, &&) the ordering is immaterial;
+  // for directional ones (st_within, st_contains, st_covers, st_coveredby)
+  // reversing the operands inverts the set of matched rows.
+  const ownerExpr = sql`${outerAlias}.${sql.identifier(rel.ownerAttributeName)}`;
+  const targetExpr = sql`${innerAlias}.${sql.identifier(rel.targetAttributeName)}`;
   if (rel.operator.kind === 'infix') {
-    // Only `&&` today — simple inline.
-    return sql`${inner} && ${outer}`;
+    // Only `&&` today — simple inline (symmetric).
+    return sql`${ownerExpr} && ${targetExpr}`;
   }
   const fn = sql.identifier(schemaName, rel.operator.pgToken);
   if (rel.operator.parametric) {
@@ -461,9 +467,9 @@ function buildSpatialJoinFragment(
         `a distance value in spatial relation '${rel.relationName}'.`
       );
     }
-    return sql`${fn}(${inner}, ${outer}, ${distanceValue})`;
+    return sql`${fn}(${ownerExpr}, ${targetExpr}, ${distanceValue})`;
   }
-  return sql`${fn}(${inner}, ${outer})`;
+  return sql`${fn}(${ownerExpr}, ${targetExpr})`;
 }
 
 /** Build the `other.pk <> self.pk` exclusion predicate for self-relations. */

graphql/orm-test/__tests__/postgis-spatial-relations.test.ts

@@ -164,7 +164,7 @@ describe('PostgisSpatialRelationsPlugin (ORM, live PG)', () => {
       const r = await orm.telemedicineClinic
         .findMany({
           select: { id: true, name: true },
-          where: { county: { some: { name: { eq: 'Bay County' } } } },
+          where: { county: { some: { name: { equalTo: 'Bay County' } } } },
         })
         .execute();
       expect(r.ok).toBe(true);
@@ -177,7 +177,7 @@ describe('PostgisSpatialRelationsPlugin (ORM, live PG)', () => {
       const r = await orm.telemedicineClinic
         .findMany({
           select: { id: true },
-          where: { county: { some: { name: { eq: 'LA County' } } } },
+          where: { county: { some: { name: { equalTo: 'LA County' } } } },
         })
         .execute();
       expect(r.ok).toBe(true);
@@ -188,7 +188,7 @@ describe('PostgisSpatialRelationsPlugin (ORM, live PG)', () => {
       const r = await orm.telemedicineClinic
         .findMany({
           select: { id: true },
-          where: { county: { some: { name: { eq: 'NYC County' } } } },
+          where: { county: { some: { name: { equalTo: 'NYC County' } } } },
         })
         .execute();
       expect(r.ok).toBe(true);
@@ -213,7 +213,7 @@ describe('PostgisSpatialRelationsPlugin (ORM, live PG)', () => {
         .findMany({
           select: { id: true },
           where: {
-            intersectingCounty: { some: { name: { eq: 'Bay County' } } },
+            intersectingCounty: { some: { name: { equalTo: 'Bay County' } } },
           },
         })
         .execute();
@@ -228,7 +228,7 @@ describe('PostgisSpatialRelationsPlugin (ORM, live PG)', () => {
         .findMany({
           select: { id: true },
           where: {
-            coveringCounty: { some: { name: { eq: 'LA County' } } },
+            coveringCounty: { some: { name: { equalTo: 'LA County' } } },
           },
         })
         .execute();
@@ -245,7 +245,7 @@ describe('PostgisSpatialRelationsPlugin (ORM, live PG)', () => {
       const r = await orm.telemedicineClinic
         .findMany({
           select: { id: true },
-          where: { county: { none: { name: { eq: 'NYC County' } } } },
+          where: { county: { none: { name: { equalTo: 'NYC County' } } } },
         })
         .execute();
       expect(r.ok).toBe(true);
@@ -260,7 +260,7 @@ describe('PostgisSpatialRelationsPlugin (ORM, live PG)', () => {
       const r = await orm.telemedicineClinic
         .findMany({
           select: { id: true },
-          where: { county: { every: { name: { startsWith: 'B' } } } },
+          where: { county: { every: { name: { equalTo: 'Bay County' } } } },
         })
         .execute();
       expect(r.ok).toBe(true);
@@ -281,7 +281,7 @@ describe('PostgisSpatialRelationsPlugin (ORM, live PG)', () => {
           where: {
             nearbyClinic: {
               distance: 10.0,
-              some: { specialty: { eq: 'cardiology' } },
+              some: { specialty: { equalTo: 'cardiology' } },
             },
           },
         })
@@ -349,8 +349,8 @@ describe('PostgisSpatialRelationsPlugin (ORM, live PG)', () => {
           select: { id: true },
           where: {
             and: [
-              { county: { some: { name: { eq: 'Bay County' } } } },
-              { specialty: { eq: 'cardiology' } },
+              { county: { some: { name: { equalTo: 'Bay County' } } } },
+              { specialty: { equalTo: 'cardiology' } },
             ],
           },
         })
@@ -365,8 +365,8 @@ describe('PostgisSpatialRelationsPlugin (ORM, live PG)', () => {
           select: { id: true },
           where: {
             or: [
-              { county: { some: { name: { eq: 'Bay County' } } } },
-              { name: { eq: 'LA Pediatrics' } },
+              { county: { some: { name: { equalTo: 'Bay County' } } } },
+              { name: { equalTo: 'LA Pediatrics' } },
             ],
           },
         })
@@ -384,7 +384,7 @@ describe('PostgisSpatialRelationsPlugin (ORM, live PG)', () => {
         .findMany({
           select: { id: true },
           where: {
-            not: { county: { some: { name: { eq: 'Bay County' } } } },
+            not: { county: { some: { name: { equalTo: 'Bay County' } } } },
           },
         })
         .execute();