Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: improve sqlite-introspector metadata query #1349

Merged
merged 2 commits into from
Feb 8, 2025
Merged

refactor: improve sqlite-introspector metadata query #1349

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3061092
refactor: improve sqlite-introspector metadata query
tgriesser Feb 8, 2025
f5f005b
Merge branch 'master' into tgriesser/refactor/sqlite-introspection
igalklebanov Feb 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 27 additions & 31 deletions src/dialect/sqlite/sqlite-introspector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
DEFAULT_MIGRATION_TABLE,
} from '../../migration/migrator.js'
import { sql } from '../../raw-builder/sql.js'
import { QueryCreator } from '../../query-creator.js'

interface SqliteSystemDatabase {
// https://www.sqlite.org/schematab.html#alternative_names
Expand Down Expand Up @@ -62,26 +63,11 @@ export class SqliteIntrospector implements DatabaseIntrospector {
}
}

#metaQuery(table: string) {
return this.#db
.selectFrom(
sql<PragmaTableInfo>`pragma_table_info(${table})`.as('table_info'),
)
.select([
sql.val(table).as('table'),
'cid',
'name',
'type',
'notnull',
'dflt_value',
'pk',
])
}

async #getTableMetadata(
#tablesQuery(
qb: QueryCreator<SqliteSystemDatabase> | Kysely<SqliteSystemDatabase>,
options: DatabaseMetadataOptions,
): Promise<TableMetadata[]> {
let tablesQuery = this.#db
) {
let tablesQuery = qb
.selectFrom('sqlite_master')
.where('type', 'in', ['table', 'view'])
.where('name', 'not like', 'sqlite_%')
Expand All @@ -93,20 +79,30 @@ export class SqliteIntrospector implements DatabaseIntrospector {
.where('name', '!=', DEFAULT_MIGRATION_TABLE)
.where('name', '!=', DEFAULT_MIGRATION_LOCK_TABLE)
}
return tablesQuery
}

const tablesResult = await tablesQuery.execute()
const [firstTable, ...otherTables] = tablesResult

if (!firstTable) {
return []
}
async #getTableMetadata(
options: DatabaseMetadataOptions,
): Promise<TableMetadata[]> {
const tablesResult = await this.#tablesQuery(this.#db, options).execute()

let metadataQuery = this.#metaQuery(firstTable.name)
for (const otherTable of otherTables) {
metadataQuery = metadataQuery.unionAll(this.#metaQuery(otherTable.name))
}
const tableMetadata = await metadataQuery
.orderBy(['table', 'cid'])
const tableMetadata = await this.#db
.with('table_list', (qb) => this.#tablesQuery(qb, options))
.selectFrom([
'table_list as tl',
sql<PragmaTableInfo>`pragma_table_info(tl.name)`.as('p'),
])
.select([
'tl.name as table',
'p.cid',
'p.name',
'p.type',
'p.notnull',
'p.dflt_value',
'p.pk',
])
.orderBy(['tl.name', 'p.cid'])
.execute()

const columnsByTable: Record<string, typeof tableMetadata> = {}
Expand Down