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

Author: AndriiSherman

drizzle-kit/src/cli/commands/up-postgres.ts

@@ -120,9 +120,7 @@ export const upToV8 = (it: Record<string, any>): { snapshot: PostgresSnapshot; h
 						cycle: column.identity.cycle ?? null,
 					}
 					: null,
-				default: typeof column.default === 'undefined'
-					? null
-					: { type: 'unknown', value: trimDefaultValueSuffix(String(column.default)) },
+				default: typeof column.default === 'undefined' ? null : trimDefaultValueSuffix(String(column.default)),
 			});
 		}
 

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

@@ -16,10 +16,7 @@ export const createDDL = () => {
 			typeSchema: 'string?',
 			notNull: 'boolean',
 			dimensions: 'number',
-			default: {
-				value: 'string',
-				type: ['null', 'boolean', 'number', 'string', 'bigint', 'json', 'func', 'unknown'],
-			},
+			default: 'string?',
 			generated: {
 				type: ['stored'],
 				as: 'string',

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

@@ -740,8 +740,8 @@ export const ddlDiff = async (
 				|| (it.$left.type === 'jsonb' && it.$right.type === 'jsonb'))
 		) {
 			if (it.default.from !== null && it.default.to !== null) {
-				const left = stringify(parse(trimChar(it.default.from.value, "'")));
-				const right = stringify(parse(trimChar(it.default.to.value, "'")));
+				const left = stringify(parse(trimChar(it.default.from, "'")));
+				const right = stringify(parse(trimChar(it.default.to, "'")));
 				if (left === right) {
 					delete it.default;
 				}

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

@@ -178,41 +178,37 @@ export const defaultFromColumn = (
 		sql = trimDefaultValueSuffix(sql);
 
 		// TODO: check if needed
-
 		// const isText = /^'(?:[^']|'')*'$/.test(sql);
 		// sql = isText ? trimChar(sql, "'") : sql;
 
-		return {
-			value: sql,
-			type: 'unknown',
-		};
+		return sql;
 	}
 
 	const { baseColumn, isEnum } = unwrapColumn(base);
 	const grammarType = typeFor(base.getSQLType(), isEnum);
 	if (is(baseColumn, PgPointTuple) || is(baseColumn, PgPointObject)) {
 		return dimensions > 0 && Array.isArray(def)
 			? def.flat(5).length === 0
-				? { value: "'{}'", type: 'unknown' }
+				? "'{}'"
 				: Point.defaultArrayFromDrizzle(def, dimensions, baseColumn.mode)
 			: Point.defaultFromDrizzle(def, baseColumn.mode);
 	}
 	if (is(baseColumn, PgLineABC) || is(baseColumn, PgLineTuple)) {
 		return dimensions > 0 && Array.isArray(def)
 			? def.flat(5).length === 0
-				? { value: "'{}'", type: 'unknown' }
+				? "'{}'"
 				: Line.defaultArrayFromDrizzle(def, dimensions, baseColumn.mode)
 			: Line.defaultFromDrizzle(def, baseColumn.mode);
 	}
 	if (is(baseColumn, PgGeometry) || is(baseColumn, PgGeometryObject)) {
 		return dimensions > 0 && Array.isArray(def)
 			? def.flat(5).length === 0
-				? { value: "'{}'", type: 'unknown' }
+				? "'{}'"
 				: GeometryPoint.defaultArrayFromDrizzle(def, dimensions, baseColumn.mode, baseColumn.srid)
 			: GeometryPoint.defaultFromDrizzle(def, baseColumn.mode, baseColumn.srid);
 	}
 	if (dimensions > 0 && Array.isArray(def)) {
-		if (def.flat(5).length === 0) return { value: "'{}'", type: 'unknown' };
+		if (def.flat(5).length === 0) return "'{}'";
 
 		return grammarType.defaultArrayFromDrizzle(def, dimensions);
 	}