Merge branch 'master' into case

kysely-org · May 13, 2023 · 6ccbbd3 · 6ccbbd3
2 parents f7a4a1b + bf5613f
commit 6ccbbd3
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 3 deletions.
diff --git a/src/operation-node/alter-table-node.ts b/src/operation-node/alter-table-node.ts
@@ -40,10 +40,10 @@ export const AlterTableNode = freeze({
     return node.kind === 'AlterTableNode'
   },
 
-  create(table: string): AlterTableNode {
+  create(table: TableNode): AlterTableNode {
     return freeze({
       kind: 'AlterTableNode',
-      table: TableNode.create(table),
+      table,
     })
   },
 

diff --git a/src/schema/schema.ts b/src/schema/schema.ts
@@ -210,7 +210,7 @@ export class SchemaModule {
     return new AlterTableBuilder({
       queryId: createQueryId(),
       executor: this.#executor,
-      node: AlterTableNode.create(table),
+      node: AlterTableNode.create(parseTable(table)),
     })
   }
 

diff --git a/test/node/src/schema.test.ts b/test/node/src/schema.test.ts
@@ -2466,6 +2466,41 @@ for (const dialect of DIALECTS) {
         })
       }
 
+      if (dialect !== 'sqlite') {
+        describe('parse schema name', () => {
+          beforeEach(cleanup)
+          afterEach(cleanup)
+
+          it('should parse the schema from table name', async () => {
+            await ctx.db.schema.createSchema('test_schema').ifNotExists().execute()
+            await ctx.db.schema.createTable('test_schema.test').addColumn('id', 'serial').execute();
+
+            const builder = ctx.db.schema
+              .alterTable('test_schema.test')
+              .addColumn('second_column', 'text')
+
+            testSql(builder, dialect, {
+              postgres: {
+                sql: `alter table "test_schema"."test" add column "second_column" text`,
+                parameters: [],
+              },
+              mysql: {
+                sql: "alter table `test_schema`.`test` add column `second_column` text",
+                parameters: [],
+              },
+              sqlite: NOT_SUPPORTED,
+            })
+
+            await builder.execute()
+          })
+
+          async function cleanup() {
+            await ctx.db.schema.dropTable('test_schema.test').ifExists().execute()
+            await ctx.db.schema.dropSchema('test_schema').ifExists().execute()
+          }
+        })
+      }
+
       it('should alter a table calling query builder functions', async () => {
         const builder = ctx.db.schema
           .alterTable('test')