Merge pull request #1924 from taozhi8833998/fix-create-db-quoted-name

fix: create database with quoted db name in all dialect
taozhi8833998 · May 28, 2024 · df125f8 · df125f8
2 parents b94678b + b2f4281
commit df125f8
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 24 deletions.
diff --git a/pegjs/athena.pegjs b/pegjs/athena.pegjs
@@ -287,7 +287,7 @@ create_db_stmt
   = a:KW_CREATE __
     k:(KW_DATABASE / KW_SCHEME) __
     ife:if_not_exists_stmt? __
-    t:ident_name __
+    t:ident_without_kw_type __
     c:create_db_definition? {
       return {
         tableList: Array.from(tableList),

diff --git a/pegjs/bigquery.pegjs b/pegjs/bigquery.pegjs
@@ -904,7 +904,7 @@ create_db_stmt
   = a:KW_CREATE __
     k:(KW_DATABASE / KW_SCHEMA) __
     ife:if_not_exists_stmt? __
-    t:ident_name __
+    t:ident_without_kw_type __
     c:create_db_definition? {
       return {
         tableList: Array.from(tableList),

diff --git a/pegjs/db2.pegjs b/pegjs/db2.pegjs
@@ -286,7 +286,7 @@ create_db_stmt
   = a:KW_CREATE __
     k:(KW_DATABASE / KW_SCHEME) __
     ife:if_not_exists_stmt? __
-    t:ident_name __
+    t:ident_without_kw_type __
     c:create_db_definition? {
       return {
         tableList: Array.from(tableList),

diff --git a/pegjs/flinksql.pegjs b/pegjs/flinksql.pegjs
@@ -628,7 +628,7 @@ create_db_stmt
   = a:KW_CREATE __
     k:(KW_DATABASE / KW_SCHEME) __
     ife:if_not_exists_stmt? __
-    t:ident_name __
+    t:ident_without_kw_type __
     c:create_db_definition? {
       return {
         tableList: Array.from(tableList),

diff --git a/pegjs/hive.pegjs b/pegjs/hive.pegjs
@@ -287,7 +287,7 @@ create_db_stmt
   = a:KW_CREATE __
     k:(KW_DATABASE / KW_SCHEME) __
     ife:if_not_exists_stmt? __
-    t:ident_name __
+    t:ident_without_kw_type __
     c:create_db_definition? {
       return {
         tableList: Array.from(tableList),

diff --git a/pegjs/mariadb.pegjs b/pegjs/mariadb.pegjs
@@ -344,7 +344,7 @@ create_db_stmt
   = a:KW_CREATE __
     k:(KW_DATABASE / KW_SCHEMA) __
     ife:if_not_exists_stmt? __
-    t:ident_name __
+    t:ident_without_kw_type __
     c:create_db_definition? {
       return {
         tableList: Array.from(tableList),

diff --git a/pegjs/mysql.pegjs b/pegjs/mysql.pegjs
@@ -540,7 +540,7 @@ create_db_stmt
   = a:KW_CREATE __
     k:(KW_DATABASE / KW_SCHEMA) __
     ife:if_not_exists_stmt? __
-    t:ident_name __
+    t:ident_without_kw_type __
     c:create_db_definition? {
       return {
         tableList: Array.from(tableList),

diff --git a/pegjs/noql.pegjs b/pegjs/noql.pegjs
@@ -359,14 +359,14 @@ create_db_stmt
   = a:KW_CREATE __
     k:(KW_DATABASE / KW_SCHEMA) __
     ife:if_not_exists_stmt? __
-    t:ident_name __
+    t:ident_without_kw_type __
     c:create_db_definition? {
       /*
       export type create_db_stmt = {
         type: 'create',
         keyword: 'database' | 'schema',
         if_not_exists?: 'if not exists',
-        database: string,
+        database: ident_without_kw_type,
         create_definitions?: create_db_definition
       }
       => AstStatement<create_db_stmt>

diff --git a/pegjs/postgresql.pegjs b/pegjs/postgresql.pegjs
@@ -372,14 +372,14 @@ create_db_stmt
   = a:KW_CREATE __
     k:(KW_DATABASE / KW_SCHEMA) __
     ife:if_not_exists_stmt? __
-    t:ident_name __
+    t:ident_without_kw_type __
     c:create_db_definition? {
       /*
       export type create_db_stmt_t = {
         type: 'create',
         keyword: 'database' | 'schema',
         if_not_exists?: 'if not exists',
-        database: string,
+        database: ident_without_kw_type,
         create_definitions?: create_db_definition
       }
       => AstStatement<create_db_stmt_t>

diff --git a/pegjs/redshift.pegjs b/pegjs/redshift.pegjs
@@ -369,14 +369,14 @@ create_db_stmt
   = a:KW_CREATE __
     k:(KW_DATABASE / KW_SCHEMA) __
     ife:if_not_exists_stmt? __
-    t:ident_name __
+    t:ident_without_kw_type __
     c:create_db_definition? {
       /*
       export type create_db_stmt = {
         type: 'create',
         keyword: 'database' | 'schema',
         if_not_exists?: 'if not exists',
-        database: string,
+        database: ident_without_kw_type,
         create_definitions?: create_db_definition
       }
       => AstStatement<create_db_stmt>

diff --git a/pegjs/snowflake.pegjs b/pegjs/snowflake.pegjs
@@ -351,14 +351,14 @@ create_db_stmt
   = a:KW_CREATE __
     k:(KW_DATABASE / KW_SCHEMA) __
     ife:if_not_exists_stmt? __
-    t:ident_name __
+    t:ident_without_kw_type __
     c:create_db_definition? {
       /*
       export type create_db_stmt = {
         type: 'create',
         keyword: 'database' | 'schema',
         if_not_exists?: 'if not exists',
-        database: string,
+        database: ident_without_kw_type,
         create_definitions?: create_db_definition
       }
       => AstStatement<create_db_stmt>

diff --git a/pegjs/sqlite.pegjs b/pegjs/sqlite.pegjs
@@ -365,7 +365,7 @@ create_db_stmt
   = a:KW_CREATE __
     k:(KW_DATABASE / KW_SCHEME) __
     ife:if_not_exists_stmt? __
-    t:ident_name __
+    t:ident_without_kw_type __
     c:create_db_definition? {
       return {
         tableList: Array.from(tableList),

diff --git a/pegjs/transactsql.pegjs b/pegjs/transactsql.pegjs
@@ -380,7 +380,7 @@ create_db_stmt
   = a:KW_CREATE __
     k:(KW_DATABASE / KW_SCHEME) __
     ife:if_not_exists_stmt? __
-    t:ident_name __
+    t:ident_without_kw_type __
     c:create_db_definition? {
       return {
         tableList: Array.from(tableList),

diff --git a/pegjs/trino.pegjs b/pegjs/trino.pegjs
@@ -380,14 +380,14 @@ create_db_stmt
   = a:KW_CREATE __
     k:(KW_DATABASE / KW_SCHEMA) __
     ife:if_not_exists_stmt? __
-    t:ident_name __
+    t:ident_without_kw_type __
     c:create_db_definition? {
       /*
       export type create_db_stmt = {
         type: 'create',
         keyword: 'database' | 'schema',
         if_not_exists?: 'if not exists',
-        database: string,
+        database: ident_without_kw_type,
         create_definitions?: create_db_definition
       }
       => AstStatement<create_db_stmt>

diff --git a/src/create.js b/src/create.js
@@ -215,7 +215,7 @@ function createDatabaseToSQL(stmt) {
     toUpper(type),
     toUpper(keyword),
     toUpper(ifNotExists),
-    columnIdentifierToSql(database),
+    literalToSQL(database),
   ]
   if (createDefinition) sql.push(createDefinition.map(tableOptionToSQL).join(' '))
   return sql.filter(hasVal).join(' ')

diff --git a/test/create.spec.js b/test/create.spec.js
@@ -590,10 +590,10 @@ describe('create', () => {
 
   describe('create database', () => {
     it('should support create database', () => {
-      expect(getParsedSql('CREATE DATABASE abc')).to.equal('CREATE DATABASE `abc`')
-      expect(getParsedSql('CREATE DATABASE IF NOT EXISTS abc')).to.equal('CREATE DATABASE IF NOT EXISTS `abc`')
-      expect(getParsedSql('CREATE DATABASE IF NOT EXISTS abc default CHARACTER SET utf8mb4')).to.equal('CREATE DATABASE IF NOT EXISTS `abc` DEFAULT CHARACTER SET utf8mb4')
-      expect(getParsedSql('CREATE DATABASE IF NOT EXISTS abc CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci')).to.equal('CREATE DATABASE IF NOT EXISTS `abc` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci')
+      expect(getParsedSql('CREATE DATABASE abc')).to.equal('CREATE DATABASE abc')
+      expect(getParsedSql('CREATE DATABASE IF NOT EXISTS `abc`')).to.equal('CREATE DATABASE IF NOT EXISTS `abc`')
+      expect(getParsedSql('CREATE DATABASE IF NOT EXISTS abc default CHARACTER SET utf8mb4')).to.equal('CREATE DATABASE IF NOT EXISTS abc DEFAULT CHARACTER SET utf8mb4')
+      expect(getParsedSql('CREATE DATABASE IF NOT EXISTS `abc` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci')).to.equal('CREATE DATABASE IF NOT EXISTS `abc` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci')
     })
   })