Skip to content

Handle qualified table names #2

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Handle qualified table names #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 23 additions & 13 deletions src/adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,17 +93,27 @@ class BunSQLiteQueryable implements SqlQueryable {
}
}

private getTableFromQuery(sql: string): string | null {
// Simple regex to extract table name from SELECT queries
// This handles common cases like SELECT ... FROM table, SELECT ... FROM "table", etc.
const match = sql.match(/\bFROM\s+(?:`([^`]+)`|"([^"]+)"|(\w+))/i);
return match ? (match[1] || match[2] || match[3]) : null;
private getTableFromQuery(sql: string): { schema?: string; table: string } | null {
// Extract table name from SELECT queries, handling qualified names like schema.table
// Match patterns like: `schema`.`table`, "schema"."table", schema.table, `table`, "table", table
const match = sql.match(/\bFROM\s+(?:(?:`([^`]+)`|"([^"]+)"|(\w+))\.)?(?:`([^`]+)`|"([^"]+)"|(\w+))/i);
if (match) {
const schema = match[1] || match[2] || match[3];
const table = match[4] || match[5] || match[6];
return schema ? { schema, table } : { table };
}
return null;
}

private async getColumnTypes(tableName: string, columnNames: string[]): Promise<Array<string | null>> {
private async getColumnTypes(tableInfo: { schema?: string; table: string }, columnNames: string[]): Promise<Array<string | null>> {
try {
const tableInfoStmt = this.db.query(`PRAGMA table_info(${tableName})`);
const tableInfo = tableInfoStmt.all() as Array<{
// Build PRAGMA query with optional schema qualifier
const pragmaQuery = tableInfo.schema
? `PRAGMA ${tableInfo.schema}.table_info(${tableInfo.table})`
: `PRAGMA table_info(${tableInfo.table})`;

const tableInfoStmt = this.db.query(pragmaQuery);
const tableInfoResult = tableInfoStmt.all() as Array<{
cid: number;
name: string;
type: string;
Expand All @@ -114,14 +124,14 @@ class BunSQLiteQueryable implements SqlQueryable {

// Create a map of column names to types
const typeMap = new Map<string, string>();
tableInfo.forEach(col => {
tableInfoResult.forEach(col => {
typeMap.set(col.name, col.type);
});

// Return types in the same order as columnNames
return columnNames.map(name => typeMap.get(name) || null);
} catch (e) {
debug("Failed to get column types for table %s: %O", tableName, e);
debug("Failed to get column types for table %s: %O", tableInfo, e);
// Fall back to null types if we can't get schema info
return columnNames.map(() => null);
}
Expand All @@ -145,9 +155,9 @@ class BunSQLiteQueryable implements SqlQueryable {

// Try to get proper column types from table schema
let declaredTypes: Array<string | null>;
const tableName = this.getTableFromQuery(query.sql);
if (tableName) {
declaredTypes = await this.getColumnTypes(tableName, columns);
const tableInfo = this.getTableFromQuery(query.sql);
if (tableInfo) {
declaredTypes = await this.getColumnTypes(tableInfo, columns);
} else {
declaredTypes = columns.map((col: any) => null);
}
Expand Down