[update]: codeql suggestion updates + new tests on generated

Author: AleksandrSherman

drizzle-kit/src/dialects/cockroach/grammar.ts

@@ -327,10 +327,10 @@ export const unescapeFromSqlDefault = (input: string) => {
 
 	input = trimChar(input, "'");
 
-	let res = input.replace(/\\"/g, '"').replace(/\\\\/g, '\\');
+	let res = input.replace(/\\"/g, '"').replace(/\\'/g, "'").replace(/\\\\/g, '\\');
 
 	// if (mode === 'arr') return res;
-	return res.replace(/\\'/g, "'");
+	return res;
 };
 
 export const escapeForTsLiteral = (input: string) => {

drizzle-kit/src/dialects/postgres/grammar.ts

@@ -1338,7 +1338,7 @@ export const Line: SqlType = {
 			const res = parseArray(trimmed);
 
 			const def = stringifyArray(res, 'ts', (v) => {
-				if (!/^\(\d+,\d+,\d+\)$/.test(v)) isDrizzleSql = true;
+				if (!/^\{\d+,\d+,\d+\}$/.test(v)) isDrizzleSql = true;
 				return v.replace('{', '[').replace('}', ']');
 			});
 

drizzle-kit/src/dialects/sqlite/grammar.ts

@@ -231,7 +231,7 @@ export const Blob: SqlType = {
 
 		if (typeof Buffer !== 'undefined' && value.startsWith("X'")) {
 			const parsed = Buffer.from(value.slice(2, value.length - 1), 'hex').toString('utf-8');
-			const escaped = parsed.replaceAll('\\', '\\\\').replace('"', '\\"');
+			const escaped = parsed.replaceAll('\\', '\\\\').replaceAll('"', '\\"');
 			return `Buffer.from("${escaped}")`;
 		}
 

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

@@ -1087,3 +1087,30 @@ test('generated as string: change generated constraint', async () => {
 	expect(st).toStrictEqual(st0);
 	expect(pst).toStrictEqual([]);
 });
+
+test('generated as string: with backslashes', async () => {
+	const to = {
+		users: mysqlTable('users', {
+			id: int('id'),
+			id2: int('id2'),
+			name: text('name'),
+			generatedName: text('gen_name').generatedAlwaysAs(
+				`'users\\\\hello'`,
+			),
+		}),
+	};
+
+	const { sqlStatements: st } = await diff({}, to, []);
+	const { sqlStatements: pst } = await push({ db, to });
+
+	const st0: string[] = [
+		`CREATE TABLE \`users\` (
+	\`id\` int,
+	\`id2\` int,
+	\`name\` text,
+	\`gen_name\` text GENERATED ALWAYS AS ('users\\\\hello') VIRTUAL
+);\n`,
+	];
+	expect(st).toStrictEqual(st0);
+	expect(pst).toStrictEqual(st0);
+});

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

@@ -544,3 +544,21 @@ test('introspect bit(1); custom type', async () => {
 	expect(statements.length).toBe(0);
 	expect(sqlStatements.length).toBe(0);
 });
+
+test('generated as string: change generated constraint', async () => {
+	const schema = {
+		users: mysqlTable('users', {
+			id: int('id'),
+			id2: int('id2'),
+			name: text('name'),
+			generatedName: text('gen_name').generatedAlwaysAs(
+				`'users\\\\hello'`,
+			),
+		}),
+	};
+
+	const { statements, sqlStatements } = await diffIntrospect(db, schema, 'introspect-generated-with-backslashes');
+
+	expect(statements.length).toBe(0);
+	expect(sqlStatements.length).toBe(0);
+});