From 2552c03ca695dd3f6c667007cee8994f33c3378e Mon Sep 17 00:00:00 2001 From: AndriiSherman Date: Mon, 25 Nov 2024 17:53:50 +0200 Subject: [PATCH] Fix build problems --- .../src/singlestore-core/columns/common.ts | 3 +-- drizzle-orm/type-tests/singlestore/tables.ts | 26 +++++++++++-------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/drizzle-orm/src/singlestore-core/columns/common.ts b/drizzle-orm/src/singlestore-core/columns/common.ts index ef494a4c1..c0dc7fb67 100644 --- a/drizzle-orm/src/singlestore-core/columns/common.ts +++ b/drizzle-orm/src/singlestore-core/columns/common.ts @@ -5,7 +5,6 @@ import type { ColumnBuilderRuntimeConfig, ColumnDataType, HasDefault, - HasGenerated, IsAutoincrement, MakeColumnConfig, } from '~/column-builder.ts'; @@ -47,7 +46,7 @@ export abstract class SingleStoreColumnBuilder< // TODO: Implement generated columns for SingleStore (https://docs.singlestore.com/cloud/create-a-database/using-persistent-computed-columns/) /** @internal */ - generatedAlwaysAs(as: SQL | T['data'] | (() => SQL), config?: SingleStoreGeneratedColumnConfig): HasGenerated { + generatedAlwaysAs(as: SQL | T['data'] | (() => SQL), config?: SingleStoreGeneratedColumnConfig) { this.config.generated = { as, type: 'always', diff --git a/drizzle-orm/type-tests/singlestore/tables.ts b/drizzle-orm/type-tests/singlestore/tables.ts index 1df4861af..43a1b05dc 100644 --- a/drizzle-orm/type-tests/singlestore/tables.ts +++ b/drizzle-orm/type-tests/singlestore/tables.ts @@ -91,11 +91,12 @@ Expect< notNull: true; hasDefault: true; isPrimaryKey: true; + isAutoincrement: true; + hasRuntimeDefault: false; enumValues: undefined; baseColumn: never; + identity: undefined; generated: undefined; - isAutoincrement: true; - hasRuntimeDefault: false; }, object>; name: SingleStoreColumn<{ name: 'name_db'; @@ -107,11 +108,12 @@ Expect< notNull: true; hasDefault: false; isPrimaryKey: false; + isAutoincrement: false; + hasRuntimeDefault: false; enumValues: [string, ...string[]]; baseColumn: never; + identity: undefined; generated: undefined; - isAutoincrement: false; - hasRuntimeDefault: false; }, object>; population: SingleStoreColumn<{ name: 'population'; @@ -123,11 +125,12 @@ Expect< notNull: false; hasDefault: true; isPrimaryKey: false; + isAutoincrement: false; + hasRuntimeDefault: false; enumValues: undefined; baseColumn: never; + identity: undefined; generated: undefined; - isAutoincrement: false; - hasRuntimeDefault: false; }, object>; }, typeof cities._.columns @@ -500,7 +503,6 @@ Expect< Expect< Equal< { - brand: 'Column'; name: 'name'; tableName: 'table'; dataType: 'custom'; @@ -509,13 +511,15 @@ Expect< driverParam: unknown; notNull: true; hasDefault: false; - enumValues: undefined; - baseColumn: never; - dialect: 'singlestore'; - generated: undefined; isPrimaryKey: false; isAutoincrement: false; hasRuntimeDefault: false; + enumValues: undefined; + baseColumn: never; + identity: undefined; + generated: undefined; + brand: 'Column'; + dialect: 'singlestore'; }, Simplify['_']> >