Skip to content

Commit

Permalink
lint fix on drizzle-kit files
Browse files Browse the repository at this point in the history
  • Loading branch information
Rodriguespn committed Sep 18, 2024
1 parent f86f5a1 commit 771fa3d
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 32 deletions.
6 changes: 5 additions & 1 deletion drizzle-kit/src/cli/commands/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ import {
postgresCredentials,
printConfigConnectionIssues as printIssuesPg,
} from '../validations/postgres';
import { printConfigConnectionIssues as printIssuesSingleStore, singlestoreCredentials, SingleStoreCredentials } from '../validations/singlestore';
import {
printConfigConnectionIssues as printIssuesSingleStore,
SingleStoreCredentials,
singlestoreCredentials,
} from '../validations/singlestore';
import {
printConfigConnectionIssues as printIssuesSqlite,
SqliteCredentials,
Expand Down
11 changes: 5 additions & 6 deletions drizzle-kit/src/introspect-singlestore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -386,16 +386,15 @@ const column = (
? `${casing(name)}: timestamp("${name}", ${params})`
: `${casing(name)}: timestamp("${name}")`;


// TODO: check if SingleStore has defaultNow() or now()
defaultValue = defaultValue === 'now()' || defaultValue === '(CURRENT_TIMESTAMP)'
// TODO: check if SingleStore has defaultNow() or now()
defaultValue = defaultValue === 'now()' || defaultValue === '(CURRENT_TIMESTAMP)'
? '.defaultNow()'
: defaultValue
? `.default(${mapColumnDefault(defaultValue, isExpression)})`
: '';
out += defaultValue;

out += defaultValue;

// TODO: check if SingleStore has onUpdateNow()
let onUpdateNow = onUpdate ? '.onUpdateNow()' : '';
out += onUpdateNow;
Expand Down
1 change: 0 additions & 1 deletion drizzle-kit/src/migrationPreparator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { dryMySql, MySqlSchema, mysqlSchema } from './serializer/mysqlSchema';
import { dryPg, PgSchema, pgSchema, PgSchemaInternal } from './serializer/pgSchema';
import { drySingleStore, SingleStoreSchema, singlestoreSchema } from './serializer/singlestoreSchema';
import { drySQLite, SQLiteSchema, sqliteSchema } from './serializer/sqliteSchema';
import { drySingleStore, singlestoreSchema, SingleStoreSchema } from './serializer/singlestoreSchema';

export const prepareMySqlDbPushSnapshot = async (
prev: MySqlSchema,
Expand Down
1 change: 0 additions & 1 deletion drizzle-kit/src/schemaValidator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { mysqlSchema, mysqlSchemaSquashed } from './serializer/mysqlSchema';
import { pgSchema, pgSchemaSquashed } from './serializer/pgSchema';
import { singlestoreSchema, singlestoreSchemaSquashed } from './serializer/singlestoreSchema';
import { sqliteSchema, SQLiteSchemaSquashed } from './serializer/sqliteSchema';
import { singlestoreSchema, singlestoreSchemaSquashed } from './serializer/singlestoreSchema';

export const dialects = ['postgresql', 'mysql', 'sqlite', 'turso', 'singlestore'] as const;
export const dialect = enumType(dialects);
Expand Down
18 changes: 9 additions & 9 deletions drizzle-kit/src/serializer/singlestoreSerializer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -573,15 +573,15 @@ export const fromDatabase = async (
};
}
} else {
if (typeof tableInResult.indexes[constraintName] !== 'undefined') {
tableInResult.indexes[constraintName]!.columns.push(columnName);
} else {
tableInResult.indexes[constraintName] = {
name: constraintName,
columns: [columnName],
isUnique: isUnique,
};
}
if (typeof tableInResult.indexes[constraintName] !== 'undefined') {
tableInResult.indexes[constraintName]!.columns.push(columnName);
} else {
tableInResult.indexes[constraintName] = {
name: constraintName,
columns: [columnName],
isUnique: isUnique,
};
}
}
}

Expand Down
14 changes: 0 additions & 14 deletions drizzle-kit/tests/schemaDiffer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1099,13 +1099,6 @@ export async function diffTestSchemasPushLibSQL(
run: async (query: string) => {
await client.execute(query);
},
batch: async (
queries: { query: string; values?: any[] | undefined }[],
) => {
await client.batch(
queries.map((it) => ({ sql: it.query, args: it.values ?? [] })),
);
},
},
undefined,
);
Expand Down Expand Up @@ -1165,13 +1158,6 @@ export async function diffTestSchemasPushLibSQL(
run: async (query: string) => {
await client.execute(query);
},
batch: async (
queries: { query: string; values?: any[] | undefined }[],
) => {
await client.batch(
queries.map((it) => ({ sql: it.query, args: it.values ?? [] })),
);
},
},
statements,
sn1,
Expand Down

0 comments on commit 771fa3d

Please sign in to comment.