Commutativity

Author: AndriiSherman

drizzle-kit/src/cli/commands/check.ts

@@ -1,19 +1,19 @@
 import { readFileSync } from 'fs';
+import { detectNonCommutative } from 'src/utils/commutativity';
 import type { Dialect } from '../../utils/schemaValidator';
 import { prepareOutFolder, validatorForDialect } from '../../utils/utils-node';
 import { info } from '../views';
-import { detectNonCommutative } from 'src/utils/commutativity';
 
 export const checkHandler = async (out: string, dialect: Dialect) => {
 	const { snapshots } = prepareOutFolder(out);
 	const validator = validatorForDialect(dialect);
 
-	const snapshotsData: any[] = [];
+	// const snapshotsData: PostgresSnapshot[] = [];
 
 	for (const snapshot of snapshots) {
 		const raw = JSON.parse(readFileSync(`./${snapshot}`).toString());
 
-		snapshotsData.push(raw);
+		// snapshotsData.push(raw);
 
 		const res = validator(raw);
 		if (res.status === 'unsupported') {
@@ -36,18 +36,18 @@ export const checkHandler = async (out: string, dialect: Dialect) => {
 		}
 	}
 
-	// Non-commutative detection for branching
 	try {
-		const nc = await detectNonCommutative(snapshotsData, dialect);
-		if (nc.conflicts.length > 0) {
+		const response = await detectNonCommutative(snapshots, dialect);
+		if (response!.conflicts.length > 0) {
 			console.log('\nNon-commutative migration branches detected:');
-			for (const c of nc.conflicts) {
+			for (const c of response!.conflicts) {
 				console.log(`- Parent ${c.parentId}${c.parentPath ? ` (${c.parentPath})` : ''}`);
 				console.log(`  A: ${c.branchA.headId} (${c.branchA.path})`);
 				console.log(`  B: ${c.branchB.headId} (${c.branchB.path})`);
 				// for (const r of c.reasons) console.log(`    • ${r}`);
 			}
 		}
 	} catch (e) {
+		console.error(e);
 	}
 };

drizzle-kit/src/cli/commands/mysqlUp.ts

@@ -1,7 +1,7 @@
 import { existsSync, readFileSync, rmSync, unlinkSync, writeFileSync } from 'fs';
 import { join } from 'path';
-import { Column, MySqlSchemaV4, MySqlSchemaV5, mysqlSchemaV5, Table } from '../../serializer/mysqlSchema';
-import { Journal } from '../../utils';
+import type { Column, MySqlSchemaV4, MySqlSchemaV5, Table } from '../../legacy/mysql-v5/mysqlSchema';
+import type { Journal } from '../../utils';
 
 export const upMysqlHandler = (out: string) => {
 	// if there is meta folder - and there is a journal - it's version <8

drizzle-kit/src/cli/commands/singlestoreUp.ts

@@ -1,6 +1,6 @@
 import { existsSync, readFileSync, rmSync, unlinkSync, writeFileSync } from 'fs';
 import { join } from 'path';
-import { Journal } from 'src/utils';
+import type { Journal } from 'src/utils';
 
 export const upSinglestoreHandler = (out: string) => {
 	// if there is meta folder - and there is a journal - it's version <8