diff --git a/drizzle-orm/src/singlestore-core/columns/bigint.ts b/drizzle-orm/src/singlestore-core/columns/bigint.ts index c29c531fa..1e6b64c49 100644 --- a/drizzle-orm/src/singlestore-core/columns/bigint.ts +++ b/drizzle-orm/src/singlestore-core/columns/bigint.ts @@ -1,14 +1,7 @@ -import type { - ColumnBuilderBaseConfig, - ColumnBuilderRuntimeConfig, - GeneratedColumnConfig, - HasGenerated, - MakeColumnConfig, -} from '~/column-builder.ts'; +import type { ColumnBuilderBaseConfig, ColumnBuilderRuntimeConfig, MakeColumnConfig } from '~/column-builder.ts'; import type { ColumnBaseConfig } from '~/column.ts'; import { entityKind } from '~/entity.ts'; import type { AnySingleStoreTable } from '~/singlestore-core/table.ts'; -import type { SQL } from '~/sql/index.ts'; import { getColumnNameAndConfig } from '~/utils.ts'; import { SingleStoreColumnBuilderWithAutoIncrement, SingleStoreColumnWithAutoIncrement } from './common.ts'; @@ -25,13 +18,6 @@ export type SingleStoreBigInt53BuilderInitial = SingleStor export class SingleStoreBigInt53Builder> extends SingleStoreColumnBuilderWithAutoIncrement { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - override generatedAlwaysAs( - as: SQL | (() => SQL) | T['data'], - config?: Partial>, - ): HasGenerated { - throw new Error('Method not implemented.'); - } static override readonly [entityKind]: string = 'SingleStoreBigInt53Builder'; constructor(name: T['name'], unsigned: boolean = false) { @@ -80,13 +66,6 @@ export type SingleStoreBigInt64BuilderInitial = SingleStor export class SingleStoreBigInt64Builder> extends SingleStoreColumnBuilderWithAutoIncrement { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - override generatedAlwaysAs( - as: SQL | (() => SQL) | T['data'], - config?: Partial>, - ): HasGenerated { - throw new Error('Method not implemented.'); - } static override readonly [entityKind]: string = 'SingleStoreBigInt64Builder'; constructor(name: T['name'], unsigned: boolean = false) { diff --git a/drizzle-orm/src/singlestore-core/columns/binary.ts b/drizzle-orm/src/singlestore-core/columns/binary.ts index 4d5f65fc0..153456447 100644 --- a/drizzle-orm/src/singlestore-core/columns/binary.ts +++ b/drizzle-orm/src/singlestore-core/columns/binary.ts @@ -1,14 +1,7 @@ -import type { - ColumnBuilderBaseConfig, - ColumnBuilderRuntimeConfig, - GeneratedColumnConfig, - HasGenerated, - MakeColumnConfig, -} from '~/column-builder.ts'; +import type { ColumnBuilderBaseConfig, ColumnBuilderRuntimeConfig, MakeColumnConfig } from '~/column-builder.ts'; import type { ColumnBaseConfig } from '~/column.ts'; import { entityKind } from '~/entity.ts'; import type { AnySingleStoreTable } from '~/singlestore-core/table.ts'; -import type { SQL } from '~/sql/index.ts'; import { getColumnNameAndConfig } from '~/utils.ts'; import { SingleStoreColumn, SingleStoreColumnBuilder } from './common.ts'; @@ -28,13 +21,6 @@ export class SingleStoreBinaryBuilder { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - override generatedAlwaysAs( - as: SQL | (() => SQL) | T['data'], - config?: Partial>, - ): HasGenerated { - throw new Error('Method not implemented.'); - } static override readonly [entityKind]: string = 'SingleStoreBinaryBuilder'; constructor(name: T['name'], length: number | undefined) { diff --git a/drizzle-orm/src/singlestore-core/columns/boolean.ts b/drizzle-orm/src/singlestore-core/columns/boolean.ts index b02d3741f..bf48ff1da 100644 --- a/drizzle-orm/src/singlestore-core/columns/boolean.ts +++ b/drizzle-orm/src/singlestore-core/columns/boolean.ts @@ -1,14 +1,7 @@ -import type { - ColumnBuilderBaseConfig, - ColumnBuilderRuntimeConfig, - GeneratedColumnConfig, - HasGenerated, - MakeColumnConfig, -} from '~/column-builder.ts'; +import type { ColumnBuilderBaseConfig, ColumnBuilderRuntimeConfig, MakeColumnConfig } from '~/column-builder.ts'; import type { ColumnBaseConfig } from '~/column.ts'; import { entityKind } from '~/entity.ts'; import type { AnySingleStoreTable } from '~/singlestore-core/table.ts'; -import type { SQL } from '~/sql/index.ts'; import { SingleStoreColumn, SingleStoreColumnBuilder } from './common.ts'; export type SingleStoreBooleanBuilderInitial = SingleStoreBooleanBuilder<{ @@ -24,13 +17,6 @@ export type SingleStoreBooleanBuilderInitial = SingleStore export class SingleStoreBooleanBuilder> extends SingleStoreColumnBuilder { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - override generatedAlwaysAs( - as: SQL | (() => SQL) | T['data'], - config?: Partial>, - ): HasGenerated { - throw new Error('Method not implemented.'); - } static override readonly [entityKind]: string = 'SingleStoreBooleanBuilder'; constructor(name: T['name']) { diff --git a/drizzle-orm/src/singlestore-core/columns/char.ts b/drizzle-orm/src/singlestore-core/columns/char.ts index 3a5603e00..512460f92 100644 --- a/drizzle-orm/src/singlestore-core/columns/char.ts +++ b/drizzle-orm/src/singlestore-core/columns/char.ts @@ -1,14 +1,7 @@ -import type { - ColumnBuilderBaseConfig, - ColumnBuilderRuntimeConfig, - GeneratedColumnConfig, - HasGenerated, - MakeColumnConfig, -} from '~/column-builder.ts'; +import type { ColumnBuilderBaseConfig, ColumnBuilderRuntimeConfig, MakeColumnConfig } from '~/column-builder.ts'; import type { ColumnBaseConfig } from '~/column.ts'; import { entityKind } from '~/entity.ts'; import type { AnySingleStoreTable } from '~/singlestore-core/table.ts'; -import type { SQL } from '~/sql/index.ts'; import { getColumnNameAndConfig, type Writable } from '~/utils.ts'; import { SingleStoreColumn, SingleStoreColumnBuilder } from './common.ts'; @@ -29,13 +22,6 @@ export class SingleStoreCharBuilder > { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - override generatedAlwaysAs( - as: SQL | (() => SQL) | T['data'], - config?: Partial>, - ): HasGenerated { - throw new Error('Method not implemented.'); - } static override readonly [entityKind]: string = 'SingleStoreCharBuilder'; constructor(name: T['name'], config: SingleStoreCharConfig) { diff --git a/drizzle-orm/src/singlestore-core/columns/common.ts b/drizzle-orm/src/singlestore-core/columns/common.ts index 2c4d6528a..ef494a4c1 100644 --- a/drizzle-orm/src/singlestore-core/columns/common.ts +++ b/drizzle-orm/src/singlestore-core/columns/common.ts @@ -5,6 +5,7 @@ import type { ColumnBuilderRuntimeConfig, ColumnDataType, HasDefault, + HasGenerated, IsAutoincrement, MakeColumnConfig, } from '~/column-builder.ts'; @@ -13,6 +14,7 @@ import type { ColumnBaseConfig } from '~/column.ts'; import { Column } from '~/column.ts'; import { entityKind } from '~/entity.ts'; import type { AnySingleStoreTable, SingleStoreTable } from '~/singlestore-core/table.ts'; +import type { SQL } from '~/sql/sql.ts'; import type { Update } from '~/utils.ts'; import { uniqueKeyName } from '../unique-constraint.ts'; @@ -44,14 +46,15 @@ export abstract class SingleStoreColumnBuilder< } // TODO: Implement generated columns for SingleStore (https://docs.singlestore.com/cloud/create-a-database/using-persistent-computed-columns/) - /* generatedAlwaysAs(as: SQL | T['data'] | (() => SQL), config?: SingleStoreGeneratedColumnConfig): HasGenerated { + /** @internal */ + generatedAlwaysAs(as: SQL | T['data'] | (() => SQL), config?: SingleStoreGeneratedColumnConfig): HasGenerated { this.config.generated = { as, type: 'always', mode: config?.mode ?? 'virtual', }; return this as any; - } */ + } /** @internal */ abstract build( diff --git a/drizzle-orm/src/singlestore-core/columns/custom.ts b/drizzle-orm/src/singlestore-core/columns/custom.ts index dec4574ed..964e077d7 100644 --- a/drizzle-orm/src/singlestore-core/columns/custom.ts +++ b/drizzle-orm/src/singlestore-core/columns/custom.ts @@ -1,10 +1,4 @@ -import type { - ColumnBuilderBaseConfig, - ColumnBuilderRuntimeConfig, - GeneratedColumnConfig, - HasGenerated, - MakeColumnConfig, -} from '~/column-builder.ts'; +import type { ColumnBuilderBaseConfig, ColumnBuilderRuntimeConfig, MakeColumnConfig } from '~/column-builder.ts'; import type { ColumnBaseConfig } from '~/column.ts'; import { entityKind } from '~/entity.ts'; import type { AnySingleStoreTable } from '~/singlestore-core/table.ts'; @@ -41,13 +35,6 @@ export class SingleStoreCustomColumnBuilder { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - override generatedAlwaysAs( - as: SQL | (() => SQL) | T['data'], - config?: Partial>, - ): HasGenerated { - throw new Error('Method not implemented.'); - } static override readonly [entityKind]: string = 'SingleStoreCustomColumnBuilder'; constructor( diff --git a/drizzle-orm/src/singlestore-core/columns/date.ts b/drizzle-orm/src/singlestore-core/columns/date.ts index 62d31d761..70da74f3a 100644 --- a/drizzle-orm/src/singlestore-core/columns/date.ts +++ b/drizzle-orm/src/singlestore-core/columns/date.ts @@ -1,14 +1,7 @@ -import type { - ColumnBuilderBaseConfig, - ColumnBuilderRuntimeConfig, - GeneratedColumnConfig, - HasGenerated, - MakeColumnConfig, -} from '~/column-builder.ts'; +import type { ColumnBuilderBaseConfig, ColumnBuilderRuntimeConfig, MakeColumnConfig } from '~/column-builder.ts'; import type { ColumnBaseConfig } from '~/column.ts'; import { entityKind } from '~/entity.ts'; import type { AnySingleStoreTable } from '~/singlestore-core/table.ts'; -import type { SQL } from '~/sql/index.ts'; import { type Equal, getColumnNameAndConfig } from '~/utils.ts'; import { SingleStoreColumn, SingleStoreColumnBuilder } from './common.ts'; @@ -25,13 +18,6 @@ export type SingleStoreDateBuilderInitial = SingleStoreDat export class SingleStoreDateBuilder> extends SingleStoreColumnBuilder { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - override generatedAlwaysAs( - as: SQL | (() => SQL) | T['data'], - config?: Partial>, - ): HasGenerated { - throw new Error('Method not implemented.'); - } static override readonly [entityKind]: string = 'SingleStoreDateBuilder'; constructor(name: T['name']) { @@ -81,13 +67,6 @@ export type SingleStoreDateStringBuilderInitial = SingleSt export class SingleStoreDateStringBuilder> extends SingleStoreColumnBuilder { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - override generatedAlwaysAs( - as: SQL | (() => SQL) | T['data'], - config?: Partial>, - ): HasGenerated { - throw new Error('Method not implemented.'); - } static override readonly [entityKind]: string = 'SingleStoreDateStringBuilder'; constructor(name: T['name']) { diff --git a/drizzle-orm/src/singlestore-core/columns/datetime.ts b/drizzle-orm/src/singlestore-core/columns/datetime.ts index bacffa1c3..16f137901 100644 --- a/drizzle-orm/src/singlestore-core/columns/datetime.ts +++ b/drizzle-orm/src/singlestore-core/columns/datetime.ts @@ -25,18 +25,18 @@ export type SingleStoreDateTimeBuilderInitial = SingleStor export class SingleStoreDateTimeBuilder> extends SingleStoreColumnBuilder { - // eslint-disable-next-line @typescript-eslint/no-unused-vars + /** @internal */ + // TODO: we need to add a proper support for SingleStore override generatedAlwaysAs( - as: SQL | (() => SQL) | T['data'], - config?: Partial>, + _as: SQL | (() => SQL) | T['data'], + _config?: Partial>, ): HasGenerated { throw new Error('Method not implemented.'); } static override readonly [entityKind]: string = 'SingleStoreDateTimeBuilder'; - constructor(name: T['name'], config: SingleStoreDatetimeConfig | undefined) { + constructor(name: T['name']) { super(name, 'date', 'SingleStoreDateTime'); - this.config.fsp = config?.fsp; } /** @internal */ @@ -55,20 +55,15 @@ export class SingleStoreDateTime, config: SingleStoreDateTimeBuilder['config'], ) { super(table, config); - this.fsp = config.fsp; } getSQLType(): string { - const hidePrecision = this.fsp === undefined || this.fsp === 0; - const precision = hidePrecision ? '' : `(${this.fsp})`; - return `datetime${precision}`; + return `datetime`; } override mapToDriverValue(value: Date): unknown { @@ -93,18 +88,18 @@ export type SingleStoreDateTimeStringBuilderInitial = Sing export class SingleStoreDateTimeStringBuilder> extends SingleStoreColumnBuilder { - // eslint-disable-next-line @typescript-eslint/no-unused-vars + /** @internal */ + // TODO: we need to add a proper support for SingleStore override generatedAlwaysAs( - as: SQL | (() => SQL) | T['data'], - config?: Partial>, + _as: SQL | (() => SQL) | T['data'], + _config?: Partial>, ): HasGenerated { throw new Error('Method not implemented.'); } static override readonly [entityKind]: string = 'SingleStoreDateTimeStringBuilder'; - constructor(name: T['name'], config: SingleStoreDatetimeConfig | undefined) { + constructor(name: T['name']) { super(name, 'string', 'SingleStoreDateTimeString'); - this.config.fsp = config?.fsp; } /** @internal */ @@ -123,28 +118,20 @@ export class SingleStoreDateTimeString, config: SingleStoreDateTimeStringBuilder['config'], ) { super(table, config); - this.fsp = config.fsp; } getSQLType(): string { - const hidePrecision = this.fsp === undefined || this.fsp === 0; - const precision = hidePrecision ? '' : `(${this.fsp})`; - return `datetime${precision}`; + return `datetime`; } } -export type DatetimeFsp = 0 | 1 | 2 | 3 | 4 | 5 | 6; - export interface SingleStoreDatetimeConfig { mode?: TMode; - fsp?: DatetimeFsp; } export function datetime(): SingleStoreDateTimeBuilderInitial<''>; @@ -160,7 +147,7 @@ export function datetime(a, b); if (config?.mode === 'string') { - return new SingleStoreDateTimeStringBuilder(name, config); + return new SingleStoreDateTimeStringBuilder(name); } - return new SingleStoreDateTimeBuilder(name, config); + return new SingleStoreDateTimeBuilder(name); } diff --git a/drizzle-orm/src/singlestore-core/columns/decimal.ts b/drizzle-orm/src/singlestore-core/columns/decimal.ts index a77eb7a27..d0c61732c 100644 --- a/drizzle-orm/src/singlestore-core/columns/decimal.ts +++ b/drizzle-orm/src/singlestore-core/columns/decimal.ts @@ -1,14 +1,7 @@ -import type { - ColumnBuilderBaseConfig, - ColumnBuilderRuntimeConfig, - GeneratedColumnConfig, - HasGenerated, - MakeColumnConfig, -} from '~/column-builder.ts'; +import type { ColumnBuilderBaseConfig, ColumnBuilderRuntimeConfig, MakeColumnConfig } from '~/column-builder.ts'; import type { ColumnBaseConfig } from '~/column.ts'; import { entityKind } from '~/entity.ts'; import type { AnySingleStoreTable } from '~/singlestore-core/table.ts'; -import type { SQL } from '~/sql/index.ts'; import { getColumnNameAndConfig } from '~/utils.ts'; import { SingleStoreColumnBuilderWithAutoIncrement, SingleStoreColumnWithAutoIncrement } from './common.ts'; @@ -28,13 +21,6 @@ export class SingleStoreDecimalBuilder< T, SingleStoreDecimalConfig > { - /** @internal */ - override generatedAlwaysAs( - _as: T['data'] | SQL | (() => SQL), - _config?: Partial>, - ): HasGenerated { - throw new Error('Method not implemented.'); - } static override readonly [entityKind]: string = 'SingleStoreDecimalBuilder'; constructor(name: T['name'], config: SingleStoreDecimalConfig | undefined) { diff --git a/drizzle-orm/src/singlestore-core/columns/double.ts b/drizzle-orm/src/singlestore-core/columns/double.ts index bf19d49c0..103731eab 100644 --- a/drizzle-orm/src/singlestore-core/columns/double.ts +++ b/drizzle-orm/src/singlestore-core/columns/double.ts @@ -1,14 +1,7 @@ -import type { - ColumnBuilderBaseConfig, - ColumnBuilderRuntimeConfig, - GeneratedColumnConfig, - HasGenerated, - MakeColumnConfig, -} from '~/column-builder.ts'; +import type { ColumnBuilderBaseConfig, ColumnBuilderRuntimeConfig, MakeColumnConfig } from '~/column-builder.ts'; import type { ColumnBaseConfig } from '~/column.ts'; import { entityKind } from '~/entity.ts'; import type { AnySingleStoreTable } from '~/singlestore-core/table.ts'; -import type { SQL } from '~/sql/index.ts'; import { getColumnNameAndConfig } from '~/utils.ts'; import { SingleStoreColumnBuilderWithAutoIncrement, SingleStoreColumnWithAutoIncrement } from './common.ts'; @@ -25,13 +18,6 @@ export type SingleStoreDoubleBuilderInitial = SingleStoreD export class SingleStoreDoubleBuilder> extends SingleStoreColumnBuilderWithAutoIncrement { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - override generatedAlwaysAs( - as: T['data'] | SQL | (() => SQL), - config?: Partial>, - ): HasGenerated { - throw new Error('Method not implemented.'); - } static override readonly [entityKind]: string = 'SingleStoreDoubleBuilder'; constructor(name: T['name'], config: SingleStoreDoubleConfig | undefined) { diff --git a/drizzle-orm/src/singlestore-core/columns/float.ts b/drizzle-orm/src/singlestore-core/columns/float.ts index 6d6075ca6..9cfed6131 100644 --- a/drizzle-orm/src/singlestore-core/columns/float.ts +++ b/drizzle-orm/src/singlestore-core/columns/float.ts @@ -1,14 +1,7 @@ -import type { - ColumnBuilderBaseConfig, - ColumnBuilderRuntimeConfig, - GeneratedColumnConfig, - HasGenerated, - MakeColumnConfig, -} from '~/column-builder.ts'; +import type { ColumnBuilderBaseConfig, ColumnBuilderRuntimeConfig, MakeColumnConfig } from '~/column-builder.ts'; import type { ColumnBaseConfig } from '~/column.ts'; import { entityKind } from '~/entity.ts'; import type { AnySingleStoreTable } from '~/singlestore-core/table.ts'; -import type { SQL } from '~/sql/index.ts'; import { getColumnNameAndConfig } from '~/utils.ts'; import { SingleStoreColumnBuilderWithAutoIncrement, SingleStoreColumnWithAutoIncrement } from './common.ts'; @@ -25,13 +18,6 @@ export type SingleStoreFloatBuilderInitial = SingleStoreFl export class SingleStoreFloatBuilder> extends SingleStoreColumnBuilderWithAutoIncrement { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - override generatedAlwaysAs( - as: SQL | (() => SQL) | T['data'], - config?: Partial>, - ): HasGenerated { - throw new Error('Method not implemented.'); - } static override readonly [entityKind]: string = 'SingleStoreFloatBuilder'; constructor(name: T['name'], config: SingleStoreFloatConfig | undefined) { diff --git a/drizzle-orm/src/singlestore-core/columns/int.ts b/drizzle-orm/src/singlestore-core/columns/int.ts index 5a7ab2167..b6a661f66 100644 --- a/drizzle-orm/src/singlestore-core/columns/int.ts +++ b/drizzle-orm/src/singlestore-core/columns/int.ts @@ -1,14 +1,7 @@ -import type { - ColumnBuilderBaseConfig, - ColumnBuilderRuntimeConfig, - GeneratedColumnConfig, - HasGenerated, - MakeColumnConfig, -} from '~/column-builder.ts'; +import type { ColumnBuilderBaseConfig, ColumnBuilderRuntimeConfig, MakeColumnConfig } from '~/column-builder.ts'; import type { ColumnBaseConfig } from '~/column.ts'; import { entityKind } from '~/entity.ts'; import type { AnySingleStoreTable } from '~/singlestore-core/table.ts'; -import type { SQL } from '~/sql/index.ts'; import { getColumnNameAndConfig } from '~/utils.ts'; import { SingleStoreColumnBuilderWithAutoIncrement, SingleStoreColumnWithAutoIncrement } from './common.ts'; @@ -25,13 +18,6 @@ export type SingleStoreIntBuilderInitial = SingleStoreIntB export class SingleStoreIntBuilder> extends SingleStoreColumnBuilderWithAutoIncrement { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - override generatedAlwaysAs( - as: SQL | (() => SQL) | T['data'], - config?: Partial>, - ): HasGenerated { - throw new Error('Method not implemented.'); - } static override readonly [entityKind]: string = 'SingleStoreIntBuilder'; constructor(name: T['name'], config?: SingleStoreIntConfig) { diff --git a/drizzle-orm/src/singlestore-core/columns/json.ts b/drizzle-orm/src/singlestore-core/columns/json.ts index cdacbac82..97ff759d1 100644 --- a/drizzle-orm/src/singlestore-core/columns/json.ts +++ b/drizzle-orm/src/singlestore-core/columns/json.ts @@ -1,14 +1,7 @@ -import type { - ColumnBuilderBaseConfig, - ColumnBuilderRuntimeConfig, - GeneratedColumnConfig, - HasGenerated, - MakeColumnConfig, -} from '~/column-builder.ts'; +import type { ColumnBuilderBaseConfig, ColumnBuilderRuntimeConfig, MakeColumnConfig } from '~/column-builder.ts'; import type { ColumnBaseConfig } from '~/column.ts'; import { entityKind } from '~/entity.ts'; import type { AnySingleStoreTable } from '~/singlestore-core/table.ts'; -import type { SQL } from '~/sql/index.ts'; import { SingleStoreColumn, SingleStoreColumnBuilder } from './common.ts'; export type SingleStoreJsonBuilderInitial = SingleStoreJsonBuilder<{ @@ -24,13 +17,6 @@ export type SingleStoreJsonBuilderInitial = SingleStoreJso export class SingleStoreJsonBuilder> extends SingleStoreColumnBuilder { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - override generatedAlwaysAs( - as: T['data'] | SQL | (() => SQL), - config?: Partial>, - ): HasGenerated { - throw new Error('Method not implemented.'); - } static override readonly [entityKind]: string = 'SingleStoreJsonBuilder'; constructor(name: T['name']) { diff --git a/drizzle-orm/src/singlestore-core/columns/mediumint.ts b/drizzle-orm/src/singlestore-core/columns/mediumint.ts index 7231e58ff..4a5fa80f9 100644 --- a/drizzle-orm/src/singlestore-core/columns/mediumint.ts +++ b/drizzle-orm/src/singlestore-core/columns/mediumint.ts @@ -1,14 +1,7 @@ -import type { - ColumnBuilderBaseConfig, - ColumnBuilderRuntimeConfig, - GeneratedColumnConfig, - HasGenerated, - MakeColumnConfig, -} from '~/column-builder.ts'; +import type { ColumnBuilderBaseConfig, ColumnBuilderRuntimeConfig, MakeColumnConfig } from '~/column-builder.ts'; import type { ColumnBaseConfig } from '~/column.ts'; import { entityKind } from '~/entity.ts'; import type { AnySingleStoreTable } from '~/singlestore-core/table.ts'; -import type { SQL } from '~/sql/index.ts'; import { getColumnNameAndConfig } from '~/utils.ts'; import { SingleStoreColumnBuilderWithAutoIncrement, SingleStoreColumnWithAutoIncrement } from './common.ts'; import type { SingleStoreIntConfig } from './int.ts'; @@ -26,13 +19,6 @@ export type SingleStoreMediumIntBuilderInitial = SingleSto export class SingleStoreMediumIntBuilder> extends SingleStoreColumnBuilderWithAutoIncrement { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - override generatedAlwaysAs( - as: SQL | (() => SQL) | T['data'], - config?: Partial>, - ): HasGenerated { - throw new Error('Method not implemented.'); - } static override readonly [entityKind]: string = 'SingleStoreMediumIntBuilder'; constructor(name: T['name'], config?: SingleStoreIntConfig) { diff --git a/drizzle-orm/src/singlestore-core/columns/real.ts b/drizzle-orm/src/singlestore-core/columns/real.ts index 4ba09c200..53d15345c 100644 --- a/drizzle-orm/src/singlestore-core/columns/real.ts +++ b/drizzle-orm/src/singlestore-core/columns/real.ts @@ -1,14 +1,7 @@ -import type { - ColumnBuilderBaseConfig, - ColumnBuilderRuntimeConfig, - GeneratedColumnConfig, - HasGenerated, - MakeColumnConfig, -} from '~/column-builder.ts'; +import type { ColumnBuilderBaseConfig, ColumnBuilderRuntimeConfig, MakeColumnConfig } from '~/column-builder.ts'; import type { ColumnBaseConfig } from '~/column.ts'; import { entityKind } from '~/entity.ts'; import type { AnySingleStoreTable } from '~/singlestore-core/table.ts'; -import type { SQL } from '~/sql/index.ts'; import { getColumnNameAndConfig } from '~/utils.ts'; import { SingleStoreColumnBuilderWithAutoIncrement, SingleStoreColumnWithAutoIncrement } from './common.ts'; @@ -28,13 +21,6 @@ export class SingleStoreRealBuilder { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - override generatedAlwaysAs( - as: SQL | (() => SQL) | T['data'], - config?: Partial>, - ): HasGenerated { - throw new Error('Method not implemented.'); - } static override readonly [entityKind]: string = 'SingleStoreRealBuilder'; constructor(name: T['name'], config: SingleStoreRealConfig | undefined) { diff --git a/drizzle-orm/src/singlestore-core/columns/serial.ts b/drizzle-orm/src/singlestore-core/columns/serial.ts index 4b7a618e0..df415d47e 100644 --- a/drizzle-orm/src/singlestore-core/columns/serial.ts +++ b/drizzle-orm/src/singlestore-core/columns/serial.ts @@ -1,9 +1,7 @@ import type { ColumnBuilderBaseConfig, ColumnBuilderRuntimeConfig, - GeneratedColumnConfig, HasDefault, - HasGenerated, IsAutoincrement, IsPrimaryKey, MakeColumnConfig, @@ -12,7 +10,6 @@ import type { import type { ColumnBaseConfig } from '~/column.ts'; import { entityKind } from '~/entity.ts'; import type { AnySingleStoreTable } from '~/singlestore-core/table.ts'; -import type { SQL } from '~/sql/index.ts'; import { SingleStoreColumnBuilderWithAutoIncrement, SingleStoreColumnWithAutoIncrement } from './common.ts'; export type SingleStoreSerialBuilderInitial = IsAutoincrement< @@ -36,13 +33,6 @@ export type SingleStoreSerialBuilderInitial = IsAutoincrem export class SingleStoreSerialBuilder> extends SingleStoreColumnBuilderWithAutoIncrement { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - override generatedAlwaysAs( - as: SQL | (() => SQL) | T['data'], - config?: Partial>, - ): HasGenerated { - throw new Error('Method not implemented.'); - } static override readonly [entityKind]: string = 'SingleStoreSerialBuilder'; constructor(name: T['name']) { diff --git a/drizzle-orm/src/singlestore-core/columns/smallint.ts b/drizzle-orm/src/singlestore-core/columns/smallint.ts index 4011662e0..3f504b68c 100644 --- a/drizzle-orm/src/singlestore-core/columns/smallint.ts +++ b/drizzle-orm/src/singlestore-core/columns/smallint.ts @@ -1,14 +1,7 @@ -import type { - ColumnBuilderBaseConfig, - ColumnBuilderRuntimeConfig, - GeneratedColumnConfig, - HasGenerated, - MakeColumnConfig, -} from '~/column-builder.ts'; +import type { ColumnBuilderBaseConfig, ColumnBuilderRuntimeConfig, MakeColumnConfig } from '~/column-builder.ts'; import type { ColumnBaseConfig } from '~/column.ts'; import { entityKind } from '~/entity.ts'; import type { AnySingleStoreTable } from '~/singlestore-core/table.ts'; -import type { SQL } from '~/sql/index.ts'; import { getColumnNameAndConfig } from '~/utils.ts'; import { SingleStoreColumnBuilderWithAutoIncrement, SingleStoreColumnWithAutoIncrement } from './common.ts'; import type { SingleStoreIntConfig } from './int.ts'; @@ -26,13 +19,6 @@ export type SingleStoreSmallIntBuilderInitial = SingleStor export class SingleStoreSmallIntBuilder> extends SingleStoreColumnBuilderWithAutoIncrement { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - override generatedAlwaysAs( - as: SQL | (() => SQL) | T['data'], - config?: Partial>, - ): HasGenerated { - throw new Error('Method not implemented.'); - } static override readonly [entityKind]: string = 'SingleStoreSmallIntBuilder'; constructor(name: T['name'], config?: SingleStoreIntConfig) { diff --git a/drizzle-orm/src/singlestore-core/columns/text.ts b/drizzle-orm/src/singlestore-core/columns/text.ts index d69728375..425da550f 100644 --- a/drizzle-orm/src/singlestore-core/columns/text.ts +++ b/drizzle-orm/src/singlestore-core/columns/text.ts @@ -1,14 +1,7 @@ -import type { - ColumnBuilderBaseConfig, - ColumnBuilderRuntimeConfig, - GeneratedColumnConfig, - HasGenerated, - MakeColumnConfig, -} from '~/column-builder.ts'; +import type { ColumnBuilderBaseConfig, ColumnBuilderRuntimeConfig, MakeColumnConfig } from '~/column-builder.ts'; import type { ColumnBaseConfig } from '~/column.ts'; import { entityKind } from '~/entity.ts'; import type { AnySingleStoreTable } from '~/singlestore-core/table.ts'; -import type { SQL } from '~/sql/index.ts'; import { getColumnNameAndConfig, type Writable } from '~/utils.ts'; import { SingleStoreColumn, SingleStoreColumnBuilder } from './common.ts'; @@ -31,13 +24,6 @@ export class SingleStoreTextBuilder { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - override generatedAlwaysAs( - as: SQL | (() => SQL) | T['data'], - config?: Partial>, - ): HasGenerated { - throw new Error('Method not implemented.'); - } static override readonly [entityKind]: string = 'SingleStoreTextBuilder'; constructor(name: T['name'], textType: SingleStoreTextColumnType, config: SingleStoreTextConfig) { diff --git a/drizzle-orm/src/singlestore-core/columns/time.ts b/drizzle-orm/src/singlestore-core/columns/time.ts index 405700177..b7605a4ee 100644 --- a/drizzle-orm/src/singlestore-core/columns/time.ts +++ b/drizzle-orm/src/singlestore-core/columns/time.ts @@ -1,15 +1,7 @@ -import type { - ColumnBuilderBaseConfig, - ColumnBuilderRuntimeConfig, - GeneratedColumnConfig, - HasGenerated, - MakeColumnConfig, -} from '~/column-builder.ts'; +import type { ColumnBuilderBaseConfig, ColumnBuilderRuntimeConfig, MakeColumnConfig } from '~/column-builder.ts'; import type { ColumnBaseConfig } from '~/column.ts'; import { entityKind } from '~/entity.ts'; import type { AnySingleStoreTable } from '~/singlestore-core/table.ts'; -import type { SQL } from '~/sql/index.ts'; -import { getColumnNameAndConfig } from '~/utils.ts'; import { SingleStoreColumn, SingleStoreColumnBuilder } from './common.ts'; export type SingleStoreTimeBuilderInitial = SingleStoreTimeBuilder<{ @@ -24,25 +16,15 @@ export type SingleStoreTimeBuilderInitial = SingleStoreTim export class SingleStoreTimeBuilder> extends SingleStoreColumnBuilder< - T, - TimeConfig + T > { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - override generatedAlwaysAs( - as: SQL | (() => SQL) | T['data'], - config?: Partial>, - ): HasGenerated { - throw new Error('Method not implemented.'); - } static override readonly [entityKind]: string = 'SingleStoreTimeBuilder'; constructor( name: T['name'], - config: TimeConfig | undefined, ) { super(name, 'string', 'SingleStoreTime'); - this.config.fsp = config?.fsp; } /** @internal */ @@ -58,30 +40,16 @@ export class SingleStoreTimeBuilder, -> extends SingleStoreColumn { +> extends SingleStoreColumn { static override readonly [entityKind]: string = 'SingleStoreTime'; - readonly fsp: number | undefined = this.config.fsp; - getSQLType(): string { - const precision = this.fsp === undefined ? '' : `(${this.fsp})`; - return `time${precision}`; + return `time`; } } -export type TimeConfig = { - fsp?: 0 | 1 | 2 | 3 | 4 | 5 | 6; -}; - export function time(): SingleStoreTimeBuilderInitial<''>; -export function time( - config?: TimeConfig, -): SingleStoreTimeBuilderInitial<''>; -export function time( - name: TName, - config?: TimeConfig, -): SingleStoreTimeBuilderInitial; -export function time(a?: string | TimeConfig, b?: TimeConfig) { - const { name, config } = getColumnNameAndConfig(a, b); - return new SingleStoreTimeBuilder(name, config); +export function time(name: TName): SingleStoreTimeBuilderInitial; +export function time(name?: string) { + return new SingleStoreTimeBuilder(name ?? ''); } diff --git a/drizzle-orm/src/singlestore-core/columns/timestamp.ts b/drizzle-orm/src/singlestore-core/columns/timestamp.ts index 17d76fb0f..ea7342fd7 100644 --- a/drizzle-orm/src/singlestore-core/columns/timestamp.ts +++ b/drizzle-orm/src/singlestore-core/columns/timestamp.ts @@ -1,14 +1,7 @@ -import type { - ColumnBuilderBaseConfig, - ColumnBuilderRuntimeConfig, - GeneratedColumnConfig, - HasGenerated, - MakeColumnConfig, -} from '~/column-builder.ts'; +import type { ColumnBuilderBaseConfig, ColumnBuilderRuntimeConfig, MakeColumnConfig } from '~/column-builder.ts'; import type { ColumnBaseConfig } from '~/column.ts'; import { entityKind } from '~/entity.ts'; import type { AnySingleStoreTable } from '~/singlestore-core/table.ts'; -import type { SQL } from '~/sql/sql.ts'; import { sql } from '~/sql/sql.ts'; import { type Equal, getColumnNameAndConfig } from '~/utils.ts'; import { SingleStoreDateBaseColumn, SingleStoreDateColumnBaseBuilder } from './date.common.ts'; @@ -26,18 +19,10 @@ export type SingleStoreTimestampBuilderInitial = SingleSto export class SingleStoreTimestampBuilder> extends SingleStoreDateColumnBaseBuilder { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - override generatedAlwaysAs( - as: SQL | (() => SQL) | T['data'], - config?: Partial>, - ): HasGenerated { - throw new Error('Method not implemented.'); - } static override readonly [entityKind]: string = 'SingleStoreTimestampBuilder'; - constructor(name: T['name'], config: SingleStoreTimestampConfig | undefined) { + constructor(name: T['name']) { super(name, 'date', 'SingleStoreTimestamp'); - this.config.fsp = config?.fsp; } /** @internal */ @@ -60,12 +45,8 @@ export class SingleStoreTimestamp = Sin export class SingleStoreTimestampStringBuilder< T extends ColumnBuilderBaseConfig<'string', 'SingleStoreTimestampString'>, > extends SingleStoreDateColumnBaseBuilder { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - override generatedAlwaysAs( - as: SQL | (() => SQL) | T['data'], - config?: Partial>, - ): HasGenerated { - throw new Error('Method not implemented.'); - } static override readonly [entityKind]: string = 'SingleStoreTimestampStringBuilder'; - constructor(name: T['name'], config: SingleStoreTimestampConfig | undefined) { + constructor(name: T['name']) { super(name, 'string', 'SingleStoreTimestampString'); - this.config.fsp = config?.fsp; } /** @internal */ @@ -124,20 +97,13 @@ export class SingleStoreTimestampString { mode?: TMode; - fsp?: TimestampFsp; } export function timestamp(): SingleStoreTimestampBuilderInitial<''>; @@ -153,7 +119,7 @@ export function timestamp(a, b); if (config?.mode === 'string') { - return new SingleStoreTimestampStringBuilder(name, config); + return new SingleStoreTimestampStringBuilder(name); } - return new SingleStoreTimestampBuilder(name, config); + return new SingleStoreTimestampBuilder(name); } diff --git a/drizzle-orm/src/singlestore-core/columns/tinyint.ts b/drizzle-orm/src/singlestore-core/columns/tinyint.ts index a25b89a6d..090619a6d 100644 --- a/drizzle-orm/src/singlestore-core/columns/tinyint.ts +++ b/drizzle-orm/src/singlestore-core/columns/tinyint.ts @@ -1,14 +1,7 @@ -import type { - ColumnBuilderBaseConfig, - ColumnBuilderRuntimeConfig, - GeneratedColumnConfig, - HasGenerated, - MakeColumnConfig, -} from '~/column-builder.ts'; +import type { ColumnBuilderBaseConfig, ColumnBuilderRuntimeConfig, MakeColumnConfig } from '~/column-builder.ts'; import type { ColumnBaseConfig } from '~/column.ts'; import { entityKind } from '~/entity.ts'; import type { AnySingleStoreTable } from '~/singlestore-core/table.ts'; -import type { SQL } from '~/sql/index.ts'; import { getColumnNameAndConfig } from '~/utils.ts'; import { SingleStoreColumnBuilderWithAutoIncrement, SingleStoreColumnWithAutoIncrement } from './common.ts'; import type { SingleStoreIntConfig } from './int.ts'; @@ -26,13 +19,6 @@ export type SingleStoreTinyIntBuilderInitial = SingleStore export class SingleStoreTinyIntBuilder> extends SingleStoreColumnBuilderWithAutoIncrement { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - override generatedAlwaysAs( - as: SQL | (() => SQL) | T['data'], - config?: Partial>, - ): HasGenerated { - throw new Error('Method not implemented.'); - } static override readonly [entityKind]: string = 'SingleStoreTinyIntBuilder'; constructor(name: T['name'], config?: SingleStoreIntConfig) { diff --git a/drizzle-orm/src/singlestore-core/columns/varbinary.ts b/drizzle-orm/src/singlestore-core/columns/varbinary.ts index 0b0323784..c55aa8071 100644 --- a/drizzle-orm/src/singlestore-core/columns/varbinary.ts +++ b/drizzle-orm/src/singlestore-core/columns/varbinary.ts @@ -1,14 +1,7 @@ -import type { - ColumnBuilderBaseConfig, - ColumnBuilderRuntimeConfig, - GeneratedColumnConfig, - HasGenerated, - MakeColumnConfig, -} from '~/column-builder.ts'; +import type { ColumnBuilderBaseConfig, ColumnBuilderRuntimeConfig, MakeColumnConfig } from '~/column-builder.ts'; import type { ColumnBaseConfig } from '~/column.ts'; import { entityKind } from '~/entity.ts'; import type { AnySingleStoreTable } from '~/singlestore-core/table.ts'; -import type { SQL } from '~/sql/index.ts'; import { getColumnNameAndConfig } from '~/utils.ts'; import { SingleStoreColumn, SingleStoreColumnBuilder } from './common.ts'; @@ -25,13 +18,6 @@ export type SingleStoreVarBinaryBuilderInitial = SingleSto export class SingleStoreVarBinaryBuilder> extends SingleStoreColumnBuilder { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - override generatedAlwaysAs( - as: SQL | (() => SQL) | T['data'], - config?: Partial>, - ): HasGenerated { - throw new Error('Method not implemented.'); - } static override readonly [entityKind]: string = 'SingleStoreVarBinaryBuilder'; /** @internal */ diff --git a/drizzle-orm/src/singlestore-core/columns/varchar.ts b/drizzle-orm/src/singlestore-core/columns/varchar.ts index 82f232c29..2c39491d7 100644 --- a/drizzle-orm/src/singlestore-core/columns/varchar.ts +++ b/drizzle-orm/src/singlestore-core/columns/varchar.ts @@ -1,14 +1,7 @@ -import type { - ColumnBuilderBaseConfig, - ColumnBuilderRuntimeConfig, - GeneratedColumnConfig, - HasGenerated, - MakeColumnConfig, -} from '~/column-builder.ts'; +import type { ColumnBuilderBaseConfig, ColumnBuilderRuntimeConfig, MakeColumnConfig } from '~/column-builder.ts'; import type { ColumnBaseConfig } from '~/column.ts'; import { entityKind } from '~/entity.ts'; import type { AnySingleStoreTable } from '~/singlestore-core/table.ts'; -import type { SQL } from '~/sql/index.ts'; import { getColumnNameAndConfig, type Writable } from '~/utils.ts'; import { SingleStoreColumn, SingleStoreColumnBuilder } from './common.ts'; @@ -28,13 +21,6 @@ export type SingleStoreVarCharBuilderInitial> extends SingleStoreColumnBuilder> { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - override generatedAlwaysAs( - as: SQL | (() => SQL) | T['data'], - config?: Partial>, - ): HasGenerated { - throw new Error('Method not implemented.'); - } static override readonly [entityKind]: string = 'SingleStoreVarCharBuilder'; /** @internal */ diff --git a/drizzle-orm/src/singlestore-core/columns/year.ts b/drizzle-orm/src/singlestore-core/columns/year.ts index a6ab07e30..37f3d55a3 100644 --- a/drizzle-orm/src/singlestore-core/columns/year.ts +++ b/drizzle-orm/src/singlestore-core/columns/year.ts @@ -1,14 +1,7 @@ -import type { - ColumnBuilderBaseConfig, - ColumnBuilderRuntimeConfig, - GeneratedColumnConfig, - HasGenerated, - MakeColumnConfig, -} from '~/column-builder.ts'; +import type { ColumnBuilderBaseConfig, ColumnBuilderRuntimeConfig, MakeColumnConfig } from '~/column-builder.ts'; import type { ColumnBaseConfig } from '~/column.ts'; import { entityKind } from '~/entity.ts'; import type { AnySingleStoreTable } from '~/singlestore-core/table.ts'; -import type { SQL } from '~/sql/index.ts'; import { SingleStoreColumn, SingleStoreColumnBuilder } from './common.ts'; export type SingleStoreYearBuilderInitial = SingleStoreYearBuilder<{ @@ -24,13 +17,6 @@ export type SingleStoreYearBuilderInitial = SingleStoreYea export class SingleStoreYearBuilder> extends SingleStoreColumnBuilder { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - override generatedAlwaysAs( - as: SQL | (() => SQL) | T['data'], - config?: Partial>, - ): HasGenerated { - throw new Error('Method not implemented.'); - } static override readonly [entityKind]: string = 'SingleStoreYearBuilder'; constructor(name: T['name']) { diff --git a/drizzle-orm/src/singlestore-core/view.ts b/drizzle-orm/src/singlestore-core/view.ts index ce0fe4dd3..58f111428 100644 --- a/drizzle-orm/src/singlestore-core/view.ts +++ b/drizzle-orm/src/singlestore-core/view.ts @@ -183,26 +183,27 @@ export type SingleStoreViewWithSelection< TSelectedFields extends ColumnsSelection, > = SingleStoreView & TSelectedFields; -/** @internal */ -export function singlestoreViewWithSchema( - name: string, - selection: Record | undefined, - schema: string | undefined, -): ViewBuilder | ManualViewBuilder { - if (selection) { - return new ManualViewBuilder(name, selection, schema); - } - return new ViewBuilder(name, schema); -} - -export function singlestoreView(name: TName): ViewBuilder; -export function singlestoreView>( - name: TName, - columns: TColumns, -): ManualViewBuilder; -export function singlestoreView( - name: string, - selection?: Record, -): ViewBuilder | ManualViewBuilder { - return singlestoreViewWithSchema(name, selection, undefined); -} +// TODO: needs to be implemented differently compared to MySQL. +// /** @internal */ +// export function singlestoreViewWithSchema( +// name: string, +// selection: Record | undefined, +// schema: string | undefined, +// ): ViewBuilder | ManualViewBuilder { +// if (selection) { +// return new ManualViewBuilder(name, selection, schema); +// } +// return new ViewBuilder(name, schema); +// } + +// export function singlestoreView(name: TName): ViewBuilder; +// export function singlestoreView>( +// name: TName, +// columns: TColumns, +// ): ManualViewBuilder; +// export function singlestoreView( +// name: string, +// selection?: Record, +// ): ViewBuilder | ManualViewBuilder { +// return singlestoreViewWithSchema(name, selection, undefined); +// } diff --git a/drizzle-orm/type-tests/singlestore/tables.ts b/drizzle-orm/type-tests/singlestore/tables.ts index 5d63cf410..1df4861af 100644 --- a/drizzle-orm/type-tests/singlestore/tables.ts +++ b/drizzle-orm/type-tests/singlestore/tables.ts @@ -838,7 +838,6 @@ Expect< datedef: date('datedef').default(new Date()), datetime: datetime('datetime'), datetime2: datetime('datetime2', { mode: 'string' }), - datetime3: datetime('datetime3', { mode: 'string', fsp: 3 }), datetimedef: datetime('datetimedef').default(new Date()), decimal: decimal('decimal'), decimal2: decimal('decimal2', { precision: 10 }), @@ -888,12 +887,11 @@ Expect< longtext2: longtext('longtext2', { enum: ['a', 'b', 'c'] }), longtextdef: longtext('longtextdef').default(''), time: time('time'), - time2: time('time2', { fsp: 1 }), timedef: time('timedef').default('00:00:00'), timestamp: timestamp('timestamp'), timestamp2: timestamp('timestamp2', { mode: 'string' }), - timestamp3: timestamp('timestamp3', { mode: 'string', fsp: 1 }), - timestamp4: timestamp('timestamp4', { fsp: 1 }), + timestamp3: timestamp('timestamp3', { mode: 'string' }), + timestamp4: timestamp('timestamp4'), timestampdef: timestamp('timestampdef').default(new Date()), tinyint: tinyint('tinyint'), tinyint2: tinyint('tinyint2', { unsigned: true }), @@ -938,7 +936,6 @@ Expect< datedef: date('datedef').default(new Date()), datetime: datetime(), datetime2: datetime({ mode: 'string' }), - datetime3: datetime({ mode: 'string', fsp: 3 }), datetimedef: datetime('datetimedef').default(new Date()), decimal: decimal(), decimal2: decimal({ precision: 10 }), @@ -988,12 +985,11 @@ Expect< longtext2: longtext({ enum: ['a', 'b', 'c'] }), longtextdef: longtext().default(''), time: time(), - time2: time({ fsp: 1 }), timedef: time().default('00:00:00'), timestamp: timestamp(), timestamp2: timestamp({ mode: 'string' }), - timestamp3: timestamp({ mode: 'string', fsp: 1 }), - timestamp4: timestamp({ fsp: 1 }), + timestamp3: timestamp({ mode: 'string' }), + timestamp4: timestamp(), timestampdef: timestamp().default(new Date()), tinyint: tinyint(), tinyint2: tinyint({ unsigned: true }), diff --git a/integration-tests/tests/singlestore/singlestore-common.ts b/integration-tests/tests/singlestore/singlestore-common.ts index 620715bc9..f97721857 100644 --- a/integration-tests/tests/singlestore/singlestore-common.ts +++ b/integration-tests/tests/singlestore/singlestore-common.ts @@ -83,7 +83,7 @@ const usersTable = singlestoreTable('userstest', { name: text('name').notNull(), verified: boolean('verified').notNull().default(false), jsonb: json('jsonb').$type(), - createdAt: timestamp('created_at', { fsp: 6 }).notNull().defaultNow(), + createdAt: timestamp('created_at').notNull().defaultNow(), }); const users2Table = singlestoreTable('users2', { @@ -101,18 +101,18 @@ const usersOnUpdate = singlestoreTable('users_on_update', { id: serial('id').primaryKey(), name: text('name').notNull(), updateCounter: int('update_counter').default(sql`1`).$onUpdateFn(() => sql`update_counter + 1`), - updatedAt: datetime('updated_at', { mode: 'date', fsp: 6 }).$onUpdateFn(() => new Date()), + updatedAt: datetime('updated_at', { mode: 'date' }).$onUpdateFn(() => new Date()), alwaysNull: text('always_null').$type().$onUpdateFn(() => null), // need to add $type because $onUpdate add a default value }); const datesTable = singlestoreTable('datestable', { date: date('date'), dateAsString: date('date_as_string', { mode: 'string' }), - time: time('time', { fsp: 1 }), - datetime: datetime('datetime', { fsp: 6 }), - datetimeAsString: datetime('datetime_as_string', { fsp: 6, mode: 'string' }), - timestamp: timestamp('timestamp', { fsp: 6 }), - timestampAsString: timestamp('timestamp_as_string', { fsp: 6, mode: 'string' }), + time: time('time'), + datetime: datetime('datetime'), + datetimeAsString: datetime('datetime_as_string', { mode: 'string' }), + timestamp: timestamp('timestamp'), + timestampAsString: timestamp('timestamp_as_string', { mode: 'string' }), year: year('year'), }); @@ -163,7 +163,7 @@ const usersMySchemaTable = mySchema.table('userstest', { name: text('name').notNull(), verified: boolean('verified').notNull().default(false), jsonb: json('jsonb').$type(), - createdAt: timestamp('created_at', { fsp: 6 }).notNull().defaultNow(), + createdAt: timestamp('created_at').notNull().defaultNow(), }); const users2MySchemaTable = mySchema.table('users2', { @@ -2371,8 +2371,8 @@ export function tests(driver?: string) { `, ); const datesTable = singlestoreTable('datestable', { - datetimeUTC: datetime('datetime_utc', { fsp: 6, mode: 'date' }), - datetime: datetime('datetime', { fsp: 6 }), + datetimeUTC: datetime('datetime_utc', { mode: 'date' }), + datetime: datetime('datetime'), }); const dateObj = new Date('2022-11-11'); diff --git a/integration-tests/tests/singlestore/singlestore-custom.test.ts b/integration-tests/tests/singlestore/singlestore-custom.test.ts index b05cd756b..c599df436 100644 --- a/integration-tests/tests/singlestore/singlestore-custom.test.ts +++ b/integration-tests/tests/singlestore/singlestore-custom.test.ts @@ -137,15 +137,15 @@ const usersTable = singlestoreTable('userstest', { name: customText('name').notNull(), verified: customBoolean('verified').notNull().default(false), jsonb: customJson('jsonb'), - createdAt: customTimestamp('created_at', { fsp: 6 }).notNull().default(sql`now()`), + createdAt: customTimestamp('created_at').notNull().default(sql`now()`), }); const datesTable = singlestoreTable('datestable', { date: date('date'), dateAsString: date('date_as_string', { mode: 'string' }), - time: time('time', { fsp: 1 }), - datetime: datetime('datetime', { fsp: 6 }), - datetimeAsString: datetime('datetime_as_string', { fsp: 6, mode: 'string' }), + time: time('time'), + datetime: datetime('datetime'), + datetimeAsString: datetime('datetime_as_string', { mode: 'string' }), year: year('year'), }); diff --git a/integration-tests/tests/singlestore/singlestore-prefixed.test.ts b/integration-tests/tests/singlestore/singlestore-prefixed.test.ts index af7912216..6f29d31a2 100644 --- a/integration-tests/tests/singlestore/singlestore-prefixed.test.ts +++ b/integration-tests/tests/singlestore/singlestore-prefixed.test.ts @@ -76,7 +76,7 @@ const usersTable = singlestoreTable('userstest', { name: text('name').notNull(), verified: boolean('verified').notNull().default(false), jsonb: json('jsonb').$type(), - createdAt: timestamp('created_at', { fsp: 6 }).notNull().defaultNow(), + createdAt: timestamp('created_at').notNull().defaultNow(), }); const users2Table = singlestoreTable('users2', { @@ -640,9 +640,9 @@ test('insert + select all possible dates', async () => { const datesTable = singlestoreTable('datestable', { date: date('date'), dateAsString: date('date_as_string', { mode: 'string' }), - time: time('time', { fsp: 1 }), - datetime: datetime('datetime', { fsp: 6 }), - datetimeAsString: datetime('datetime_as_string', { fsp: 6, mode: 'string' }), + time: time('time'), + datetime: datetime('datetime'), + datetimeAsString: datetime('datetime_as_string', { mode: 'string' }), year: year('year'), });