Skip to content

Commit 7293f88

Browse files
committed
Revert styling changes from previous commits
1 parent 314a0cf commit 7293f88

File tree

4 files changed

+381
-526
lines changed

4 files changed

+381
-526
lines changed

drizzle-orm/src/mysql-core/columns/timestamp.ts

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
import type { ColumnBaseConfig, ColumnHKTBase } from '~/column';
2-
import type {
3-
ColumnBuilderBaseConfig,
4-
ColumnBuilderHKTBase,
5-
MakeColumnConfig,
6-
} from '~/column-builder';
2+
import type { ColumnBuilderBaseConfig, ColumnBuilderHKTBase, MakeColumnConfig } from '~/column-builder';
73
import type { AnyMySqlTable } from '~/mysql-core/table';
84
import type { Assume } from '~/utils';
9-
105
import { MySqlDateBaseColumn, MySqlDateColumnBaseBuilder } from './date.common';
116

127
export interface MySqlTimestampBuilderHKT extends ColumnBuilderHKTBase {
@@ -26,9 +21,11 @@ export type MySqlTimestampBuilderInitial<TName extends string> = MySqlTimestampB
2621
hasDefault: false;
2722
}>;
2823

29-
export class MySqlTimestampBuilder<
30-
T extends ColumnBuilderBaseConfig,
31-
> extends MySqlDateColumnBaseBuilder<MySqlTimestampBuilderHKT, T, MySqlTimestampConfig> {
24+
export class MySqlTimestampBuilder<T extends ColumnBuilderBaseConfig> extends MySqlDateColumnBaseBuilder<
25+
MySqlTimestampBuilderHKT,
26+
T,
27+
MySqlTimestampConfig
28+
> {
3229
constructor(name: T['name'], config: MySqlTimestampConfig | undefined) {
3330
super(name);
3431
this.config.fsp = config?.fsp;
@@ -42,11 +39,9 @@ export class MySqlTimestampBuilder<
4239
}
4340
}
4441

45-
export class MySqlTimestamp<T extends ColumnBaseConfig> extends MySqlDateBaseColumn<
46-
MySqlTimestampHKT,
47-
T,
48-
MySqlTimestampConfig
49-
> {
42+
export class MySqlTimestamp<T extends ColumnBaseConfig>
43+
extends MySqlDateBaseColumn<MySqlTimestampHKT, T, MySqlTimestampConfig>
44+
{
5045
readonly fsp: number | undefined = this.config.fsp;
5146

5247
getSQLType(): string {
@@ -80,9 +75,11 @@ export type MySqlTimestampStringBuilderInitial<TName extends string> = MySqlTime
8075
hasDefault: false;
8176
}>;
8277

83-
export class MySqlTimestampStringBuilder<
84-
T extends ColumnBuilderBaseConfig,
85-
> extends MySqlDateColumnBaseBuilder<MySqlTimestampStringBuilderHKT, T, MySqlTimestampConfig> {
78+
export class MySqlTimestampStringBuilder<T extends ColumnBuilderBaseConfig> extends MySqlDateColumnBaseBuilder<
79+
MySqlTimestampStringBuilderHKT,
80+
T,
81+
MySqlTimestampConfig
82+
> {
8683
constructor(name: T['name'], config: MySqlTimestampConfig | undefined) {
8784
super(name);
8885
this.config.fsp = config?.fsp;
@@ -96,11 +93,9 @@ export class MySqlTimestampStringBuilder<
9693
}
9794
}
9895

99-
export class MySqlTimestampString<T extends ColumnBaseConfig> extends MySqlDateBaseColumn<
100-
MySqlTimestampStringHKT,
101-
T,
102-
MySqlTimestampConfig
103-
> {
96+
export class MySqlTimestampString<T extends ColumnBaseConfig>
97+
extends MySqlDateBaseColumn<MySqlTimestampStringHKT, T, MySqlTimestampConfig>
98+
{
10499
readonly fsp: number | undefined = this.config.fsp;
105100

106101
getSQLType(): string {

drizzle-orm/src/pg-core/columns/timestamp.ts

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
import type { ColumnBaseConfig, ColumnHKTBase } from '~/column';
2-
import type {
3-
ColumnBuilderBaseConfig,
4-
ColumnBuilderHKTBase,
5-
MakeColumnConfig,
6-
} from '~/column-builder';
2+
import type { ColumnBuilderBaseConfig, ColumnBuilderHKTBase, MakeColumnConfig } from '~/column-builder';
73
import type { AnyPgTable } from '~/pg-core/table';
84
import type { Assume } from '~/utils';
9-
105
import { PgColumn } from './common';
11-
126
import { PgDateColumnBaseBuilder } from './date.common';
137

148
export interface PgTimestampBuilderHKT extends ColumnBuilderHKTBase {
@@ -33,7 +27,11 @@ export class PgTimestampBuilder<T extends ColumnBuilderBaseConfig> extends PgDat
3327
T,
3428
{ withTimezone: boolean; precision: number | undefined }
3529
> {
36-
constructor(name: string, withTimezone: boolean, precision: number | undefined) {
30+
constructor(
31+
name: string,
32+
withTimezone: boolean,
33+
precision: number | undefined,
34+
) {
3735
super(name);
3836
this.config.withTimezone = withTimezone;
3937
this.config.precision = precision;
@@ -51,10 +49,7 @@ export class PgTimestamp<T extends ColumnBaseConfig> extends PgColumn<PgTimestam
5149
readonly withTimezone: boolean;
5250
readonly precision: number | undefined;
5351

54-
constructor(
55-
table: AnyPgTable<{ name: T['tableName'] }>,
56-
config: PgTimestampBuilder<T>['config'],
57-
) {
52+
constructor(table: AnyPgTable<{ name: T['tableName'] }>, config: PgTimestampBuilder<T>['config']) {
5853
super(table, config);
5954
this.withTimezone = config.withTimezone;
6055
this.precision = config.precision;
@@ -91,14 +86,16 @@ export type PgTimestampStringBuilderInitial<TName extends string> = PgTimestampS
9186
hasDefault: false;
9287
}>;
9388

94-
export class PgTimestampStringBuilder<
95-
T extends ColumnBuilderBaseConfig,
96-
> extends PgDateColumnBaseBuilder<
89+
export class PgTimestampStringBuilder<T extends ColumnBuilderBaseConfig> extends PgDateColumnBaseBuilder<
9790
PgTimestampStringBuilderHKT,
9891
T,
9992
{ withTimezone: boolean; precision: number | undefined }
10093
> {
101-
constructor(name: string, withTimezone: boolean, precision: number | undefined) {
94+
constructor(
95+
name: string,
96+
withTimezone: boolean,
97+
precision: number | undefined,
98+
) {
10299
super(name);
103100
this.config.withTimezone = withTimezone;
104101
this.config.precision = precision;
@@ -112,17 +109,11 @@ export class PgTimestampStringBuilder<
112109
}
113110
}
114111

115-
export class PgTimestampString<T extends ColumnBaseConfig> extends PgColumn<
116-
PgTimestampStringHKT,
117-
T
118-
> {
112+
export class PgTimestampString<T extends ColumnBaseConfig> extends PgColumn<PgTimestampStringHKT, T> {
119113
readonly withTimezone: boolean;
120114
readonly precision: number | undefined;
121115

122-
constructor(
123-
table: AnyPgTable<{ name: T['tableName'] }>,
124-
config: PgTimestampStringBuilder<T>['config'],
125-
) {
116+
constructor(table: AnyPgTable<{ name: T['tableName'] }>, config: PgTimestampStringBuilder<T>['config']) {
126117
super(table, config);
127118
this.withTimezone = config.withTimezone;
128119
this.precision = config.precision;

0 commit comments

Comments
 (0)