@devbro/neko-sql 0.1.16 → 0.1.17

package/dist/{Blueprint-mmlqFfF6.d.mts → Blueprint-DiSVtLdl.d.mts}

@@ -38,8 +38,10 @@ declare class Schema {
 declare abstract class QueryGrammar {
     sqlParts: string[];
     toSql(query: Query): CompiledSql;
+    toSqlParts(query: Query): CompiledSql;
     compileCount(query: Query): CompiledSql;
     compileSelect(selects: selectType[]): CompiledSql;
+    joinArray(arr: (string | number)[]): string;
     compileTable(tableName: string): CompiledSql;
     compileJoin(joins: joinType[]): CompiledSql;
     compileWhere(wheres: whereType[]): CompiledSql;
@@ -50,7 +52,6 @@ declare abstract class QueryGrammar {
     compileOrderBy(orderBy: string[]): CompiledSql;
     compileLimit(limit: number | null): CompiledSql;
     compileOffset(offset: number | null): CompiledSql;
-    abstract getVariablePlaceholder(): string;
     compileWhereNull(w: whereNull): CompiledSql;
     compileInsert(query: Query, data: Record<string, Parameter>): CompiledSql;
     abstract compileInsertGetId(query: Query, data: Record<string, Parameter>, options: {
@@ -89,6 +90,7 @@ type QueryParts = {
     orderBy: string[];
     limit: number | null;
     offset: number | null;
+    alias: string | null;
 };
 declare class Query {
     readonly connection: Connection | null;
@@ -112,6 +114,7 @@ declare class Query {
     offset(offset: number): this;
     toSql(): CompiledSql;
     get(): Promise<any>;
+    first(): Promise<any>;
     count(): Promise<number>;
     getCursor(): Promise<any>;
     getConnection(): Connection | null;
@@ -122,30 +125,31 @@ declare class Query {
     update(data: Record<string, Parameter>): Promise<any>;
     upsert(data: Record<string, Parameter>, uniqueColumns: string[], updateColumns: string[]): Promise<any>;
     delete(): Promise<any>;
-    join(table: string, type: joinType['type'], conditions: (whereType | {
+    join(table: string | Query, type: joinType['type'], conditions: (whereType | {
         column1: string;
         column2: string;
     })[]): this;
-    innerJoin(table: string, conditions: (whereType | {
+    innerJoin(table: Parameters<typeof this.join>[0], conditions: (whereType | {
         column1: string;
         column2: string;
     })[]): this;
-    leftJoin(table: string, conditions: (whereType | {
+    leftJoin(table: Parameters<typeof this.join>[0], conditions: (whereType | {
         column1: string;
         column2: string;
     })[]): this;
-    rightJoin(table: string, conditions: (whereType | {
+    rightJoin(table: Parameters<typeof this.join>[0], conditions: (whereType | {
         column1: string;
         column2: string;
     })[]): this;
-    fullJoin(table: string, conditions: (whereType | {
+    fullJoin(table: Parameters<typeof this.join>[0], conditions: (whereType | {
         column1: string;
         column2: string;
     })[]): this;
-    crossJoin(table: string, conditions: (whereType | {
+    crossJoin(table: Parameters<typeof this.join>[0], conditions: (whereType | {
         column1: string;
         column2: string;
     })[]): this;
+    alias(alias: string): this;
 }
 
 type selectType = string;
@@ -183,12 +187,13 @@ type Parameter = string | number | Date | boolean | null | Expression | undefine
 type JoinCondition = 'and' | 'or';
 type CompiledSql = {
     sql: string;
+    parts: (string | number)[];
     bindings: Parameter[];
 };
 type havingType = whereBasic & (whereOp | whereRaw);
 type joinType = {
     type: 'inner' | 'left' | 'right' | 'full' | 'cross';
-    table: string;
+    table: string | Query;
     conditions: whereType[];
 };
 

package/dist/Blueprint.d.mts

@@ -1 +1 @@
-export { B as Blueprint, a as Column, C as ColumnPropertiesType, F as ForeignKeyConstraint, I as IndexConstraint } from './Blueprint-mmlqFfF6.mjs';
+export { B as Blueprint, a as Column, C as ColumnPropertiesType, F as ForeignKeyConstraint, I as IndexConstraint } from './Blueprint-DiSVtLdl.mjs';

package/dist/Connection.d.mts

@@ -1 +1 @@
-export { b as Connection } from './Blueprint-mmlqFfF6.mjs';
+export { b as Connection } from './Blueprint-DiSVtLdl.mjs';

package/dist/Expression.d.mts

@@ -1 +1 @@
-export { E as Expression } from './Blueprint-mmlqFfF6.mjs';
+export { E as Expression } from './Blueprint-DiSVtLdl.mjs';

package/dist/Expression.mjs

@@ -1,5 +1,6 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { sqlTokenizer } from "sql-tokenizer";
 class Expression {
   constructor(sql = "", bindings = []) {
     this.sql = sql;
@@ -9,7 +10,8 @@ class Expression {
     __name(this, "Expression");
   }
   toCompiledSql() {
-    return { sql: this.sql, bindings: this.bindings };
+    const tokenize = sqlTokenizer(this.sql);
+    return { sql: this.sql, bindings: this.bindings, parts: tokenize(this.sql) };
   }
 }
 export {

package/dist/Expression.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/Expression.mts"],"sourcesContent":["import { CompiledSql } from './types.mjs';\n\nexport class Expression {\n  constructor(\n    private sql = '',\n    private bindings = []\n  ) {}\n\n  toCompiledSql(): CompiledSql {\n    return { sql: this.sql, bindings: this.bindings };\n  }\n}\n"],"mappings":";;AAEO,MAAM,WAAW;AAAA,EACtB,YACU,MAAM,IACN,WAAW,CAAC,GACpB;AAFQ;AACA;AAAA,EACP;AAAA,EANL,OAEwB;AAAA;AAAA;AAAA,EAMtB,gBAA6B;AAC3B,WAAO,EAAE,KAAK,KAAK,KAAK,UAAU,KAAK,SAAS;AAAA,EAClD;AACF;","names":[]}
+{"version":3,"sources":["../src/Expression.mts"],"sourcesContent":["import { CompiledSql } from './types.mjs';\n// @ts-ignore - no type definitions available for sql-tokenizer\nimport { sqlTokenizer } from 'sql-tokenizer';\n\nexport class Expression {\n  constructor(\n    private sql = '',\n    private bindings = []\n  ) {}\n\n  toCompiledSql(): CompiledSql {\n    const tokenize = sqlTokenizer(this.sql);\n    return { sql: this.sql, bindings: this.bindings, parts: tokenize(this.sql) };\n  }\n}\n"],"mappings":";;AAEA,SAAS,oBAAoB;AAEtB,MAAM,WAAW;AAAA,EACtB,YACU,MAAM,IACN,WAAW,CAAC,GACpB;AAFQ;AACA;AAAA,EACP;AAAA,EARL,OAIwB;AAAA;AAAA;AAAA,EAMtB,gBAA6B;AAC3B,UAAM,WAAW,aAAa,KAAK,GAAG;AACtC,WAAO,EAAE,KAAK,KAAK,KAAK,UAAU,KAAK,UAAU,OAAO,SAAS,KAAK,GAAG,EAAE;AAAA,EAC7E;AACF;","names":[]}

package/dist/Migration.d.mts

@@ -1,4 +1,4 @@
-import { S as Schema } from './Blueprint-mmlqFfF6.mjs';
+import { S as Schema } from './Blueprint-DiSVtLdl.mjs';
 
 declare abstract class Migration {
     abstract up(schema: Schema): Promise<void>;

package/dist/Query.d.mts

@@ -1 +1 @@
-export { c as Query, Q as QueryParts } from './Blueprint-mmlqFfF6.mjs';
+export { c as Query, Q as QueryParts } from './Blueprint-DiSVtLdl.mjs';

package/dist/Query.mjs

@@ -18,7 +18,8 @@ class Query {
     having: [],
     orderBy: [],
     limit: null,
-    offset: null
+    offset: null,
+    alias: null
   };
   table(tableName) {
     this.parts.table = tableName;
@@ -108,7 +109,15 @@ class Query {
     return this.grammar.toSql(this);
   }
   async get() {
-    return await this.connection?.runQuery(this.toSql());
+    let sql = this.toSql();
+    return await this.connection?.runQuery(sql);
+  }
+  async first() {
+    let rc = await this.connection?.runQuery(this.toSql());
+    if (rc && Array.isArray(rc) && rc.length > 0) {
+      return rc[0];
+    }
+    return void 0;
   }
   async count() {
     const csql = this.grammar.compileCount(this);
@@ -174,6 +183,10 @@ class Query {
   crossJoin(table, conditions) {
     return this.join(table, "cross", conditions);
   }
+  alias(alias) {
+    this.parts.alias = alias;
+    return this;
+  }
 }
 export {
   Query

package/dist/Query.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/Query.mts"],"sourcesContent":["import { Connection } from './Connection.mjs';\nimport { QueryGrammar } from './QueryGrammar.mjs';\nimport {\n  CompiledSql,\n  JoinCondition,\n  Parameter,\n  selectType,\n  whereType,\n  havingType,\n  joinType,\n} from './types.mjs';\n\nexport type QueryParts = {\n  select: selectType[];\n  table: string;\n  join: joinType[];\n  where: whereType[];\n  groupBy: string[];\n  having: havingType[];\n  orderBy: string[];\n  limit: number | null;\n  offset: number | null;\n};\n\nexport class Query {\n  allowedOperations: string[] = ['=', '>', '<', '!=', 'like', 'ilike', 'in'];\n  parts: QueryParts = {\n    select: ['*'],\n    table: '',\n    join: [],\n    where: [],\n    groupBy: [],\n    having: [],\n    orderBy: [],\n    limit: null,\n    offset: null,\n  };\n\n  constructor(\n    public readonly connection: Connection | null,\n    public readonly grammar: QueryGrammar\n  ) {}\n\n  table(tableName: string): this {\n    this.parts.table = tableName;\n    return this;\n  }\n\n  whereNested(\n    func: (q: Query) => void,\n    joinCondition: JoinCondition = 'and',\n    negateCondition: boolean = false\n  ) {\n    const subQuery = new Query(this.connection, this.grammar);\n    func(subQuery);\n    this.parts.where.push({\n      type: 'nested',\n      query: subQuery,\n      joinCondition,\n      negateCondition,\n    });\n    return this;\n  }\n\n  whereOp(\n    column: string,\n    operation: (typeof this.allowedOperations)[number],\n    value: Parameter,\n    joinCondition: JoinCondition = 'and',\n    negateCondition: boolean = false\n  ): this {\n    this.parts.where.push({\n      type: 'operation',\n      column,\n      operation,\n      value,\n      joinCondition,\n      negateCondition,\n    });\n    return this;\n  }\n\n  whereRaw(\n    sql: string,\n    bindings: Parameter[],\n    joinCondition: JoinCondition = 'and',\n    negateCondition: boolean = false\n  ): this {\n    this.parts.where.push({ type: 'raw', sql, bindings, joinCondition, negateCondition });\n    return this;\n  }\n\n  whereColumn(\n    column1: string,\n    operation: (typeof this.allowedOperations)[number],\n    column2: string,\n    joinCondition: JoinCondition = 'and',\n    negateCondition: boolean = false\n  ): this {\n    this.parts.where.push({\n      type: 'operationColumn',\n      column1,\n      operation,\n      column2,\n      joinCondition,\n      negateCondition,\n    });\n    return this;\n  }\n\n  whereNull(\n    column: string,\n    joinCondition: JoinCondition = 'and',\n    negateCondition: boolean = false\n  ): this {\n    this.parts.where.push({ type: 'null', column, joinCondition, negateCondition });\n    return this;\n  }\n\n  clearWhere(): this {\n    this.parts.where = [];\n    return this;\n  }\n\n  select(selects: selectType[]): this {\n    this.parts.select = [...selects];\n    return this;\n  }\n\n  groupBy(columns: string[]): this {\n    this.parts.groupBy = [...columns];\n    return this;\n  }\n\n  havingOp(\n    column: string,\n    operation: (typeof this.allowedOperations)[number],\n    value: Parameter,\n    joinCondition: JoinCondition = 'and',\n    negateCondition: boolean = false\n  ): this {\n    this.parts.having.push({\n      type: 'operation',\n      column,\n      operation,\n      value,\n      joinCondition,\n      negateCondition,\n    });\n    return this;\n  }\n\n  havingRaw(\n    sql: string,\n    bindings: Parameter[],\n    joinCondition: JoinCondition = 'and',\n    negateCondition: boolean = false\n  ): this {\n    this.parts.having.push({ type: 'raw', sql, bindings, joinCondition, negateCondition });\n    return this;\n  }\n\n  orderBy(column: string, direction: 'asc' | 'desc' = 'asc'): this {\n    this.parts.orderBy.push(`${column} ${direction}`);\n    return this;\n  }\n\n  limit(limit: number): this {\n    this.parts.limit = limit;\n    return this;\n  }\n\n  offset(offset: number): this {\n    this.parts.offset = offset;\n    return this;\n  }\n\n  toSql(): CompiledSql {\n    return this.grammar.toSql(this);\n  }\n\n  async get() {\n    return await this.connection?.runQuery(this.toSql());\n  }\n\n  async count(): Promise<number> {\n    const csql: CompiledSql = this.grammar.compileCount(this);\n    const result = await this.connection?.runQuery(csql);\n    if (result && Array.isArray(result) && result.length > 0) {\n      return parseInt(result[0]['count'], 10);\n    }\n    return 0;\n  }\n\n  async getCursor() {\n    return await this.connection?.runCursor(this.toSql());\n  }\n\n  getConnection(): Connection | null {\n    return this.connection;\n  }\n\n  async insert(data: Record<string, Parameter>) {\n    const csql: CompiledSql = this.grammar.compileInsert(this, data);\n    return await this.connection?.runQuery(csql);\n  }\n\n  async insertGetId(\n    data: Record<string, Parameter>,\n    options: { primaryKey: string[] } = { primaryKey: ['id'] }\n  ) {\n    const csql: CompiledSql = this.grammar.compileInsertGetId(this, data, options);\n    return await this.connection?.runQuery(csql);\n  }\n\n  async update(data: Record<string, Parameter>) {\n    const csql: CompiledSql = this.grammar.compileUpdate(this, data);\n    return await this.connection?.runQuery(csql);\n  }\n\n  async upsert(data: Record<string, Parameter>, uniqueColumns: string[], updateColumns: string[]) {\n    const csql: CompiledSql = this.grammar.compileUpsert(this, data, uniqueColumns, updateColumns);\n    return await this.connection?.runQuery(csql);\n  }\n\n  async delete() {\n    const csql: CompiledSql = this.grammar.compileDelete(this);\n    return await this.connection?.runQuery(csql);\n  }\n\n  join(\n    table: string,\n    type: joinType['type'],\n    conditions: (whereType | { column1: string; column2: string })[]\n  ): this {\n    let conditions_corrected: whereType[] = [];\n    for (const cond of conditions) {\n      conditions_corrected.push({\n        joinCondition: 'and',\n        negateCondition: false,\n        type: 'operationColumn',\n        // @ts-ignore\n        operation: '=',\n        ...cond,\n      });\n    }\n    this.parts.join.push({ type, table, conditions: conditions_corrected });\n    return this;\n  }\n\n  innerJoin(table: string, conditions: (whereType | { column1: string; column2: string })[]): this {\n    return this.join(table, 'inner', conditions);\n  }\n\n  leftJoin(table: string, conditions: (whereType | { column1: string; column2: string })[]): this {\n    return this.join(table, 'left', conditions);\n  }\n\n  rightJoin(table: string, conditions: (whereType | { column1: string; column2: string })[]): this {\n    return this.join(table, 'right', conditions);\n  }\n\n  fullJoin(table: string, conditions: (whereType | { column1: string; column2: string })[]): this {\n    return this.join(table, 'full', conditions);\n  }\n\n  crossJoin(table: string, conditions: (whereType | { column1: string; column2: string })[]): this {\n    return this.join(table, 'cross', conditions);\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../src/Query.mts"],"sourcesContent":["import { Connection } from './Connection.mjs';\nimport { QueryGrammar } from './QueryGrammar.mjs';\nimport {\n  CompiledSql,\n  JoinCondition,\n  Parameter,\n  selectType,\n  whereType,\n  havingType,\n  joinType,\n} from './types.mjs';\n\nexport type QueryParts = {\n  select: selectType[];\n  table: string;\n  join: joinType[];\n  where: whereType[];\n  groupBy: string[];\n  having: havingType[];\n  orderBy: string[];\n  limit: number | null;\n  offset: number | null;\n  alias: string | null;\n};\n\nexport class Query {\n  allowedOperations: string[] = ['=', '>', '<', '!=', 'like', 'ilike', 'in'];\n  parts: QueryParts = {\n    select: ['*'],\n    table: '',\n    join: [],\n    where: [],\n    groupBy: [],\n    having: [],\n    orderBy: [],\n    limit: null,\n    offset: null,\n    alias: null,\n  };\n\n  constructor(\n    public readonly connection: Connection | null,\n    public readonly grammar: QueryGrammar\n  ) {}\n\n  table(tableName: string): this {\n    this.parts.table = tableName;\n    return this;\n  }\n\n  whereNested(\n    func: (q: Query) => void,\n    joinCondition: JoinCondition = 'and',\n    negateCondition: boolean = false\n  ) {\n    const subQuery = new Query(this.connection, this.grammar);\n    func(subQuery);\n    this.parts.where.push({\n      type: 'nested',\n      query: subQuery,\n      joinCondition,\n      negateCondition,\n    });\n    return this;\n  }\n\n  whereOp(\n    column: string,\n    operation: (typeof this.allowedOperations)[number],\n    value: Parameter,\n    joinCondition: JoinCondition = 'and',\n    negateCondition: boolean = false\n  ): this {\n    this.parts.where.push({\n      type: 'operation',\n      column,\n      operation,\n      value,\n      joinCondition,\n      negateCondition,\n    });\n    return this;\n  }\n\n  whereRaw(\n    sql: string,\n    bindings: Parameter[],\n    joinCondition: JoinCondition = 'and',\n    negateCondition: boolean = false\n  ): this {\n    this.parts.where.push({ type: 'raw', sql, bindings, joinCondition, negateCondition });\n    return this;\n  }\n\n  whereColumn(\n    column1: string,\n    operation: (typeof this.allowedOperations)[number],\n    column2: string,\n    joinCondition: JoinCondition = 'and',\n    negateCondition: boolean = false\n  ): this {\n    this.parts.where.push({\n      type: 'operationColumn',\n      column1,\n      operation,\n      column2,\n      joinCondition,\n      negateCondition,\n    });\n    return this;\n  }\n\n  whereNull(\n    column: string,\n    joinCondition: JoinCondition = 'and',\n    negateCondition: boolean = false\n  ): this {\n    this.parts.where.push({ type: 'null', column, joinCondition, negateCondition });\n    return this;\n  }\n\n  clearWhere(): this {\n    this.parts.where = [];\n    return this;\n  }\n\n  select(selects: selectType[]): this {\n    this.parts.select = [...selects];\n    return this;\n  }\n\n  groupBy(columns: string[]): this {\n    this.parts.groupBy = [...columns];\n    return this;\n  }\n\n  havingOp(\n    column: string,\n    operation: (typeof this.allowedOperations)[number],\n    value: Parameter,\n    joinCondition: JoinCondition = 'and',\n    negateCondition: boolean = false\n  ): this {\n    this.parts.having.push({\n      type: 'operation',\n      column,\n      operation,\n      value,\n      joinCondition,\n      negateCondition,\n    });\n    return this;\n  }\n\n  havingRaw(\n    sql: string,\n    bindings: Parameter[],\n    joinCondition: JoinCondition = 'and',\n    negateCondition: boolean = false\n  ): this {\n    this.parts.having.push({ type: 'raw', sql, bindings, joinCondition, negateCondition });\n    return this;\n  }\n\n  orderBy(column: string, direction: 'asc' | 'desc' = 'asc'): this {\n    this.parts.orderBy.push(`${column} ${direction}`);\n    return this;\n  }\n\n  limit(limit: number): this {\n    this.parts.limit = limit;\n    return this;\n  }\n\n  offset(offset: number): this {\n    this.parts.offset = offset;\n    return this;\n  }\n\n  toSql(): CompiledSql {\n    return this.grammar.toSql(this);\n  }\n\n  async get() {\n    let sql = this.toSql();\n    return await this.connection?.runQuery(sql);\n  }\n\n  async first() {\n    let rc = await this.connection?.runQuery(this.toSql());\n    if (rc && Array.isArray(rc) && rc.length > 0) {\n      return rc[0];\n    }\n    return undefined;\n  }\n\n  async count(): Promise<number> {\n    const csql: CompiledSql = this.grammar.compileCount(this);\n    const result = await this.connection?.runQuery(csql);\n    if (result && Array.isArray(result) && result.length > 0) {\n      return parseInt(result[0]['count'], 10);\n    }\n    return 0;\n  }\n\n  async getCursor() {\n    return await this.connection?.runCursor(this.toSql());\n  }\n\n  getConnection(): Connection | null {\n    return this.connection;\n  }\n\n  async insert(data: Record<string, Parameter>) {\n    const csql: CompiledSql = this.grammar.compileInsert(this, data);\n    return await this.connection?.runQuery(csql);\n  }\n\n  async insertGetId(\n    data: Record<string, Parameter>,\n    options: { primaryKey: string[] } = { primaryKey: ['id'] }\n  ) {\n    const csql: CompiledSql = this.grammar.compileInsertGetId(this, data, options);\n    return await this.connection?.runQuery(csql);\n  }\n\n  async update(data: Record<string, Parameter>) {\n    const csql: CompiledSql = this.grammar.compileUpdate(this, data);\n    return await this.connection?.runQuery(csql);\n  }\n\n  async upsert(data: Record<string, Parameter>, uniqueColumns: string[], updateColumns: string[]) {\n    const csql: CompiledSql = this.grammar.compileUpsert(this, data, uniqueColumns, updateColumns);\n    return await this.connection?.runQuery(csql);\n  }\n\n  async delete() {\n    const csql: CompiledSql = this.grammar.compileDelete(this);\n    return await this.connection?.runQuery(csql);\n  }\n\n  join(\n    table: string | Query,\n    type: joinType['type'],\n    conditions: (whereType | { column1: string; column2: string })[]\n  ): this {\n    let conditions_corrected: whereType[] = [];\n    for (const cond of conditions) {\n      conditions_corrected.push({\n        joinCondition: 'and',\n        negateCondition: false,\n        type: 'operationColumn',\n        // @ts-ignore\n        operation: '=',\n        ...cond,\n      });\n    }\n    this.parts.join.push({ type, table, conditions: conditions_corrected });\n    return this;\n  }\n\n  innerJoin(\n    table: Parameters<typeof this.join>[0],\n    conditions: (whereType | { column1: string; column2: string })[]\n  ): this {\n    return this.join(table, 'inner', conditions);\n  }\n\n  leftJoin(\n    table: Parameters<typeof this.join>[0],\n    conditions: (whereType | { column1: string; column2: string })[]\n  ): this {\n    return this.join(table, 'left', conditions);\n  }\n\n  rightJoin(\n    table: Parameters<typeof this.join>[0],\n    conditions: (whereType | { column1: string; column2: string })[]\n  ): this {\n    return this.join(table, 'right', conditions);\n  }\n\n  fullJoin(\n    table: Parameters<typeof this.join>[0],\n    conditions: (whereType | { column1: string; column2: string })[]\n  ): this {\n    return this.join(table, 'full', conditions);\n  }\n\n  crossJoin(\n    table: Parameters<typeof this.join>[0],\n    conditions: (whereType | { column1: string; column2: string })[]\n  ): this {\n    return this.join(table, 'cross', conditions);\n  }\n\n  alias(alias: string): this {\n    this.parts.alias = alias;\n    return this;\n  }\n}\n"],"mappings":"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","names":[]}

package/dist/QueryGrammar.d.mts

@@ -1 +1 @@
-export { d as QueryGrammar } from './Blueprint-mmlqFfF6.mjs';
+export { d as QueryGrammar } from './Blueprint-DiSVtLdl.mjs';

package/dist/QueryGrammar.mjs

@@ -1,5 +1,6 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+import { sqlTokenizer } from "sql-tokenizer";
 function toUpperFirst(str) {
   return str.substring(0, 1).toUpperCase() + str.substring(1);
 }
@@ -20,79 +21,118 @@ class QueryGrammar {
     "offset"
   ];
   toSql(query) {
-    let sql = "";
+    let rc = this.toSqlParts(query);
+    rc.sql = this.joinArray(rc.parts);
+    return rc;
+  }
+  toSqlParts(query) {
+    let parts = [];
     let bindings = [];
     for (const part of this.sqlParts) {
       const funcName = "compile" + toUpperFirst(part);
       const r = this[funcName](query.parts[part]);
-      if (!sql) {
-        sql = r.sql;
-      } else if (r.sql) {
-        sql += " " + r.sql;
-      }
       bindings = [...bindings, ...r.bindings];
+      parts = [...parts, ...r.parts];
     }
-    return { sql, bindings };
+    return {
+      sql: "",
+      bindings,
+      parts
+    };
   }
   compileCount(query) {
     let sql = "";
     let bindings = [];
+    let parts = [];
     for (const part of this.sqlParts) {
-      let parts = query.parts[part];
+      let parts2 = query.parts[part];
       if (part === "select") {
-        parts = ["count(*) as count"];
+        parts2 = ["count(*) as count"];
       }
       const funcName = "compile" + toUpperFirst(part);
-      const r = this[funcName](parts);
-      if (!sql) {
-        sql = r.sql;
-      } else if (r.sql) {
-        sql += " " + r.sql;
-      }
+      const r = this[funcName](parts2);
       bindings = [...bindings, ...r.bindings];
+      parts = [...parts, ...r.parts];
     }
-    return { sql, bindings };
+    return { sql, parts, bindings };
   }
   compileSelect(selects) {
-    const rc = selects.map((v) => {
-      return v;
-    }).join(", ");
-    return { sql: "select " + rc, bindings: [] };
+    const parts = ["select"];
+    selects.map((v) => {
+      parts.push(v);
+      parts.push(",");
+    });
+    parts.pop();
+    return { sql: this.joinArray(parts), parts, bindings: [] };
   }
-  compileTable(tableName) {
+  joinArray(arr) {
     let rc = "";
+    let last = "";
+    for (const a of arr) {
+      if (a === ",") {
+        rc += a;
+      } else if (last === "(" || last === " " || a === ")") {
+        rc += a;
+      } else if (a === "") {
+        rc += "";
+      } else {
+        rc += " " + a;
+      }
+      last = a;
+    }
+    return rc.trim();
+  }
+  compileTable(tableName) {
+    let parts = [];
     if (tableName.length) {
-      rc = "from " + tableName;
+      parts.push("from");
+      parts.push(tableName);
     }
-    return { sql: rc, bindings: [] };
+    return { sql: parts.join(" "), parts, bindings: [] };
   }
   compileJoin(joins) {
     let sql = "";
     let bindings = [];
+    let parts = [];
     for (const j of joins) {
-      sql += " " + j.type + " join " + j.table + " on ";
-      const where = this.compileWhere(j.conditions);
-      if (where.sql.startsWith("where ")) {
-        where.sql = where.sql.substring("where ".length);
+      let table = "";
+      let table_bindings = [];
+      parts.push(j.type);
+      parts.push("join");
+      if (typeof j.table === "string") {
+        parts.push(j.table);
+      } else {
+        const subQuery = j.table;
+        const { parts: parts2, bindings: bindings2 } = subQuery.toSql();
+        parts = [...parts, "(", ...parts2, ")", "as", subQuery.parts.alias || "subquery"];
+        table_bindings = bindings2;
       }
-      sql += "(";
-      sql += where.sql;
-      sql += ")";
-      bindings = [...bindings, ...where.bindings];
+      parts.push("on");
+      const where = this.compileWhere(j.conditions);
+      const where_parts = where.parts;
+      where_parts.shift();
+      parts.push("(");
+      parts = [...parts, ...where_parts];
+      parts.push(")");
+      bindings = [...bindings, ...table_bindings, ...where.bindings];
     }
-    return { sql, bindings };
+    return { sql, parts, bindings };
   }
   compileWhere(wheres) {
     let sql = "";
     let bindings = [];
+    let parts = [];
     for (const w of wheres) {
       sql += " " + w.joinCondition + " ";
+      parts.push(w.joinCondition);
       if (w.negateCondition) {
         sql += "not ";
+        parts.push("not");
       }
       const funcName = "compileWhere" + toUpperFirst(w.type);
       const wh = this[funcName](w);
       sql += wh.sql;
+      parts = parts.concat(wh.parts);
       bindings = [...bindings, ...wh.bindings];
     }
     if (sql.startsWith(" and ")) {
@@ -100,160 +140,197 @@ class QueryGrammar {
     } else if (sql.startsWith(" or ")) {
       sql = "where " + sql.substring(" or ".length);
     }
-    return { sql, bindings };
+    if (parts.length > 0) {
+      parts[0] = "where";
+    }
+    return { sql, parts, bindings };
   }
   compileWhereNested(w) {
     const subQuery = w.query;
-    const { sql, bindings } = subQuery.grammar.compileWhere(subQuery.parts.where);
+    let parts = [];
+    const { sql, parts: parts2, bindings } = subQuery.grammar.compileWhere(subQuery.parts.where);
     let sql2 = sql.replace(/^where /, "");
+    parts2.shift();
+    parts.push("(");
+    parts = parts.concat(parts2);
+    parts.push(")");
     return {
       sql: `(${sql2})`,
+      parts,
       bindings
     };
   }
   compileWhereOperation(w) {
     if (w.operation.toLowerCase() === "in" && Array.isArray(w.value)) {
       return {
-        sql: `${w.column} = ANY(${this.getVariablePlaceholder()})`,
+        sql: `${w.column} = ANY( ? )`,
+        parts: [w.column, " = ANY(", "?", ")"],
         bindings: [w.value]
       };
     }
     return {
-      sql: `${w.column} ${w.operation} ${this.getVariablePlaceholder()}`,
+      sql: `${w.column} ${w.operation} ?`,
+      parts: [w.column, w.operation, "?"],
       bindings: [w.value]
     };
   }
   compileWhereOperationColumn(w) {
     return {
       sql: `${w.column1} ${w.operation} ${w.column2}`,
+      parts: [w.column1, w.operation, w.column2],
       bindings: []
     };
   }
   compileWhereRaw(w) {
-    let sql = w.sql.replace(/\?/g, () => this.getVariablePlaceholder());
+    const tokenize = sqlTokenizer();
     return {
-      sql,
+      sql: w.sql,
+      parts: tokenize(w.sql).filter((t) => t !== " "),
       bindings: w.bindings
     };
   }
   compileOrderBy(orderBy) {
     let rc = "";
+    let parts = [];
     if (orderBy.length) {
       rc = "order by " + orderBy.join(", ");
+      parts.push("order by");
+      parts = parts.concat(orderBy);
     }
-    return { sql: rc, bindings: [] };
+    return { sql: rc, parts, bindings: [] };
   }
   compileLimit(limit) {
     let rc = "";
+    let parts = [];
     if (limit !== null) {
       rc = "limit " + limit;
+      parts.push("limit");
+      parts.push(limit);
     }
-    return { sql: rc, bindings: [] };
+    return { sql: rc, parts, bindings: [] };
   }
   compileOffset(offset) {
     let rc = "";
+    let parts = [];
     if (offset !== null) {
       rc = "offset " + offset;
+      parts.push("offset");
+      parts.push(offset);
     }
-    return { sql: rc, bindings: [] };
+    return { sql: rc, parts, bindings: [] };
   }
   compileWhereNull(w) {
     return {
       sql: `${w.column} is null`,
+      parts: [w.column, "is", "null"],
       bindings: []
     };
   }
   compileInsert(query, data) {
-    let sql = "insert into " + query.parts.table + " (";
+    let parts = ["insert", "into", query.parts.table, "("];
     const columns = [];
     const bindings = [];
     const values = [];
     for (const [k, v] of Object.entries(data)) {
-      columns.push(k);
+      parts.push(k);
+      parts.push(",");
+    }
+    parts.pop();
+    parts = parts.concat([")", "values", "("]);
+    for (const [k, v] of Object.entries(data)) {
+      parts.push("?");
       bindings.push(v);
-      values.push(this.getVariablePlaceholder());
+      parts.push(",");
     }
-    sql += columns.join(", ") + ") values (" + values + ")";
-    return { sql, bindings };
+    parts.pop();
+    parts.push(")");
+    return { sql: parts.join(" "), parts, bindings };
   }
   compileUpdate(query, data) {
-    let sql = "update " + query.parts.table + " set ";
     const bindings = [];
+    let parts = ["update", query.parts.table, "set"];
     const setParts = [];
     for (const [k, v] of Object.entries(data)) {
-      setParts.push(`${k} = ${this.getVariablePlaceholder()}`);
+      parts = parts.concat([k, "=", "?", ","]);
+      setParts.push(`${k} = ?`);
       bindings.push(v);
     }
-    sql += setParts.join(", ");
+    parts.pop();
     const where_csql = this.compileWhere(query.parts.where);
-    sql += " " + where_csql.sql;
+    parts = parts.concat(where_csql.parts);
     bindings.push(...where_csql.bindings);
-    return { sql, bindings };
+    return { sql: parts.join(" "), parts, bindings };
   }
   compileDelete(query) {
     let sql = "delete from " + query.parts.table;
+    let parts = ["delete", "from", query.parts.table];
     const where_csql = this.compileWhere(query.parts.where);
     sql += " " + where_csql.sql;
-    return { sql, bindings: where_csql.bindings };
+    parts = parts.concat(where_csql.parts);
+    return { sql, parts, bindings: where_csql.bindings };
   }
   compileUpsert(query, data, conflictFields, updateFields) {
-    let sql = "insert into " + query.parts.table + " (";
-    const columns = [];
+    let parts = [];
     const bindings = [];
-    const values = [];
-    for (const [k, v] of Object.entries(data)) {
-      columns.push(k);
-      bindings.push(v);
-      values.push(this.getVariablePlaceholder());
-    }
-    sql += columns.join(", ") + ") values (" + values + ")";
-    sql += " on conflict (" + conflictFields.join(", ") + ") do update set ";
+    let isql = this.compileInsert(query, data);
+    parts = isql.parts;
+    bindings.push(...isql.bindings);
+    parts = parts.concat(["on", "conflict", "(", ...conflictFields, ")", "do", "update", "set"]);
     const setParts = [];
     for (const f of updateFields) {
       setParts.push(`${f} = excluded.${f}`);
+      setParts.push(`,`);
     }
-    sql += setParts.join(", ");
+    setParts.pop();
+    parts = parts.concat(setParts);
     const where_csql = this.compileWhere(query.parts.where);
-    sql += " " + where_csql.sql;
+    parts = parts.concat(where_csql.parts);
     bindings.push(...where_csql.bindings);
-    return { sql, bindings };
+    return { sql: parts.join(" "), parts, bindings };
   }
   compileGroupBy(groupBy) {
     let rc = "";
+    let parts = [];
     if (groupBy.length) {
       rc = "group by " + groupBy.join(", ");
+      parts.push("group by");
+      parts = parts.concat(groupBy);
     }
-    return { sql: rc, bindings: [] };
+    return { sql: rc, parts, bindings: [] };
   }
   compileHaving(having) {
     let sql = "";
     let bindings = [];
+    let parts = [];
     for (const w of having) {
       sql += " " + w.joinCondition + " ";
+      parts.push(w.joinCondition);
       if (w.negateCondition) {
         sql += "not ";
+        parts.push("not");
       }
       const funcName = "compileHaving" + toUpperFirst(w.type);
       const wh = this[funcName](w);
+      parts = parts.concat(wh.parts);
       sql += wh.sql;
       bindings = [...bindings, ...wh.bindings];
     }
-    if (sql.startsWith(" and ")) {
-      sql = "having " + sql.substring(" and ".length);
-    } else if (sql.startsWith(" or ")) {
-      sql = "having " + sql.substring(" or ".length);
+    if (parts.length > 0) {
+      parts[0] = "having";
     }
-    return { sql, bindings };
+    return { sql: parts.join(" "), parts, bindings };
   }
   compileHavingOperation(w) {
     return {
-      sql: `${w.column} ${w.operation} ${this.getVariablePlaceholder()}`,
+      sql: `${w.column} ${w.operation} ?`,
+      parts: [w.column, w.operation, "?"],
       bindings: [w.value]
     };
   }
   compileHavingRaw(w) {
     return {
       sql: w.sql,
+      parts: w.sql.split(" "),
       bindings: w.bindings
     };
   }