fix(postgres): use schema set in sequelize config by default

src/dialects/abstract/query-generator.js

@@ -52,7 +52,7 @@ export class AbstractQueryGenerator {
     tableName = tableName || {};
 
     return {
-      schema: tableName.schema || options.schema || 'public',
+      schema: tableName.schema || options.schema || this.options.schema || 'public',
       tableName: _.isPlainObject(tableName) ? tableName.tableName : tableName,
       delimiter: tableName.delimiter || options.delimiter || '.',
     };

src/dialects/postgres/query-generator.js

@@ -133,13 +133,13 @@ export class PostgresQueryGenerator extends AbstractQueryGenerator {
   }
 
   showTablesQuery() {
-    return 'SELECT table_name FROM information_schema.tables WHERE table_schema = \'public\' AND table_type LIKE \'%TABLE\' AND table_name != \'spatial_ref_sys\';';
+    const schema = this.options.schema || 'public';
+
+    return `SELECT table_name FROM information_schema.tables WHERE table_schema = ${this.escape(schema)} AND table_type LIKE '%TABLE' AND table_name != 'spatial_ref_sys';`;
   }
 
   describeTableQuery(tableName, schema) {
-    if (!schema) {
-      schema = 'public';
-    }
+    schema = schema || this.options.schema || 'public';
 
     return 'SELECT '
       + 'pk.constraint_type as "Constraint",'
@@ -160,7 +160,7 @@ export class PostgresQueryGenerator extends AbstractQueryGenerator {
       + 'ON pk.table_schema=c.table_schema '
       + 'AND pk.table_name=c.table_name '
       + 'AND pk.column_name=c.column_name '
-      + `WHERE c.table_name = ${this.escape(tableName)} AND c.table_schema = ${this.escape(schema)} `;
+      + `WHERE c.table_name = ${this.escape(tableName)} AND c.table_schema = ${this.escape(schema)}`;
   }
 
   /**

test/unit/dialects/postgres/query-generator.test.js

@@ -1331,5 +1331,53 @@ if (dialect.startsWith('postgres')) {
         });
       });
     });
+
+    describe('Custom Schema Functions', () => {
+      beforeEach(function () {
+        this.queryGenerator = new QueryGenerator({
+          sequelize: this.sequelize,
+          _dialect: this.sequelize.dialect,
+        });
+        // Add custom schema to sequelize object
+        this.queryGenerator.sequelize.options.schema = 'custom';
+      });
+      afterEach(function () {
+        // Remove custom schema in order to not interfere with other tests
+        this.queryGenerator.sequelize.options.schema = null;
+      });
+
+      const customSchemaSuites = {
+        showTablesQuery: [
+          {
+            title: 'showTablesQuery should use correct custom schema',
+            arguments: [],
+            expectation: 'SELECT table_name FROM information_schema.tables WHERE table_schema = \'custom\' AND table_type LIKE \'%TABLE\' AND table_name != \'spatial_ref_sys\';',
+          },
+        ],
+        describeTableQuery: [
+          {
+            title: 'describeTableQuery should use correct custom schema',
+            arguments: ['myTable', null],
+            expectation: `SELECT pk.constraint_type as "Constraint",c.column_name as "Field", c.column_default as "Default",c.is_nullable as "Null", (CASE WHEN c.udt_name = 'hstore' THEN c.udt_name ELSE c.data_type END) || (CASE WHEN c.character_maximum_length IS NOT NULL THEN '(' || c.character_maximum_length || ')' ELSE '' END) as "Type", (SELECT array_agg(e.enumlabel) FROM pg_catalog.pg_type t JOIN pg_catalog.pg_enum e ON t.oid=e.enumtypid WHERE t.typname=c.udt_name) AS "special", (SELECT pgd.description FROM pg_catalog.pg_statio_all_tables AS st INNER JOIN pg_catalog.pg_description pgd on (pgd.objoid=st.relid) WHERE c.ordinal_position=pgd.objsubid AND c.table_name=st.relname) AS "Comment" FROM information_schema.columns c LEFT JOIN (SELECT tc.table_schema, tc.table_name, cu.column_name, tc.constraint_type FROM information_schema.TABLE_CONSTRAINTS tc JOIN information_schema.KEY_COLUMN_USAGE  cu ON tc.table_schema=cu.table_schema and tc.table_name=cu.table_name and tc.constraint_name=cu.constraint_name and tc.constraint_type='PRIMARY KEY') pk ON pk.table_schema=c.table_schema AND pk.table_name=c.table_name AND pk.column_name=c.column_name WHERE c.table_name = 'myTable' AND c.table_schema = 'custom'`,
+          },
+        ],
+        addColumnQuery: [
+          {
+            title: 'addColumnQuery should use correct custom schema',
+            arguments: ['myTable', 'myColumn', { type: DataTypes.STRING(191), allowNull: true }],
+            expectation: 'ALTER TABLE "custom"."myTable" ADD COLUMN "myColumn" VARCHAR(191);',
+          },
+        ],
+      };
+
+      _.each(customSchemaSuites, (customSchemaTests, customSchemaSuiteTitle) => {
+        for (const customSchemaTest of customSchemaTests) {
+          it(customSchemaTest.title, function () {
+            const convertedText = customSchemaTest.arguments ? this.queryGenerator[customSchemaSuiteTitle](...customSchemaTest.arguments) : this.queryGenerator[customSchemaSuiteTitle]();
+            expect(convertedText).to.equal(customSchemaTest.expectation);
+          });
+        }
+      });
+    });
   });
 }

test/unit/sql/add-column.test.js

@@ -2,11 +2,16 @@
 
 const Support   = require('../support');
 const { DataTypes } = require('@sequelize/core');
+const _ = require('lodash');
 
 const expectsql = Support.expectsql;
 const current   = Support.sequelize;
 const sql       = current.dialect.queryGenerator;
 
+const custom = _.cloneDeep(current);
+custom.options.schema = 'custom';
+const customSql = custom.dialect.queryGenerator;
+
 if (['mysql', 'mariadb'].includes(current.dialect.name)) {
   describe(Support.getTestDialectTeaser('SQL'), () => {
     describe('addColumn', () => {
@@ -66,3 +71,32 @@ if (['mysql', 'mariadb'].includes(current.dialect.name)) {
     });
   });
 }
+
+describe(`Custom Schema ${Support.getTestDialectTeaser('SQL')}`, () => {
+  describe('addColumnCustomSchema', () => {
+
+    const Model = current.define('users', {
+      id: {
+        type: DataTypes.INTEGER,
+        primaryKey: true,
+        autoIncrement: true,
+      },
+    }, { timestamps: false });
+
+    it('properly generate alter queries', () => {
+      return expectsql(customSql.addColumnQuery(Model.getTableName(), 'level_id', custom.normalizeAttribute({
+        type: DataTypes.FLOAT,
+        allowNull: false,
+      })), {
+        mariadb: 'ALTER TABLE `users` ADD `level_id` FLOAT NOT NULL;',
+        mysql: 'ALTER TABLE `users` ADD `level_id` FLOAT NOT NULL;',
+        postgres: 'ALTER TABLE "custom"."users" ADD COLUMN "level_id" FLOAT NOT NULL;',
+        sqlite: 'ALTER TABLE `users` ADD `level_id` FLOAT NOT NULL;',
+        mssql: 'ALTER TABLE [users] ADD [level_id] FLOAT NOT NULL;',
+        db2: 'ALTER TABLE "users" ADD "level_id" FLOAT NOT NULL;',
+        snowflake: 'ALTER TABLE "users" ADD "level_id" FLOAT NOT NULL;',
+        ibmi: 'ALTER TABLE "users" ADD "level_id" FLOAT NOT NULL',
+      });
+    });
+  });
+});

test/unit/sql/remove-column.test.js

@@ -1,11 +1,16 @@
 'use strict';
 
 const Support   = require('../support');
+const _ = require('lodash');
 
 const expectsql = Support.expectsql;
 const current   = Support.sequelize;
 const sql       = current.dialect.queryGenerator;
 
+const custom = _.cloneDeep(current);
+custom.options.schema = 'custom';
+const customSql = custom.dialect.queryGenerator;
+
 // Notice: [] will be replaced by dialect specific tick/quote character when there is not dialect specific expectation but only a default expectation
 
 if (current.dialect.name !== 'sqlite') {
@@ -28,3 +33,22 @@ if (current.dialect.name !== 'sqlite') {
     });
   });
 }
+
+describe(`Custom Schema ${Support.getTestDialectTeaser('SQL')}`, () => {
+  describe('removeColumnCustomSchema', () => {
+    it('schema', () => {
+      expectsql(customSql.removeColumnQuery({
+        tableName: 'user',
+      }, 'email'), {
+        ibmi: 'ALTER TABLE "user" DROP COLUMN "email"',
+        mssql: 'ALTER TABLE [user] DROP COLUMN [email];',
+        db2: 'ALTER TABLE "user" DROP COLUMN "email";',
+        mariadb: 'ALTER TABLE `user` DROP `email`;',
+        mysql: 'ALTER TABLE `user` DROP `email`;',
+        postgres: 'ALTER TABLE "custom"."user" DROP COLUMN "email";',
+        snowflake: 'ALTER TABLE "user" DROP "email";',
+        sqlite: 'CREATE TABLE IF NOT EXISTS `user_backup` (`0` e, `1` m, `2` a, `3` i, `4` l);INSERT INTO `user_backup` SELECT `0`, `1`, `2`, `3`, `4` FROM `user`;DROP TABLE `user`;CREATE TABLE IF NOT EXISTS `user` (`0` e, `1` m, `2` a, `3` i, `4` l);INSERT INTO `user` SELECT `0`, `1`, `2`, `3`, `4` FROM `user_backup`;DROP TABLE `user_backup`;',
+      });
+    });
+  });
+});