Fixes for kit singlestore

drizzle-kit/src/sqlgenerator.ts

@@ -3041,9 +3041,9 @@ class PgAlterTableAlterCompositePrimaryKeyConvertor extends Convertor {
 			? `"${statement.schema}"."${statement.tableName}"`
 			: `"${statement.tableName}"`;
 
-		return `ALTER TABLE ${tableNameWithSchema} DROP CONSTRAINT ${statement.oldConstraintName};\n${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newConstraintName} PRIMARY KEY(${
-			newColumns.join(',')
-		});`;
+		return `ALTER TABLE ${tableNameWithSchema} DROP CONSTRAINT "${statement.oldConstraintName}";\n${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT "${statement.newConstraintName}" PRIMARY KEY("${
+			newColumns.join('","')
+		}");`;
 	}
 }
 

drizzle-kit/tests/push/common.ts

@@ -31,7 +31,7 @@ export const run = (
 
 	beforeEach(beforeEachFn ? () => beforeEachFn(context) : () => {});
 
-	test('No diffs for all database types', () => suite.allTypes(context));
+	test.only('No diffs for all database types', () => suite.allTypes(context));
 	test('Adding basic indexes', () => suite.addBasicIndexes(context));
 	test('Dropping basic index', () => suite.dropIndex(context));
 	test('Altering indexes', () => suite.changeIndexFields(context));

drizzle-kit/tests/push/singlestore.test.ts

@@ -1,5 +1,5 @@
 import Docker from 'dockerode';
-import { sql } from 'drizzle-orm';
+import { SQL, sql } from 'drizzle-orm';
 import {
 	bigint,
 	binary,
@@ -10,8 +10,10 @@ import {
 	double,
 	float,
 	int,
+	json,
 	mediumint,
 	primaryKey,
+	serial,
 	singlestoreEnum,
 	singlestoreTable,
 	smallint,
@@ -82,15 +84,15 @@ const singlestoreSuite: DialectSuite = {
 					'h',
 				),
 			}),
-			allDateTimes: singlestoreTable('all_date_times', {
-				simple: datetime('simple', { mode: 'string', fsp: 0 }),
-				columnNotNull: datetime('column_not_null', {
-					mode: 'string',
-				}).notNull(),
-				columnDefault: datetime('column_default', { mode: 'string' }).default(
-					'2023-03-01 14:05:29',
-				),
-			}),
+			//   allDateTimes: singlestoreTable("all_date_times", {
+			//     simple: datetime("simple", { mode: "string", fsp: 1 }),
+			//     columnNotNull: datetime("column_not_null", {
+			//       mode: "string",
+			//     }).notNull(),
+			//     columnDefault: datetime("column_default", { mode: "string" }).default(
+			//       "2023-03-01 14:05:29"
+			//     ),
+			//   }),
 			allDates: singlestoreTable('all_dates', {
 				simple: date('simple', { mode: 'string' }),
 				column_not_null: date('column_not_null', { mode: 'string' }).notNull(),
@@ -207,10 +209,10 @@ const singlestoreSuite: DialectSuite = {
 			}),
 
 			allTimestamps: singlestoreTable('all_timestamps', {
-				columnDateNow: timestamp('column_date_now', {
-					fsp: 0,
-					mode: 'string',
-				}).default(sql`CURRENT_TIMESTAMP`),
+				// columnDateNow: timestamp("column_date_now", {
+				//   fsp: 1,
+				//   mode: "string",
+				// }).default(sql`(now())`),
 				columnAll: timestamp('column_all', { mode: 'string' })
 					.default('2023-03-01 14:05:29')
 					.notNull(),
@@ -257,7 +259,7 @@ const singlestoreSuite: DialectSuite = {
 			'drizzle',
 			false,
 		);
-
+		console.log(statements);
 		expect(statements.length).toBe(0);
 		expect(statements).toEqual([]);
 

drizzle-kit/vitest.config.ts

@@ -6,10 +6,10 @@ export default defineConfig({
 		include: [
 			'tests/**/*.test.ts',
 			// Need to test it first before pushing changes
-			'tests/singlestore-schemas.test.ts',
-			'tests/singlestore-views.test.ts',
-			'tests/push/singlestore-push.test.ts',
-			'tests/push/singlestore.test.ts',
+			// 'tests/singlestore-schemas.test.ts',
+			// 'tests/singlestore-views.test.ts',
+			// 'tests/push/singlestore-push.test.ts',
+			// 'tests/push/singlestore.test.ts',
 		],
 
 		// This one was excluded because we need to modify an API for SingleStore-generated columns.

drizzle-orm/src/singlestore-core/columns/decimal.ts

@@ -24,11 +24,14 @@ export type SingleStoreDecimalBuilderInitial<TName extends string> = SingleStore
 
 export class SingleStoreDecimalBuilder<
 	T extends ColumnBuilderBaseConfig<'string', 'SingleStoreDecimal'>,
-> extends SingleStoreColumnBuilderWithAutoIncrement<T, SingleStoreDecimalConfig> {
-	// eslint-disable-next-line @typescript-eslint/no-unused-vars
+> extends SingleStoreColumnBuilderWithAutoIncrement<
+	T,
+	SingleStoreDecimalConfig
+> {
+	/** @internal */
 	override generatedAlwaysAs(
-		as: SQL<unknown> | (() => SQL) | T['data'],
-		config?: Partial<GeneratedColumnConfig<unknown>>,
+		_as: T['data'] | SQL<unknown> | (() => SQL),
+		_config?: Partial<GeneratedColumnConfig<unknown>>,
 	): HasGenerated<this, {}> {
 		throw new Error('Method not implemented.');
 	}
@@ -52,9 +55,9 @@ export class SingleStoreDecimalBuilder<
 	}
 }
 
-export class SingleStoreDecimal<T extends ColumnBaseConfig<'string', 'SingleStoreDecimal'>>
-	extends SingleStoreColumnWithAutoIncrement<T, SingleStoreDecimalConfig>
-{
+export class SingleStoreDecimal<
+	T extends ColumnBaseConfig<'string', 'SingleStoreDecimal'>,
+> extends SingleStoreColumnWithAutoIncrement<T, SingleStoreDecimalConfig> {
 	static override readonly [entityKind]: string = 'SingleStoreDecimal';
 
 	readonly precision: number | undefined = this.config.precision;
@@ -89,7 +92,13 @@ export function decimal<TName extends string>(
 	name: TName,
 	config?: SingleStoreDecimalConfig,
 ): SingleStoreDecimalBuilderInitial<TName>;
-export function decimal(a?: string | SingleStoreDecimalConfig, b: SingleStoreDecimalConfig = {}) {
-	const { name, config } = getColumnNameAndConfig<SingleStoreDecimalConfig>(a, b);
+export function decimal(
+	a?: string | SingleStoreDecimalConfig,
+	b: SingleStoreDecimalConfig = {},
+) {
+	const { name, config } = getColumnNameAndConfig<SingleStoreDecimalConfig>(
+		a,
+		b,
+	);
 	return new SingleStoreDecimalBuilder(name, config);
 }