diff options
| -rw-r--r-- | packages/db/src/core/cli/commands/push/index.ts | 2 | ||||
| -rw-r--r-- | packages/db/src/core/cli/commands/verify/index.ts | 11 | ||||
| -rw-r--r-- | packages/db/src/core/cli/migration-queries.ts | 7 | ||||
| -rw-r--r-- | packages/db/src/core/types.ts | 2 | ||||
| -rw-r--r-- | packages/db/src/runtime/queries.ts | 2 | ||||
| -rw-r--r-- | packages/db/test/fixtures/basics/db/config.ts | 2 | ||||
| -rw-r--r-- | packages/db/test/fixtures/basics/db/theme.ts | 2 | ||||
| -rw-r--r-- | packages/db/test/unit/column-queries.test.js | 10 |
8 files changed, 19 insertions, 19 deletions
diff --git a/packages/db/src/core/cli/commands/push/index.ts b/packages/db/src/core/cli/commands/push/index.ts index 2dd183458..59c3a014c 100644 --- a/packages/db/src/core/cli/commands/push/index.ts +++ b/packages/db/src/core/cli/commands/push/index.ts @@ -4,9 +4,9 @@ import { getManagedAppTokenOrExit } from '../../../tokens.js'; import { type DBConfig, type DBSnapshot } from '../../../types.js'; import { getRemoteDatabaseUrl } from '../../../utils.js'; import { - getMigrationQueries, createCurrentSnapshot, createEmptySnapshot, + getMigrationQueries, getProductionCurrentSnapshot, } from '../../migration-queries.js'; diff --git a/packages/db/src/core/cli/commands/verify/index.ts b/packages/db/src/core/cli/commands/verify/index.ts index 1e486a860..55e45c378 100644 --- a/packages/db/src/core/cli/commands/verify/index.ts +++ b/packages/db/src/core/cli/commands/verify/index.ts @@ -1,11 +1,13 @@ import type { AstroConfig } from 'astro'; import type { Arguments } from 'yargs-parser'; +import { getManagedAppTokenOrExit } from '../../../tokens.js'; import type { DBConfig } from '../../../types.js'; -import { getMigrationQueries, +import { createCurrentSnapshot, createEmptySnapshot, - getProductionCurrentSnapshot, } from '../../migration-queries.js'; -import { getManagedAppTokenOrExit } from '../../../tokens.js'; + getMigrationQueries, + getProductionCurrentSnapshot, +} from '../../migration-queries.js'; export async function cmd({ dbConfig, @@ -19,7 +21,8 @@ export async function cmd({ const productionSnapshot = await getProductionCurrentSnapshot({ appToken: appToken.token }); const currentSnapshot = createCurrentSnapshot(dbConfig); const { queries: migrationQueries } = await getMigrationQueries({ - oldSnapshot: JSON.stringify(productionSnapshot) !== '{}' ? productionSnapshot : createEmptySnapshot(), + oldSnapshot: + JSON.stringify(productionSnapshot) !== '{}' ? productionSnapshot : createEmptySnapshot(), newSnapshot: currentSnapshot, }); diff --git a/packages/db/src/core/cli/migration-queries.ts b/packages/db/src/core/cli/migration-queries.ts index e803c6225..09984b8c6 100644 --- a/packages/db/src/core/cli/migration-queries.ts +++ b/packages/db/src/core/cli/migration-queries.ts @@ -13,6 +13,7 @@ import { schemaTypeToSqlType, } from '../../runtime/queries.js'; import { isSerializedSQL } from '../../runtime/types.js'; +import { RENAME_COLUMN_ERROR, RENAME_TABLE_ERROR } from '../errors.js'; import { type BooleanColumn, type ColumnType, @@ -30,7 +31,6 @@ import { columnSchema, } from '../types.js'; import { getRemoteDatabaseUrl } from '../utils.js'; -import { RENAME_COLUMN_ERROR, RENAME_TABLE_ERROR } from '../errors.js'; const sqlite = new SQLiteAsyncDialect(); const genTempTableName = customAlphabet('abcdefghijklmnopqrstuvwxyz', 10); @@ -51,7 +51,10 @@ export async function getMigrationQueries({ ); if (!isEmpty(addedCollections) && !isEmpty(notDeprecatedDroppedTables)) { throw new Error( - RENAME_TABLE_ERROR(Object.keys(addedCollections)[0], Object.keys(notDeprecatedDroppedTables)[0]) + RENAME_TABLE_ERROR( + Object.keys(addedCollections)[0], + Object.keys(notDeprecatedDroppedTables)[0] + ) ); } diff --git a/packages/db/src/core/types.ts b/packages/db/src/core/types.ts index a3ae42311..36b7eefa5 100644 --- a/packages/db/src/core/types.ts +++ b/packages/db/src/core/types.ts @@ -22,7 +22,7 @@ const baseColumnSchema = z.object({ optional: z.boolean().optional().default(false), unique: z.boolean().optional().default(false), deprecated: z.boolean().optional().default(false), - + // Defined when `defineReadableTable()` is called name: z.string().optional(), // TODO: rename to `tableName`. Breaking schema change diff --git a/packages/db/src/runtime/queries.ts b/packages/db/src/runtime/queries.ts index cd54381f8..63d04768b 100644 --- a/packages/db/src/runtime/queries.ts +++ b/packages/db/src/runtime/queries.ts @@ -68,7 +68,7 @@ export async function recreateTables({ db, tables }: { db: SqliteDB; tables: DBT export function getDropTableIfExistsQuery(tableName: string) { return `DROP TABLE IF EXISTS ${sqlite.escapeName(tableName)}`; -}; +} export function getCreateTableQuery(tableName: string, table: DBTable) { let query = `CREATE TABLE ${sqlite.escapeName(tableName)} (`; diff --git a/packages/db/test/fixtures/basics/db/config.ts b/packages/db/test/fixtures/basics/db/config.ts index 58657d43f..368be5cc6 100644 --- a/packages/db/test/fixtures/basics/db/config.ts +++ b/packages/db/test/fixtures/basics/db/config.ts @@ -4,7 +4,7 @@ import { column, defineDB, defineTable } from 'astro:db'; const Author = defineTable({ columns: { name: column.text(), - age2: column.number({optional: true}), + age2: column.number({ optional: true }), }, }); diff --git a/packages/db/test/fixtures/basics/db/theme.ts b/packages/db/test/fixtures/basics/db/theme.ts index 26a38af07..015dcc588 100644 --- a/packages/db/test/fixtures/basics/db/theme.ts +++ b/packages/db/test/fixtures/basics/db/theme.ts @@ -9,7 +9,7 @@ export const Themes = defineTable({ updated: column.date({ default: NOW, }), - isDark: column.boolean({ default: sql`TRUE`, deprecated: true}), + isDark: column.boolean({ default: sql`TRUE`, deprecated: true }), owner: column.text({ optional: true, default: sql`NULL` }), }, }); diff --git a/packages/db/test/unit/column-queries.test.js b/packages/db/test/unit/column-queries.test.js index e8ef08bee..b18697bc3 100644 --- a/packages/db/test/unit/column-queries.test.js +++ b/packages/db/test/unit/column-queries.test.js @@ -32,10 +32,7 @@ function userChangeQueries(oldTable, newTable) { }); } -function configChangeQueries( - oldCollections, - newCollections, -) { +function configChangeQueries(oldCollections, newCollections) { return getMigrationQueries({ oldSnapshot: { schema: oldCollections, experimentalVersion: 1 }, newSnapshot: { schema: newCollections, experimentalVersion: 1 }, @@ -96,10 +93,7 @@ describe('column queries', () => { }); let error = null; try { - await configChangeQueries( - {[TABLE_NAME]: blogInitial}, - {[TABLE_NAME]: blogFinal}, - ); + await configChangeQueries({ [TABLE_NAME]: blogInitial }, { [TABLE_NAME]: blogFinal }); } catch (e) { error = e.message; } |