@forestadmin/datasource-sql 1.7.36 → 1.7.38

package/dist/introspection/introspector.d.ts

@@ -5,6 +5,8 @@ export default class Introspector {
     static introspect(sequelize: Sequelize, logger?: Logger): Promise<Table[]>;
     /** Get names of all tables in the public schema of the db */
     private static getTableNames;
+    private static getDefaultSchema;
+    private static getTableIdentifier;
     /** Instrospect a single table */
     private static getTable;
     private static getColumn;

package/dist/introspection/introspector.js

@@ -19,20 +19,60 @@ class Introspector {
         const tableIdentifiers = await sequelize
             .getQueryInterface()
             .showAllTables();
+        const requestedSchema = sequelize.options.schema || this.getDefaultSchema(sequelize);
         // Sometimes sequelize returns only strings,
         // and sometimes objects with a tableName and schema property.
         // @see https://github.com/sequelize/sequelize/blob/main/src/dialects/mariadb/query.js#L295
-        return tableIdentifiers.map(tableIdentifier => typeof tableIdentifier === 'string' ? { tableName: tableIdentifier } : tableIdentifier);
+        return (tableIdentifiers
+            .map((tableIdentifier) => typeof tableIdentifier === 'string'
+            ? { tableName: tableIdentifier, schema: requestedSchema }
+            : {
+                schema: tableIdentifier.schema || requestedSchema,
+                tableName: tableIdentifier.tableName,
+            })
+            // MSSQL returns all tables, not filtered by schema
+            .filter(identifier => identifier.schema === requestedSchema));
+    }
+    static getDefaultSchema(sequelize) {
+        switch (sequelize.getDialect()) {
+            case 'postgres':
+                return 'public';
+            case 'mssql':
+                return 'dbo';
+            // MariaDB returns the database name as "schema" in table identifiers
+            case 'mariadb':
+            case 'mysql':
+                return sequelize.getDatabaseName();
+            default:
+                return undefined;
+        }
+    }
+    static getTableIdentifier(tableIdentifier, sequelize) {
+        switch (sequelize.getDialect()) {
+            case 'postgres':
+            case 'mssql':
+            case 'sqlite':
+                return tableIdentifier;
+            case 'mariadb':
+            case 'mysql':
+            default:
+                return { tableName: tableIdentifier.tableName };
+        }
     }
     /** Instrospect a single table */
     static async getTable(sequelize, logger, tableIdentifier) {
         const queryInterface = sequelize.getQueryInterface();
+        // Sequelize is not consistent in the way it handles table identifiers either when it returns
+        // it, when it uses it internally, or when it is passed as an argument.
+        // Plus it has some bugs with schema handling in postgresql that forces us to be sure that
+        // the table identifier is correct on our side
+        const tableIdentifierForQuery = Introspector.getTableIdentifier(tableIdentifier, sequelize);
         const [columnDescriptions, tableIndexes, tableReferences] = await Promise.all([
-            queryInterface.describeTable(tableIdentifier),
-            queryInterface.showIndex(tableIdentifier),
-            queryInterface.getForeignKeyReferencesForTable(tableIdentifier),
+            queryInterface.describeTable(tableIdentifierForQuery),
+            queryInterface.showIndex(tableIdentifierForQuery),
+            queryInterface.getForeignKeyReferencesForTable(tableIdentifierForQuery),
         ]);
-        await this.detectBrokenRelationship(tableIdentifier, sequelize, tableReferences, logger);
+        await this.detectBrokenRelationship(tableIdentifierForQuery, sequelize, tableReferences, logger);
         const columns = await Promise.all(Object.entries(columnDescriptions).map(async ([name, description]) => {
             const references = tableReferences.filter(
             // There is a bug right now with sequelize on postgresql: returned association
@@ -43,8 +83,8 @@ class Introspector {
             return this.getColumn(sequelize, logger, tableIdentifier, options);
         }));
         return {
-            name: tableIdentifier.tableName,
-            schema: tableIdentifier.schema,
+            name: tableIdentifierForQuery.tableName,
+            schema: tableIdentifierForQuery.schema,
             columns: columns.filter(Boolean),
             unique: tableIndexes
                 .filter(i => i.unique || i.primary)
@@ -144,4 +184,4 @@ class Introspector {
     }
 }
 exports.default = Introspector;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50cm9zcGVjdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ludHJvc3BlY3Rpb24vaW50cm9zcGVjdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQ0EseUNBQTJEO0FBRTNELDBGQUFnRTtBQUNoRSxzRkFBNEQ7QUFTNUQsTUFBcUIsWUFBWTtJQUMvQixNQUFNLENBQUMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxTQUFvQixFQUFFLE1BQWU7UUFDM0QsTUFBTSxVQUFVLEdBQUcsTUFBTSxJQUFJLENBQUMsYUFBYSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ3ZELE1BQU0sUUFBUSxHQUFHLFVBQVUsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLFNBQVMsRUFBRSxNQUFNLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUNoRixNQUFNLE1BQU0sR0FBRyxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUM7UUFFM0MsSUFBSSxDQUFDLGVBQWUsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUU3QixPQUFPLE1BQU0sQ0FBQztJQUNoQixDQUFDO0lBRUQsNkRBQTZEO0lBQ3JELE1BQU0sQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLFNBQW9CO1FBQ3JELE1BQU0sZ0JBQWdCLEdBQXVDLE1BQU0sU0FBUzthQUN6RSxpQkFBaUIsRUFBRTthQUNuQixhQUFhLEVBQUUsQ0FBQztRQUVuQiw0Q0FBNEM7UUFDNUMsOERBQThEO1FBQzlELDJGQUEyRjtRQUMzRixPQUFPLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsRUFBRSxDQUM1QyxPQUFPLGVBQWUsS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDLEVBQUUsU0FBUyxFQUFFLGVBQWUsRUFBRSxDQUFDLENBQUMsQ0FBQyxlQUFlLENBQ3ZGLENBQUM7SUFDSixDQUFDO0lBRUQsaUNBQWlDO0lBQ3pCLE1B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
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"introspector.js","sourceRoot":"","sources":["../../src/introspection/introspector.ts"],"names":[],"mappings":"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"}

package/dist/introspection/type-overrides.d.ts

@@ -1,4 +1,4 @@
-import { AbstractDataType, AbstractDataTypeConstructor, ColumnDescription, Logging, QueryInterface, QueryInterfaceOptions, QueryOptions, TableName } from 'sequelize/types';
+import { AbstractDataType, AbstractDataTypeConstructor, ColumnDescription, Logging, QueryInterface, QueryInterfaceOptions, QueryOptions, Sequelize, TableName } from 'sequelize/types';
 export interface SequelizeIndex {
     name: string;
     primary: boolean;
@@ -38,4 +38,9 @@ export interface QueryInterfaceExt extends QueryInterface {
         schemaDelimiter?: string;
     } & Logging)): Promise<Record<string, SequelizeColumn>>;
 }
+export interface SequelizeWithOptions extends Sequelize {
+    options: {
+        schema?: string;
+    };
+}
 //# sourceMappingURL=type-overrides.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forestadmin/datasource-sql",
-  "version": "1.7.36",
+  "version": "1.7.38",
   "main": "dist/index.js",
   "license": "GPL-3.0",
   "publishConfig": {