@deepagents/text2sql 7.1.0 → 7.1.2

package/dist/lib/adapters/sqlite/sqlite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sqlite.d.ts","sourceRoot":"","sources":["../../../../src/lib/adapters/sqlite/sqlite.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,KAAK,eAAe,EACpB,KAAK,WAAW,EAChB,KAAK,gBAAgB,EACtB,MAAM,eAAe,CAAC;AAwCvB,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,eAAe,CAAC;IACzB,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,SAAS,EAAE,WAAW,EAAE,CAAC;CAC1B,CAAC;AA6BF,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;;;;;EAwBtD;AAED,qBAAa,MAAO,SAAQ,OAAO;;IAEjC,SAAkB,SAAS,EAAE,WAAW,EAAE,CAAC;IAC3C,SAAkB,aAAa,YAAa;IAC5C,SAAkB,aAAa,EAAE,MAAM,EAAE,CAAM;IAC/C,SAAkB,iBAAiB,YAAY;gBAEnC,OAAO,EAAE,oBAAoB;IAW1B,WAAW,CAAC,GAAG,EAAE,MAAM;IAIvB,YAAY,CAAC,GAAG,EAAE,MAAM;cAkBd,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAI1D,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAIrC,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAI7B,oBAAoB,CAC3B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,EAC7B,KAAK,EAAE,MAAM,GACZ,MAAM;CAMV"}
+{"version":3,"file":"sqlite.d.ts","sourceRoot":"","sources":["../../../../src/lib/adapters/sqlite/sqlite.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,KAAK,eAAe,EACpB,KAAK,WAAW,EAChB,KAAK,gBAAgB,EACtB,MAAM,eAAe,CAAC;AAwCvB,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,eAAe,CAAC;IACzB,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,SAAS,EAAE,WAAW,EAAE,CAAC;CAC1B,CAAC;AAEF,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;;;;;EAwBtD;AAED,qBAAa,MAAO,SAAQ,OAAO;;IAEjC,SAAkB,SAAS,EAAE,WAAW,EAAE,CAAC;IAC3C,SAAkB,aAAa,YAAa;IAC5C,SAAkB,aAAa,EAAE,MAAM,EAAE,CAAM;IAC/C,SAAkB,iBAAiB,YAAY;gBAEnC,OAAO,EAAE,oBAAoB;IAW1B,WAAW,CAAC,GAAG,EAAE,MAAM;IAIvB,YAAY,CAAC,GAAG,EAAE,MAAM;cAcd,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAI1D,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAIrC,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAI7B,oBAAoB,CAC3B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,EAC7B,KAAK,EAAE,MAAM,GACZ,MAAM;CAMV"}

package/dist/lib/adapters/sqlserver/index.js

@@ -950,7 +950,7 @@ var TableGrounding = class extends AbstractGrounding {
         );
       }
       if (depth < forwardLimit) {
-        const rels = await this.findOutgoingRelations(name);
+        const rels = await this.findOutgoingRelations(name, ctx);
         for (const rel of rels) {
           if (!this.isRelationshipVisible(rel)) continue;
           this.addRelationship(rel, allRelationships, seenRelationships);
@@ -982,7 +982,7 @@ var TableGrounding = class extends AbstractGrounding {
         );
       }
       if (depth < backwardLimit) {
-        const rels = await this.findIncomingRelations(name);
+        const rels = await this.findIncomingRelations(name, ctx);
         for (const rel of rels) {
           if (!this.isRelationshipVisible(rel)) continue;
           this.addRelationship(rel, allRelationships, seenRelationships);
@@ -1975,13 +1975,13 @@ var columnRow = z7.object({
 
 // packages/text2sql/src/lib/adapters/sqlserver/table.sqlserver.grounding.ts
 var relationshipRow = z8.object({
-  constraint_name: z8.string().nullable(),
-  table_schema: z8.string().nullable(),
-  table_name: z8.string().nullable(),
-  column_name: z8.string().nullable(),
-  referenced_table_schema: z8.string().nullable(),
-  referenced_table_name: z8.string().nullable(),
-  referenced_column_name: z8.string().nullable()
+  constraint_name: z8.string(),
+  table_schema: z8.string(),
+  table_name: z8.string(),
+  column_name: z8.string(),
+  referenced_table_schema: z8.string(),
+  referenced_table_name: z8.string(),
+  referenced_column_name: z8.string()
 });
 var SqlServerTableGrounding = class extends TableGrounding {
   #adapter;
@@ -2028,74 +2028,58 @@ var SqlServerTableGrounding = class extends TableGrounding {
   }
   async findOutgoingRelations(tableName) {
     const { schema, table: table2 } = this.#adapter.parseTableName(tableName);
-    const rows = await this.#adapter.runQuery(
-      `
-      SELECT
-        fk.CONSTRAINT_NAME AS constraint_name,
-        fk.TABLE_SCHEMA AS table_schema,
-        fk.TABLE_NAME AS table_name,
-        fk.COLUMN_NAME AS column_name,
-        pk.TABLE_SCHEMA AS referenced_table_schema,
-        pk.TABLE_NAME AS referenced_table_name,
-        pk.COLUMN_NAME AS referenced_column_name
-      FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS AS rc
-      JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE AS fk
-        ON fk.CONSTRAINT_NAME = rc.CONSTRAINT_NAME
-      JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE AS pk
-        ON pk.CONSTRAINT_NAME = rc.UNIQUE_CONSTRAINT_NAME
-        AND pk.ORDINAL_POSITION = fk.ORDINAL_POSITION
-      WHERE fk.TABLE_SCHEMA = '${this.#adapter.escapeString(schema)}'
-        AND fk.TABLE_NAME = '${this.#adapter.escapeString(table2)}'
-      ORDER BY fk.CONSTRAINT_NAME, fk.ORDINAL_POSITION
-    `,
-      relationshipRow
+    return this.#foreignKeys(
+      `s.name = '${this.#adapter.escapeString(schema)}'
+        AND t.name = '${this.#adapter.escapeString(table2)}'`
     );
-    return this.#groupRelationships(rows);
   }
   async findIncomingRelations(tableName) {
     const { schema, table: table2 } = this.#adapter.parseTableName(tableName);
+    return this.#foreignKeys(
+      `ref_s.name = '${this.#adapter.escapeString(schema)}'
+        AND ref_t.name = '${this.#adapter.escapeString(table2)}'`
+    );
+  }
+  /**
+   * The foreign keys matching `where`. sys.foreign_key_columns holds one row
+   * per column pair in the key's own order, and every join goes by object id,
+   * so a key comes back whole even when it references a unique index or
+   * another schema repeats its constraint names.
+   */
+  async #foreignKeys(where) {
     const rows = await this.#adapter.runQuery(
       `
       SELECT
-        fk.CONSTRAINT_NAME AS constraint_name,
-        fk.TABLE_SCHEMA AS table_schema,
-        fk.TABLE_NAME AS table_name,
-        fk.COLUMN_NAME AS column_name,
-        pk.TABLE_SCHEMA AS referenced_table_schema,
-        pk.TABLE_NAME AS referenced_table_name,
-        pk.COLUMN_NAME AS referenced_column_name
-      FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS AS rc
-      JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE AS fk
-        ON fk.CONSTRAINT_NAME = rc.CONSTRAINT_NAME
-      JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE AS pk
-        ON pk.CONSTRAINT_NAME = rc.UNIQUE_CONSTRAINT_NAME
-        AND pk.ORDINAL_POSITION = fk.ORDINAL_POSITION
-      WHERE pk.TABLE_SCHEMA = '${this.#adapter.escapeString(schema)}'
-        AND pk.TABLE_NAME = '${this.#adapter.escapeString(table2)}'
-      ORDER BY fk.CONSTRAINT_NAME, fk.ORDINAL_POSITION
+        fk.name AS constraint_name,
+        s.name AS table_schema,
+        t.name AS table_name,
+        COL_NAME(fkc.parent_object_id, fkc.parent_column_id) AS column_name,
+        ref_s.name AS referenced_table_schema,
+        ref_t.name AS referenced_table_name,
+        COL_NAME(fkc.referenced_object_id, fkc.referenced_column_id) AS referenced_column_name
+      FROM sys.foreign_keys AS fk
+      JOIN sys.foreign_key_columns AS fkc ON fkc.constraint_object_id = fk.object_id
+      JOIN sys.tables AS t ON t.object_id = fk.parent_object_id
+      JOIN sys.schemas AS s ON s.schema_id = t.schema_id
+      JOIN sys.tables AS ref_t ON ref_t.object_id = fk.referenced_object_id
+      JOIN sys.schemas AS ref_s ON ref_s.schema_id = ref_t.schema_id
+      WHERE ${where}
+      ORDER BY s.name, t.name, fk.name, fkc.constraint_column_id
     `,
       relationshipRow
     );
-    return this.#groupRelationships(rows);
-  }
-  #groupRelationships(rows) {
     const relationships = /* @__PURE__ */ new Map();
-    const defaultSchema = this.#adapter.defaultSchema ?? "dbo";
     for (const row of rows) {
-      if (!row.constraint_name || !row.table_name || !row.referenced_table_name) {
-        continue;
-      }
-      const schema = row.table_schema ?? defaultSchema;
-      const referencedSchema = row.referenced_table_schema ?? defaultSchema;
-      const key = `${schema}.${row.table_name}:${row.constraint_name}`;
+      const table2 = `${row.table_schema}.${row.table_name}`;
+      const key = `${table2}:${row.constraint_name}`;
       const relationship2 = relationships.get(key) ?? {
-        table: `${schema}.${row.table_name}`,
+        table: table2,
         from: [],
-        referenced_table: `${referencedSchema}.${row.referenced_table_name}`,
+        referenced_table: `${row.referenced_table_schema}.${row.referenced_table_name}`,
         to: []
       };
-      relationship2.from.push(row.column_name ?? "unknown");
-      relationship2.to.push(row.referenced_column_name ?? "unknown");
+      relationship2.from.push(row.column_name);
+      relationship2.to.push(row.referenced_column_name);
       relationships.set(key, relationship2);
     }
     return Array.from(relationships.values());