Merge branch 'alternation-engine' of https://github.com/drizzle-team/drizzle-orm into alternation-engine

Author: OleksiiKH0240

.github/workflows/release-feature-branch.yaml

@@ -273,31 +273,6 @@ jobs:
             *) echo "Unknown shard: ${{matrix.shard}}"; exit 1 ;;
           esac
 
-      - name: Stop DBs
-        if: always() && ${{ matrix.dbs && join(matrix.dbs, ',') != '' }}
-        shell: bash
-        run: |
-          set -euxo pipefail
-
-          if [ -n "${{ join(matrix.dbs, ' ') }}" ]; then
-            compose_files=()
-            for db in ${{ join(matrix.dbs, ' ') }}; do
-              case "$db" in
-                postgres)            compose_files+=("-f" "compose/postgres.yml") ;;
-                postgres-postgis)    compose_files+=("-f" "compose/postgres-postgis.yml") ;;
-                postgres-vector)     compose_files+=("-f" "compose/postgres-vector.yml") ;;
-                mysql)               compose_files+=("-f" "compose/mysql.yml") ;;
-                singlestore)         compose_files+=("-f" "compose/singlestore.yml") ;;
-                singlestore-many)    compose_files+=("-f" "compose/singlestore-many.yml") ;;
-                mssql)               compose_files+=("-f" "compose/mssql.yml") ;;
-                cockroach)           compose_files+=("-f" "compose/cockroach.yml") ;;
-                gel)                 compose_files+=("-f" "compose/gel.yml") ;;
-                *) echo "Unknown db '$db'"; exit 1 ;;
-              esac
-            done
-            docker compose "${compose_files[@]}" down -v
-          fi
-
   attw:
     needs: [prepare]
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository

drizzle-kit/src/dialects/mysql/diff.ts

@@ -285,7 +285,11 @@ export const ddlDiff = async (
 	).map((it) => prepareStatement('drop_index', { index: it }));
 
 	const dropFKStatements = fksDiff.filter((it) => it.$diffType === 'drop')
-		.filter((it) => !deletedTables.some((x) => x.name === it.table))
+		.filter((it) => {
+			const tableDeteled = deletedTables.some((x) => x.name === it.table);
+			const tableToDeleted = deletedTables.some((x) => x.name === it.tableTo);
+			return !(tableDeteled && !tableToDeleted);
+		})
 		.map((it) => prepareStatement('drop_constraint', { table: it.table, constraint: it.name }));
 
 	const dropPKStatements = pksDiff.filter((it) => it.$diffType === 'drop')
@@ -440,6 +444,7 @@ export const ddlDiff = async (
 
 	const statements = [
 		...createTableStatements,
+		...dropFKStatements,
 		...dropTableStatements,
 		...renameTableStatements,
 
@@ -450,16 +455,16 @@ export const ddlDiff = async (
 		...alterViewStatements,
 
 		...dropCheckStatements,
-		...dropFKStatements,
+
 		...dropIndexeStatements,
 		...dropPKStatements,
 
 		...columnAlterStatements,
 		...columnRecreateStatatements,
 
+		...addColumnsStatemets,
 		...createPKStatements,
 
-		...addColumnsStatemets,
 		...createIndexesStatements,
 		...createFKsStatements,
 		...createCheckStatements,

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

@@ -898,18 +898,10 @@ test('drop column with pk and add pk to another column #2', async () => {
 // https://github.com/drizzle-team/drizzle-orm/issues/4456
 test('drop column with pk and add pk to another column #3', async () => {
 	const schema1 = {
-		authors: mysqlTable(
-			'authors',
-			{
-				publicationId: varchar('publication_id', { length: 64 }),
-				authorID: varchar('author_id', { length: 10 }),
-			},
-			(table) => {
-				return {
-					pk: primaryKey(table.publicationId, table.authorID),
-				};
-			},
-		),
+		authors: mysqlTable('authors', {
+			publicationId: varchar('publication_id', { length: 64 }),
+			authorID: varchar('author_id', { length: 10 }),
+		}, (table) => [primaryKey({ columns: [table.publicationId, table.authorID] })]),
 	};
 
 	const { sqlStatements: st1, next: n1 } = await diff({}, schema1, []);
@@ -922,19 +914,13 @@ test('drop column with pk and add pk to another column #3', async () => {
 	expect(pst1).toStrictEqual(expectedSt1);
 
 	const schema2 = {
-		authors: mysqlTable(
-			'authors',
-			{
-				publicationId: varchar('publication_id', { length: 64 }),
-				authorID: varchar('author_id', { length: 10 }),
-				orcidId: varchar('orcid_id', { length: 64 }),
-			},
-			(table) => {
-				return {
-					pk: primaryKey(table.publicationId, table.authorID, table.orcidId),
-				};
-			},
-		),
+		authors: mysqlTable('authors', {
+			publicationId: varchar('publication_id', { length: 64 }),
+			authorID: varchar('author_id', { length: 10 }),
+			orcidId: varchar('orcid_id', { length: 64 }),
+		}, (table) => [
+			primaryKey({ columns: [table.publicationId, table.authorID, table.orcidId] }),
+		]),
 	};
 
 	const { sqlStatements: st2 } = await diff(n1, schema2, []);

drizzle-kit/tests/mysql/mysql.test.ts

@@ -242,7 +242,7 @@ test('drop tables with fk constraint', async () => {
 	const table1 = mysqlTable('table1', {
 		column1: int().primaryKey(),
 	});
-	const table2 = mysqlTable('table1', {
+	const table2 = mysqlTable('table2', {
 		column1: int().primaryKey(),
 		column2: int().references(() => table1.column1),
 	});
@@ -252,8 +252,8 @@ test('drop tables with fk constraint', async () => {
 	const { sqlStatements: pst1 } = await push({ db, to: schema1 });
 	const expectedSt1 = [
 		'CREATE TABLE `table1` (\n\t`column1` int PRIMARY KEY\n);\n',
-		'CREATE TABLE `table2` (\n\t`column1` int PRIMARY KEY,\n\t`column2` int,'
-		+ '\n\tCONSTRAINT `table1_column2_table1_column1_fkey` FOREIGN KEY (`column2`) REFERENCES `table1`(`column1`)\n);\n',
+		'CREATE TABLE `table2` (\n\t`column1` int PRIMARY KEY,\n\t`column2` int\n);\n',
+		'ALTER TABLE \`table2\` ADD CONSTRAINT `table2_column2_table1_column1_fkey` FOREIGN KEY (`column2`) REFERENCES `table1`(`column1`);',
 	];
 	expect(st1).toStrictEqual(expectedSt1);
 	expect(pst1).toStrictEqual(expectedSt1);
@@ -262,8 +262,9 @@ test('drop tables with fk constraint', async () => {
 	const { sqlStatements: pst2 } = await push({ db, to: {} });
 
 	const expectedSt2 = [
-		'DROP TABLE `table2`;',
+		'ALTER TABLE `table2` DROP CONSTRAINT `table2_column2_table1_column1_fkey`;',
 		'DROP TABLE `table1`;',
+		'DROP TABLE `table2`;',
 	];
 	expect(st2).toStrictEqual(expectedSt2);
 	expect(pst2).toStrictEqual(expectedSt2);