Merge commit '780a1da2523acca0741fa5d540621f8b7e3386a9' into alternation-engine

Author: AlexBlokh

drizzle-kit/tests/cockroach/constraints.test.ts

@@ -1638,8 +1638,8 @@ test('fk multistep #4', async ({ dbc: db }) => {
 	const { sqlStatements: st1, next: n1 } = await diff({}, schema1, []);
 	const { sqlStatements: pst1 } = await push({ db, to: schema1 });
 	const expectedSt1 = [
-		'CREATE TABLE "foo" (\n\t"id" integer PRIMARY KEY\n);\n',
-		'CREATE TABLE "bar" (\n\t"id" integer PRIMARY KEY,\n\t"fooId" integer\n);\n',
+		'CREATE TABLE "foo" (\n\t"id" int4 PRIMARY KEY\n);\n',
+		'CREATE TABLE "bar" (\n\t"id" int4 PRIMARY KEY,\n\t"fooId" int4\n);\n',
 		'ALTER TABLE "bar" ADD CONSTRAINT "bar_fooId_foo_id_fkey" FOREIGN KEY ("fooId") REFERENCES "foo"("id");',
 	];
 	expect(st1).toStrictEqual(expectedSt1);
@@ -1897,7 +1897,7 @@ test('drop column with pk and add pk to another column #1', async ({ dbc: db })
 	const expectedSt2: string[] = [
 		'ALTER TABLE "authors" ADD COLUMN "orcid_id" varchar(64);',
 		'ALTER TABLE "authors" DROP CONSTRAINT "authors_pkey";',
-		'ALTER TABLE "authors" ADD PRIMARY KEY ("publication_id","author_id","orcid_id");',
+		'ALTER TABLE "authors" ADD CONSTRAINT "authors_pkey" PRIMARY KEY("publication_id","author_id","orcid_id");',
 	];
 
 	expect(st2).toStrictEqual(expectedSt2);

drizzle-kit/tests/cockroach/tables.test.ts

@@ -773,8 +773,8 @@ test('drop tables with fk constraint', async ({ dbc: db }) => {
 	const { sqlStatements: st1, next: n1 } = await diff({}, schema1, []);
 	const { sqlStatements: pst1 } = await push({ db, to: schema1 });
 	const expectedSt1 = [
-		'CREATE TABLE "table1" (\n\t"column1" integer PRIMARY KEY\n);\n',
-		'CREATE TABLE "table2" (\n\t"column1" integer PRIMARY KEY,\n\t"column2" integer\n);\n',
+		'CREATE TABLE "table1" (\n\t"column1" int4 PRIMARY KEY\n);\n',
+		'CREATE TABLE "table2" (\n\t"column1" int4 PRIMARY KEY,\n\t"column2" int4\n);\n',
 		'ALTER TABLE "table2" ADD CONSTRAINT "table2_column2_table1_column1_fkey" FOREIGN KEY ("column2") REFERENCES "table1"("column1");',
 	];
 	expect(st1).toStrictEqual(expectedSt1);

drizzle-kit/tests/mssql/constraints.test.ts

@@ -1,5 +1,4 @@
 import { sql } from 'drizzle-orm';
-import { cockroachTable } from 'drizzle-orm/cockroach-core';
 import {
 	AnyMsSqlColumn,
 	check,
@@ -1688,9 +1687,9 @@ test('fk multistep #3', async () => {
 	const { sqlStatements: st1, next: n1 } = await diff({}, schema1, []);
 	const { sqlStatements: pst1 } = await push({ db, to: schema1 });
 	const expectedSt1 = [
-		'CREATE TABLE [foo] (\n\t[id] int PRIMARY KEY\n);\n',
-		'CREATE TABLE [bar] (\n\t[id] int PRIMARY KEY,\n\t[fooId] int\n);\n',
-		'ALTER TABLE [bar] ADD CONSTRAINT [bar_fooId_foo_id_fkey] FOREIGN KEY ([fooId]) REFERENCES [foo]([id]);',
+		'CREATE TABLE [foo] (\n\t[id] int,\n\tCONSTRAINT [foo_pkey] PRIMARY KEY([id])\n);\n',
+		'CREATE TABLE [bar] (\n\t[id] int,\n\t[fooId] int,\n\tCONSTRAINT [bar_pkey] PRIMARY KEY([id])\n);\n',
+		'ALTER TABLE [bar] ADD CONSTRAINT [bar_fooId_foo_id_fk] FOREIGN KEY ([fooId]) REFERENCES [foo]([id]);',
 	];
 	expect(st1).toStrictEqual(expectedSt1);
 	expect(pst1).toStrictEqual(expectedSt1);
@@ -1704,7 +1703,7 @@ test('fk multistep #3', async () => {
 	const { sqlStatements: st2 } = await diff(n1, schema2, []);
 	const { sqlStatements: pst2 } = await push({ db, to: schema2 });
 	const expectedSt2 = [
-		'ALTER TABLE [bar] DROP CONSTRAINT [bar_fooId_foo_id_fkey];',
+		'ALTER TABLE [bar] DROP CONSTRAINT [bar_fooId_foo_id_fk];',
 		'DROP TABLE [foo];',
 	];
 	expect(st2).toStrictEqual(expectedSt2);
@@ -2441,7 +2440,7 @@ test('drop column with pk and add pk to another column #1', async () => {
 	expect(pst1).toStrictEqual(expectedSt1);
 
 	const schema2 = {
-		authors: cockroachTable('authors', {
+		authors: mssqlTable('authors', {
 			publicationId: varchar('publication_id', { length: 64 }),
 			authorID: varchar('author_id', { length: 10 }),
 			orcidId: varchar('orcid_id', { length: 64 }),
@@ -2454,9 +2453,9 @@ test('drop column with pk and add pk to another column #1', async () => {
 	const { sqlStatements: pst2 } = await push({ db, to: schema2 });
 
 	const expectedSt2: string[] = [
-		'ALTER TABLE [authors] ADD COLUMN [orcid_id] varchar(64);',
 		'ALTER TABLE [authors] DROP CONSTRAINT [authors_pkey];',
-		'ALTER TABLE [authors] ADD PRIMARY KEY ([publication_id],[author_id],[orcid_id]);',
+		'ALTER TABLE [authors] ADD [orcid_id] varchar(64);',
+		'ALTER TABLE [authors] ADD CONSTRAINT [authors_pkey] PRIMARY KEY ([publication_id],[author_id],[orcid_id]);',
 	];
 
 	expect(st2).toStrictEqual(expectedSt2);

drizzle-kit/tests/mssql/tables.test.ts

@@ -622,9 +622,9 @@ test('drop tables with fk constraint', async () => {
 	const { sqlStatements: st1, next: n1 } = await diff({}, schema1, []);
 	const { sqlStatements: pst1 } = await push({ db, to: schema1 });
 	const expectedSt1 = [
-		'CREATE TABLE [table1] (\n\t[column1] integer PRIMARY KEY\n);\n',
-		'CREATE TABLE [table2] (\n\t[column1] integer PRIMARY KEY,\n\t[column2] integer\n);\n',
-		'ALTER TABLE [table2] ADD CONSTRAINT [table2_column2_table1_column1_fkey] FOREIGN KEY ([column2]) REFERENCES [table1]([column1]);',
+		'CREATE TABLE [table1] (\n\t[column1] int,\n\tCONSTRAINT [table1_pkey] PRIMARY KEY([column1])\n);\n',
+		'CREATE TABLE [table2] (\n\t[column1] int,\n\t[column2] int,\n\tCONSTRAINT [table2_pkey] PRIMARY KEY([column1])\n);\n',
+		'ALTER TABLE [table2] ADD CONSTRAINT [table2_column2_table1_column1_fk] FOREIGN KEY ([column2]) REFERENCES [table1]([column1]);',
 	];
 	expect(st1).toStrictEqual(expectedSt1);
 	expect(pst1).toStrictEqual(expectedSt1);