Merge branch 'bwilmoth/bigquery-dialect' of github.com:outerbase/sdk …

…into bwilmoth/bigquery-dialect

src/connections/motherduck.ts

@@ -8,7 +8,7 @@ import {
     TableIndex,
     TableIndexType,
 } from '../models/database'
-import { DefaultDialect } from '../query-builder/dialects/default'
+import { DuckDbDialect } from '../query-builder/dialects/duckdb'
 import duckDB from 'duckdb'
 
 type DuckDBParameters = {
@@ -24,7 +24,7 @@ export class DuckDBConnection implements Connection {
     queryType = QueryType.positional
 
     // Default dialect for MotherDuck
-    dialect = new DefaultDialect()
+    dialect = new DuckDbDialect()
 
     constructor(private _: DuckDBParameters) {
         this.duckDB = new duckDB.Database(_.path, {

src/query-builder/dialects/duckdb.ts

@@ -0,0 +1,10 @@
+import { QueryBuilder } from 'src/client';
+import { Query } from 'src/query';
+import { QueryType } from 'src/query-params';
+import { AbstractDialect } from '../index';
+
+export class DuckDbDialect extends AbstractDialect {
+    formatSchemaAndTable(schema: string | undefined, table: string): string {
+        return table;
+    }
+}

src/query-builder/index.ts

@@ -184,7 +184,13 @@ export abstract class AbstractDialect implements Dialect {
      * @returns The formatted schema and table combination.
      */
     formatSchemaAndTable(schema: string | undefined, table: string): string {
-        // Default implementation (can be overridden by specific dialects)
+        if (schema) {
+            return `"${schema}".${table}`;
+        }
+        return table;
+    }
+
+    formatFromSchemaAndTable(schema: string | undefined, table: string): string {
         if (schema) {
             return `"${schema}".${table}`;
         }
@@ -202,6 +208,7 @@ export abstract class AbstractDialect implements Dialect {
             }
 
             const formattedTable = this.formatSchemaAndTable(set.schema, set.table);
+            const formattedFromTable = this.formatFromSchemaAndTable(set.schema, set.table);
             const columns = set.columns.map((column) => {
                 let useColumn = column
 
@@ -215,7 +222,7 @@ export abstract class AbstractDialect implements Dialect {
             selectColumns += columns.join(', ')
 
             if (index === 0) {
-                fromTable = formattedTable
+                fromTable = formattedFromTable
             }
         })