fix: unify and fix tests queryGenerator.arithmeticQuery/dropTableQuery/showIndexesQuery/describeTableQuery

src/dialects/abstract/query-interface.js

@@ -276,7 +276,7 @@ export class QueryInterface {
    * @returns {Promise}
    */
   async dropTable(tableName, options = {}) {
-    options.cascade = (options.cascade && this.queryGenerator.dialect.supports.dropTable.cascade) ? options.cascade
+    options.cascade = options.cascade !== null ? options.cascade
       // TODO: dropTable should not accept a "force" option, `sync()` should set `cascade` itself if its force option is true
       : (options.force && this.queryGenerator.dialect.supports.dropTable.cascade) ? true
       : undefined;
@@ -290,7 +290,12 @@ export class QueryInterface {
     for (const tableName of tableNames) {
       // if tableName is not in the Array of tables names then don't drop it
       if (!skip.includes(tableName.tableName || tableName)) {
-        await this.dropTable(tableName, { ...options, cascade: true });
+        await this.dropTable(tableName, {
+          // enable "cascade" by default if supported by this dialect,
+          // but let the user override the default
+          cascade: this.queryGenerator.dialect.supports.dropTable.cascade ? true : undefined,
+          ...options,
+        });
       }
     }
   }

test/integration/sequelize/drop.test.ts

@@ -41,28 +41,4 @@ describe('Sequelize#drop', () => {
     // drop both tables
     await sequelize.drop();
   });
-
-  it('supports truncating cyclic associations with { cascade: true }', async () => {
-    const A = sequelize.define('A', {
-      BId: {
-        type: DataTypes.INTEGER,
-      },
-    });
-
-    const B = sequelize.define('B', {
-      AId: {
-        type: DataTypes.INTEGER,
-      },
-    });
-
-    // These models both have a foreign key that references the other model.
-    // Sequelize should be able to create them.
-    A.belongsTo(B, { foreignKey: { allowNull: false } });
-    B.belongsTo(A, { foreignKey: { allowNull: false } });
-
-    await sequelize.sync();
-
-    // drop both tables
-    await sequelize.drop({ cascade: true });
-  });
 });

test/unit/query-interface/drop-table.test.ts

@@ -0,0 +1,27 @@
+import { expect } from 'chai';
+import sinon from 'sinon';
+import { expectsql, getTestDialect, sequelize } from '../../support';
+
+const dialectName = getTestDialect();
+
+describe('QueryInterface#dropTable', () => {
+  afterEach(() => {
+    sinon.restore();
+  });
+
+  it('produces a DROP TABLE query with cascade', async () => {
+    if (sequelize.dialect.supports.dropTable.cascade) {
+      const stub = sinon.stub(sequelize, 'queryRaw');
+
+      await sequelize.getQueryInterface().dropTable('myTable', { cascade: true });
+
+      expect(stub.callCount).to.eq(1);
+      const firstCall = stub.getCall(0);
+      expectsql(firstCall.args[0] as string, {
+        default: 'DROP TABLE IF EXISTS [myTable] CASCADE;',
+      });
+    } else {
+      await expect(sequelize.getQueryInterface().dropTable('myTable', { cascade: true })).to.be.rejectedWith(`The following options are not supported by dropTableQuery in ${dialectName}: cascade`);
+    }
+  });
+});