Add any existing ext::* scalar to a type's __casttype__ (#686)

edgedb · Jul 11, 2023 · 1f4fdcf · 1f4fdcf
1 parent 77f3c1d
commit 1f4fdcf
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 10 deletions.
diff --git a/integration-tests/stable/pgvector.test.ts b/integration-tests/stable/pgvector.test.ts
@@ -28,10 +28,18 @@ describe("pgvector", () => {
   });
 
   test("inferred return type + literal encoding", async () => {
-    const query = e.select(e.PgVectorTest, () => ({
-      test_embedding: true,
-      vector_literal: e.ext.pgvector.vector(Float32Array.from([1, 2, 3])),
-    }));
+    const query = e.select(e.PgVectorTest, ($) => {
+      const dist = e.ext.pgvector.cosine_distance(
+        $.test_embedding,
+        e.ext.pgvector.vector(Float32Array.from([1, 2, 3]))
+      );
+      return {
+        test_embedding: true,
+        vector_literal: e.ext.pgvector.vector(Float32Array.from([1, 2, 3])),
+        dist,
+        order_by: dist,
+      };
+    });
 
     const result = await query.run(client);
 
@@ -41,6 +49,7 @@ describe("pgvector", () => {
         {
           test_embedding: Float32Array | null;
           vector_literal: Float32Array;
+          dist: number | null;
         }[]
       >
     >(true);

diff --git a/integration-tests/stable/setupTeardown.ts b/integration-tests/stable/setupTeardown.ts
@@ -15,7 +15,7 @@ export async function setupTests() {
 }
 
 async function cleanupData(client: Client) {
-  await client.execute(`reset schema to initial`);
+  await client.execute(`delete PgVectorTest`);
 }
 
 export async function teardownTests(client: Client) {

diff --git a/packages/driver/src/reflection/queries/types.ts b/packages/driver/src/reflection/queries/types.ts
@@ -126,9 +126,9 @@ export async function getTypes(
 
       material_scalars := (
         SELECT ScalarType
-        FILTER
-          (.name LIKE 'std::%' OR .name LIKE 'cal::%')
-          AND NOT .is_abstract
+        FILTER NOT .abstract
+           AND NOT EXISTS .enum_values
+           AND NOT EXISTS (SELECT .ancestors FILTER NOT .abstract)
       )
 
     SELECT Type {

diff --git a/packages/generate/src/syntax/funcops.ts b/packages/generate/src/syntax/funcops.ts
@@ -127,9 +127,15 @@ export function $resolveOverload(
   throw new Error(
     `No function overload found for ${
       funcName.includes("::")
-        ? `'e.${funcName.split("::")[1]}()'`
+        ? `'e.${funcName.split("::").join(".")}()'`
         : `operator '${funcName}'`
-    } with args: ${args.map((arg) => `${arg}`).join(", ")}`
+    } with args: ${[...positionalArgs, ...Object.values(namedArgs ?? {})]
+      .filter(Boolean)
+      .map(
+        (arg) =>
+          `Element: ${arg!.__element__.__name__} (${arg!.__cardinality__})`
+      )
+      .join(", ")}`
   );
 }