fix(postgres): remove if not exists and cascade from create/drop database queries (#10033)

lib/dialects/mysql/query-generator.js

@@ -26,8 +26,8 @@ class MySQLQueryGenerator extends AbstractQueryGenerator {
 
 
     const values = {
     const values = {
       database: this.quoteIdentifier(databaseName),
       database: this.quoteIdentifier(databaseName),
-      charset: options.charset ? ' DEFAULT CHARSET SET = ' + this.escape(options.charset) : '',
-      collation: options.collate ? ' DEFAULT COLLATE = ' + this.escape(options.collate) : ''
+      charset: options.charset ? ' DEFAULT CHARACTER SET ' + this.escape(options.charset) : '',
+      collation: options.collate ? ' DEFAULT COLLATE ' + this.escape(options.collate) : ''
     };
     };
 
 
     return _.template(query, this._templateSettings)(values).trim() + ';';
     return _.template(query, this._templateSettings)(values).trim() + ';';

lib/dialects/postgres/query-generator.js

@@ -21,14 +21,16 @@ class PostgresQueryGenerator extends AbstractQueryGenerator {
     const values = {
     const values = {
       database: this.quoteTable(databaseName),
       database: this.quoteTable(databaseName),
       encoding: options.encoding ? ' ENCODING = ' + this.escape(options.encoding) : '',
       encoding: options.encoding ? ' ENCODING = ' + this.escape(options.encoding) : '',
-      collation: options.collate ? ' LC_COLLATE = ' + this.escape(options.collate) : ''
+      collation: options.collate ? ' LC_COLLATE = ' + this.escape(options.collate) : '',
+      ctype: options.ctype ? ' LC_CTYPE = ' + this.escape(options.ctype) : '',
+      template: options.template ? ' TEMPLATE = ' + this.escape(options.template) : ''
     };
     };
 
 
-    return `CREATE DATABASE IF NOT EXISTS ${values.database}${values.encoding}${values.collation};`;
+    return `CREATE DATABASE ${values.database}${values.encoding}${values.collation}${values.ctype}${values.template};`;
   }
   }
 
 
   dropDatabaseQuery(databaseName) {
   dropDatabaseQuery(databaseName) {
-    return `DROP DATABASE IF EXISTS ${this.quoteTable(databaseName)} CASCADE;`;
+    return `DROP DATABASE IF EXISTS ${this.quoteTable(databaseName)};`;
   }
   }
 
 
   createSchema(schema) {
   createSchema(schema) {

lib/query-interface.js

@@ -27,31 +27,33 @@ class QueryInterface {
   /**
   /**
    * Creates a database
    * Creates a database
    *
    *
-   * @param {string} schema    Schema name to create
+   * @param {string} database  Database name to create
    * @param {Object} [options] Query options
    * @param {Object} [options] Query options
    * @param {string} [options.charset] Database default character set, MYSQL only
    * @param {string} [options.charset] Database default character set, MYSQL only
-   * @param {string} [options.encoding] Database default character set, PostgreSQL only
    * @param {string} [options.collate] Database default collation
    * @param {string} [options.collate] Database default collation
+   * @param {string} [options.encoding] Database default character set, PostgreSQL only
+   * @param {string} [options.ctype] Database character classification, PostgreSQL only
+   * @param {string} [options.template] The name of the template from which to create the new database, PostgreSQL only
    *
    *
    * @returns {Promise}
    * @returns {Promise}
    */
    */
-  createDatabase(schema, options) {
+  createDatabase(database, options) {
     options = options || {};
     options = options || {};
-    const sql = this.QueryGenerator.createDatabaseQuery(schema, options);
+    const sql = this.QueryGenerator.createDatabaseQuery(database, options);
     return this.sequelize.query(sql, options);
     return this.sequelize.query(sql, options);
   }
   }
 
 
   /**
   /**
    * Drops a database
    * Drops a database
    *
    *
-   * @param {string} schema    Schema name to drop
+   * @param {string} database  Database name to drop
    * @param {Object} [options] Query options
    * @param {Object} [options] Query options
    *
    *
    * @returns {Promise}
    * @returns {Promise}
    */
    */
-  dropDatabase(schema, options) {
+  dropDatabase(database, options) {
     options = options || {};
     options = options || {};
-    const sql = this.QueryGenerator.dropDatabaseQuery(schema);
+    const sql = this.QueryGenerator.dropDatabaseQuery(database);
     return this.sequelize.query(sql, options);
     return this.sequelize.query(sql, options);
   }
   }
 
 

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

@@ -18,15 +18,15 @@ if (dialect === 'mysql') {
         },
         },
         {
         {
           arguments: ['myDatabase', {charset: 'utf8mb4'}],
           arguments: ['myDatabase', {charset: 'utf8mb4'}],
-          expectation: 'CREATE DATABASE IF NOT EXISTS `myDatabase` DEFAULT CHARSET SET = \'utf8mb4\';'
+          expectation: 'CREATE DATABASE IF NOT EXISTS `myDatabase` DEFAULT CHARACTER SET \'utf8mb4\';'
         },
         },
         {
         {
           arguments: ['myDatabase', {collate: 'utf8mb4_unicode_ci'}],
           arguments: ['myDatabase', {collate: 'utf8mb4_unicode_ci'}],
-          expectation: 'CREATE DATABASE IF NOT EXISTS `myDatabase` DEFAULT COLLATE = \'utf8mb4_unicode_ci\';'
+          expectation: 'CREATE DATABASE IF NOT EXISTS `myDatabase` DEFAULT COLLATE \'utf8mb4_unicode_ci\';'
         },
         },
         {
         {
           arguments: ['myDatabase', {charset: 'utf8mb4', collate: 'utf8mb4_unicode_ci'}],
           arguments: ['myDatabase', {charset: 'utf8mb4', collate: 'utf8mb4_unicode_ci'}],
-          expectation: 'CREATE DATABASE IF NOT EXISTS `myDatabase` DEFAULT CHARSET SET = \'utf8mb4\' DEFAULT COLLATE = \'utf8mb4_unicode_ci\';'
+          expectation: 'CREATE DATABASE IF NOT EXISTS `myDatabase` DEFAULT CHARACTER SET \'utf8mb4\' DEFAULT COLLATE \'utf8mb4_unicode_ci\';'
         }
         }
       ],
       ],
       dropDatabaseQuery: [
       dropDatabaseQuery: [

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

@@ -17,25 +17,37 @@ if (dialect.match(/^postgres/)) {
       createDatabaseQuery: [
       createDatabaseQuery: [
         {
         {
           arguments: ['myDatabase'],
           arguments: ['myDatabase'],
-          expectation: 'CREATE DATABASE IF NOT EXISTS "myDatabase";'
+          expectation: 'CREATE DATABASE "myDatabase";'
         },
         },
         {
         {
           arguments: ['myDatabase', {encoding: 'UTF8'}],
           arguments: ['myDatabase', {encoding: 'UTF8'}],
-          expectation: 'CREATE DATABASE IF NOT EXISTS "myDatabase" ENCODING = \'UTF8\';'
+          expectation: 'CREATE DATABASE "myDatabase" ENCODING = \'UTF8\';'
         },
         },
         {
         {
           arguments: ['myDatabase', {collate: 'en_US.UTF-8'}],
           arguments: ['myDatabase', {collate: 'en_US.UTF-8'}],
-          expectation: 'CREATE DATABASE IF NOT EXISTS "myDatabase" LC_COLLATE = \'en_US.UTF-8\';'
+          expectation: 'CREATE DATABASE "myDatabase" LC_COLLATE = \'en_US.UTF-8\';'
         },
         },
         {
         {
-          arguments: ['myDatabase', {encoding: 'UTF8', collate: 'en_US.UTF-8'}],
-          expectation: 'CREATE DATABASE IF NOT EXISTS "myDatabase" ENCODING = \'UTF8\' LC_COLLATE = \'en_US.UTF-8\';'
+          arguments: ['myDatabase', {encoding: 'UTF8'}],
+          expectation: 'CREATE DATABASE "myDatabase" ENCODING = \'UTF8\';'
+        },
+        {
+          arguments: ['myDatabase', {ctype: 'zh_TW.UTF-8'}],
+          expectation: 'CREATE DATABASE "myDatabase" LC_CTYPE = \'zh_TW.UTF-8\';'
+        },
+        {
+          arguments: ['myDatabase', {template: 'template0'}],
+          expectation: 'CREATE DATABASE "myDatabase" TEMPLATE = \'template0\';'
+        },
+        {
+          arguments: ['myDatabase', {encoding: 'UTF8', collate: 'en_US.UTF-8', ctype: 'zh_TW.UTF-8', template: 'template0'}],
+          expectation: 'CREATE DATABASE "myDatabase" ENCODING = \'UTF8\' LC_COLLATE = \'en_US.UTF-8\' LC_CTYPE = \'zh_TW.UTF-8\' TEMPLATE = \'template0\';'
         }
         }
       ],
       ],
       dropDatabaseQuery: [
       dropDatabaseQuery: [
         {
         {
           arguments: ['myDatabase'],
           arguments: ['myDatabase'],
-          expectation: 'DROP DATABASE IF EXISTS "myDatabase" CASCADE;'
+          expectation: 'DROP DATABASE IF EXISTS "myDatabase";'
         }
         }
       ],
       ],
       arithmeticQuery: [
       arithmeticQuery: [