fix: use the default schema when not provided

sequelize · Nov 16, 2023 · ba945ef · ba945ef
1 parent 884c001
commit ba945ef
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/src/dialects/mssql/query-generator.js b/src/dialects/mssql/query-generator.js
@@ -741,9 +741,8 @@ class MSSQLQueryGenerator extends AbstractQueryGenerator {
     let sql = `${this._getForeignKeysQueryPrefix(catalogName)
     } WHERE TB.NAME =${wrapSingleQuote(tableName)}`;
 
-    if (table.schema) {
-      sql += ` AND SCHEMA_NAME(TB.SCHEMA_ID) =${wrapSingleQuote(table.schema)}`;
-    }
+    sql += ` AND SCHEMA_NAME(TB.SCHEMA_ID) =${wrapSingleQuote(table.schema || 'dbo')}`;
+
     return sql;
   }
 

diff --git a/src/dialects/postgres/query-generator.js b/src/dialects/postgres/query-generator.js
@@ -904,18 +904,22 @@ class PostgresQueryGenerator extends AbstractQueryGenerator {
    * @param {string} schemaName
    */
   getForeignKeyReferencesQuery(tableName, catalogName, schemaName) {
+    const schema = schemaName || 'public';
+
     return `${this._getForeignKeyReferencesQueryPrefix()
     }WHERE constraint_type = 'FOREIGN KEY' AND tc.table_name = '${tableName}'${
       catalogName ? ` AND tc.table_catalog = '${catalogName}'` : ''
-    }${schemaName ? ` AND tc.table_schema = '${schemaName}'` : ''}`;
+    } AND tc.table_schema = '${schema}'`;
   }
 
   getForeignKeyReferenceQuery(table, columnName) {
     const tableName = table.tableName || table;
-    const schema = table.schema;
+    const schema = table.schema || 'public';
     return `${this._getForeignKeyReferencesQueryPrefix()
-    }WHERE constraint_type = 'FOREIGN KEY' AND tc.table_name='${tableName}' AND  kcu.column_name = '${columnName}'${
-      schema ? ` AND tc.table_schema = '${schema}'` : ''}`;
+    }WHERE constraint_type = 'FOREIGN KEY' 
+      AND tc.table_name='${tableName}' 
+      AND  kcu.column_name = '${columnName}' 
+      AND tc.table_schema = '${schema}'`;
   }
 
   /**

diff --git a/test/integration/query-interface/getForeignKeyReferencesForTable.test.js b/test/integration/query-interface/getForeignKeyReferencesForTable.test.js
@@ -7,7 +7,7 @@ const DataTypes = require('../../../lib/data-types');
 
 describe(Support.getTestDialectTeaser('QueryInterface'), () => {
   beforeEach(function() {
-    this.sequelize.options.quoteIdenifiers = true;
+    this.sequelize.options.quoteIdentifiers = true;
     this.queryInterface = this.sequelize.getQueryInterface();
   });
 
@@ -42,7 +42,8 @@ describe(Support.getTestDialectTeaser('QueryInterface'), () => {
     });
 
     describe('with schemas', () => {
-      if (Support.sequelize.dialect.supports.schemas) {
+      // MariaDB does not really support schemas (they are synonyms of databases)
+      if (Support.sequelize.dialect.supports.schemas && Support.getTestDialect() !== 'mariadb') {
         beforeEach(async function() {
           this.schema = 'test_schema';
           await this.queryInterface.createSchema(this.schema);
@@ -77,7 +78,7 @@ describe(Support.getTestDialectTeaser('QueryInterface'), () => {
         it('should only return references to the tables on the default schema', async function() {        
           const taskRefs = await this.queryInterface.getForeignKeyReferencesForTable('Tasks');
           expect(taskRefs).to.have.lengthOf(1);
-          expect(taskRefs[0]).deep.equal({
+          expect(taskRefs[0]).deep.include.all({
             columnName: 'UserId',
             referencedColumnName: 'id',
             referencedTableName: 'Users'