@devbro/neko-sql 0.1.0 → 0.1.1

package/dist/{Connection-DBxWn3YO.d.ts → Connection-CM5zdBeX.d.ts}

@@ -16,6 +16,7 @@ declare class Schema {
 declare abstract class QueryGrammar {
     sqlParts: string[];
     toSql(query: Query): CompiledSql;
+    compileCount(query: Query): CompiledSql;
     compileSelect(selects: selectType[]): CompiledSql;
     compileTable(tableName: string): CompiledSql;
     compileJoin(joins: joinType[]): CompiledSql;
@@ -71,6 +72,7 @@ declare class Query {
     offset(offset: number): this;
     toSql(): CompiledSql;
     get(): Promise<any>;
+    count(): Promise<number>;
     getCursor(): Promise<any>;
     getConnection(): Connection | null;
     insert(data: Record<string, Parameter>): Promise<any>;

package/dist/{Connection-Z5qLWvdu.d.mts → Connection-DhP5VxCW.d.mts}

@@ -16,6 +16,7 @@ declare class Schema {
 declare abstract class QueryGrammar {
     sqlParts: string[];
     toSql(query: Query): CompiledSql;
+    compileCount(query: Query): CompiledSql;
     compileSelect(selects: selectType[]): CompiledSql;
     compileTable(tableName: string): CompiledSql;
     compileJoin(joins: joinType[]): CompiledSql;
@@ -71,6 +72,7 @@ declare class Query {
     offset(offset: number): this;
     toSql(): CompiledSql;
     get(): Promise<any>;
+    count(): Promise<number>;
     getCursor(): Promise<any>;
     getConnection(): Connection | null;
     insert(data: Record<string, Parameter>): Promise<any>;

package/dist/Connection.d.mts

@@ -1,4 +1,4 @@
-export { C as Connection } from './Connection-Z5qLWvdu.mjs';
+export { C as Connection } from './Connection-DhP5VxCW.mjs';
 import './types-C_aDrXJN.mjs';
 import './Blueprint.mjs';
 import './SchemaGrammar.mjs';

package/dist/Connection.d.ts

@@ -1,4 +1,4 @@
-export { C as Connection } from './Connection-DBxWn3YO.js';
+export { C as Connection } from './Connection-CM5zdBeX.js';
 import './types-C_aDrXJN.js';
 import './Blueprint.js';
 import './SchemaGrammar.js';

package/dist/Migration.d.mts

@@ -1,4 +1,4 @@
-import { S as Schema } from './Connection-Z5qLWvdu.mjs';
+import { S as Schema } from './Connection-DhP5VxCW.mjs';
 import './Blueprint.mjs';
 import './types-C_aDrXJN.mjs';
 import './SchemaGrammar.mjs';

package/dist/Migration.d.ts

@@ -1,4 +1,4 @@
-import { S as Schema } from './Connection-DBxWn3YO.js';
+import { S as Schema } from './Connection-CM5zdBeX.js';
 import './Blueprint.js';
 import './types-C_aDrXJN.js';
 import './SchemaGrammar.js';

package/dist/Query.d.mts

@@ -1,4 +1,4 @@
-export { a as Query, Q as QueryParts } from './Connection-Z5qLWvdu.mjs';
+export { a as Query, Q as QueryParts } from './Connection-DhP5VxCW.mjs';
 import './types-C_aDrXJN.mjs';
 import './Blueprint.mjs';
 import './SchemaGrammar.mjs';

package/dist/Query.d.ts

@@ -1,4 +1,4 @@
-export { a as Query, Q as QueryParts } from './Connection-DBxWn3YO.js';
+export { a as Query, Q as QueryParts } from './Connection-CM5zdBeX.js';
 import './types-C_aDrXJN.js';
 import './Blueprint.js';
 import './SchemaGrammar.js';

package/dist/Query.js

@@ -113,6 +113,15 @@ class Query {
   async get() {
     return await this.connection?.runQuery(this.toSql());
   }
+  async count() {
+    const csql = this.grammar.compileCount(this);
+    console.log("Count SQL:", csql.sql, "Bindings:", csql.bindings);
+    const result = await this.connection?.runQuery(csql);
+    if (result && Array.isArray(result) && result.length > 0) {
+      return parseInt(result[0]["count"], 10);
+    }
+    return 0;
+  }
   async getCursor() {
     return await this.connection?.runCursor(this.toSql());
   }

package/dist/Query.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/Query.ts"],"sourcesContent":["import { Connection } from './Connection';\nimport { QueryGrammar } from './QueryGrammar';\nimport { CompiledSql, JoinCondition, Parameter, selectType, whereType, havingType, joinType } from './types';\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'];\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    private readonly connection: Connection | null,\n    private readonly grammar: QueryGrammar\n  ) {}\n\n  table(tableName: string): this {\n    this.parts.table = tableName;\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  whereColumn(column1: string, operation: (typeof this.allowedOperations)[number], column2: string, joinCondition: JoinCondition = 'and', negateCondition: boolean = false): 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 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  innerJoin(table: string, condtions: whereType[]): this {\n    this.parts.join.push({ type: 'inner', table, conditions: condtions });\n    return this;\n  }\n\n  leftJoin(table: string, condtions: whereType[]): this {\n    this.parts.join.push({ type: 'left', table, conditions: condtions });\n    return this;\n  }\n\n  rightJoin(table: string, condtions: whereType[]): this {\n    this.parts.join.push({ type: 'right', table, conditions: condtions });\n    return this;\n  }\n\n  fullJoin(table: string, condtions: whereType[]): this {\n    this.parts.join.push({ type: 'full', table, conditions: condtions });\n    return this;\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../src/Query.ts"],"sourcesContent":["import { Connection } from './Connection';\nimport { QueryGrammar } from './QueryGrammar';\nimport {\n  CompiledSql,\n  JoinCondition,\n  Parameter,\n  selectType,\n  whereType,\n  havingType,\n  joinType,\n} from './types';\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'];\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    private readonly connection: Connection | null,\n    private readonly grammar: QueryGrammar\n  ) {}\n\n  table(tableName: string): this {\n    this.parts.table = tableName;\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  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    console.log('Count SQL:', csql.sql, 'Bindings:', csql.bindings);\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  innerJoin(table: string, condtions: whereType[]): this {\n    this.parts.join.push({ type: 'inner', table, conditions: condtions });\n    return this;\n  }\n\n  leftJoin(table: string, condtions: whereType[]): this {\n    this.parts.join.push({ type: 'left', table, conditions: condtions });\n    return this;\n  }\n\n  rightJoin(table: string, condtions: whereType[]): this {\n    this.parts.join.push({ type: 'right', table, conditions: condtions });\n    return this;\n  }\n\n  fullJoin(table: string, condtions: whereType[]): this {\n    this.parts.join.push({ type: 'full', table, conditions: condtions });\n    return this;\n  }\n}\n"],"mappings":"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","names":[]}

package/dist/Query.mjs

@@ -90,6 +90,15 @@ class Query {
   async get() {
     return await this.connection?.runQuery(this.toSql());
   }
+  async count() {
+    const csql = this.grammar.compileCount(this);
+    console.log("Count SQL:", csql.sql, "Bindings:", csql.bindings);
+    const result = await this.connection?.runQuery(csql);
+    if (result && Array.isArray(result) && result.length > 0) {
+      return parseInt(result[0]["count"], 10);
+    }
+    return 0;
+  }
   async getCursor() {
     return await this.connection?.runCursor(this.toSql());
   }

package/dist/Query.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/Query.ts"],"sourcesContent":["import { Connection } from './Connection';\nimport { QueryGrammar } from './QueryGrammar';\nimport { CompiledSql, JoinCondition, Parameter, selectType, whereType, havingType, joinType } from './types';\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'];\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    private readonly connection: Connection | null,\n    private readonly grammar: QueryGrammar\n  ) {}\n\n  table(tableName: string): this {\n    this.parts.table = tableName;\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  whereColumn(column1: string, operation: (typeof this.allowedOperations)[number], column2: string, joinCondition: JoinCondition = 'and', negateCondition: boolean = false): 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 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  innerJoin(table: string, condtions: whereType[]): this {\n    this.parts.join.push({ type: 'inner', table, conditions: condtions });\n    return this;\n  }\n\n  leftJoin(table: string, condtions: whereType[]): this {\n    this.parts.join.push({ type: 'left', table, conditions: condtions });\n    return this;\n  }\n\n  rightJoin(table: string, condtions: whereType[]): this {\n    this.parts.join.push({ type: 'right', table, conditions: condtions });\n    return this;\n  }\n\n  fullJoin(table: string, condtions: whereType[]): this {\n    this.parts.join.push({ type: 'full', table, conditions: condtions });\n    return this;\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../src/Query.ts"],"sourcesContent":["import { Connection } from './Connection';\nimport { QueryGrammar } from './QueryGrammar';\nimport {\n  CompiledSql,\n  JoinCondition,\n  Parameter,\n  selectType,\n  whereType,\n  havingType,\n  joinType,\n} from './types';\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'];\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    private readonly connection: Connection | null,\n    private readonly grammar: QueryGrammar\n  ) {}\n\n  table(tableName: string): this {\n    this.parts.table = tableName;\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  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    console.log('Count SQL:', csql.sql, 'Bindings:', csql.bindings);\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  innerJoin(table: string, condtions: whereType[]): this {\n    this.parts.join.push({ type: 'inner', table, conditions: condtions });\n    return this;\n  }\n\n  leftJoin(table: string, condtions: whereType[]): this {\n    this.parts.join.push({ type: 'left', table, conditions: condtions });\n    return this;\n  }\n\n  rightJoin(table: string, condtions: whereType[]): this {\n    this.parts.join.push({ type: 'right', table, conditions: condtions });\n    return this;\n  }\n\n  fullJoin(table: string, condtions: whereType[]): this {\n    this.parts.join.push({ type: 'full', table, conditions: condtions });\n    return this;\n  }\n}\n"],"mappings":"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","names":[]}

package/dist/QueryGrammar.d.mts

@@ -1,4 +1,4 @@
-export { b as QueryGrammar } from './Connection-Z5qLWvdu.mjs';
+export { b as QueryGrammar } from './Connection-DhP5VxCW.mjs';
 import './types-C_aDrXJN.mjs';
 import './Blueprint.mjs';
 import './SchemaGrammar.mjs';

package/dist/QueryGrammar.d.ts

@@ -1,4 +1,4 @@
-export { b as QueryGrammar } from './Connection-DBxWn3YO.js';
+export { b as QueryGrammar } from './Connection-CM5zdBeX.js';
 import './types-C_aDrXJN.js';
 import './Blueprint.js';
 import './SchemaGrammar.js';

package/dist/QueryGrammar.js

@@ -51,6 +51,25 @@ class QueryGrammar {
     }
     return { sql, bindings };
   }
+  compileCount(query) {
+    let sql = "";
+    let bindings = [];
+    for (const part of this.sqlParts) {
+      let parts = query.parts[part];
+      if (part === "select") {
+        parts = ["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;
+      }
+      bindings = [...bindings, ...r.bindings];
+    }
+    return { sql, bindings };
+  }
   compileSelect(selects) {
     const rc = selects.map((v) => {
       return v;

package/dist/QueryGrammar.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/QueryGrammar.ts"],"sourcesContent":["import { Query } from './Query';\nimport {\n  Parameter,\n  CompiledSql,\n  selectType,\n  whereNull,\n  whereOp,\n  whereType,\n  whereRaw,\n  havingType,\n  whereOpColumn,\n  joinType,\n} from './types';\n\nfunction toUpperFirst(str: string) {\n  return str.substring(0, 1).toUpperCase() + str.substring(1);\n}\nexport abstract class QueryGrammar {\n  sqlParts: string[] = [\n    'select',\n    'table',\n    'join',\n    'where',\n    'groupBy',\n    'having',\n    'orderBy',\n    'limit',\n    'offset',\n  ];\n\n  toSql(query: Query): CompiledSql {\n    let sql = '';\n    let bindings: Parameter[] = [];\n\n    for (const part of this.sqlParts) {\n      // @ts-ignore\n      const funcName: keyof this = 'compile' + toUpperFirst(part);\n      // @ts-ignore\n      const r = this[funcName](query.parts[part]);\n      if (!sql) {\n        sql = r.sql;\n      } else if (r.sql) {\n        sql += ' ' + r.sql;\n      }\n      bindings = [...bindings, ...r.bindings];\n    }\n    return { sql, bindings };\n  }\n\n  compileSelect(selects: selectType[]): CompiledSql {\n    const rc = selects\n      .map((v) => {\n        return v;\n      })\n      .join(', ');\n\n    return { sql: 'select ' + rc, bindings: [] };\n  }\n\n  compileTable(tableName: string): CompiledSql {\n    let rc = '';\n    if (tableName.length) {\n      rc = 'from ' + tableName;\n    }\n\n    return { sql: rc, bindings: [] };\n  }\n\n  compileJoin(joins: joinType[]): CompiledSql {\n    let sql = '';\n    let bindings: Parameter[] = [];\n\n    for (const j of joins) {\n      sql += ' ' + j.type + ' join ' + j.table + ' on ';\n\n      const where = this.compileWhere(j.conditions);\n      if (where.sql.startsWith('where ')) {\n        where.sql = where.sql.substring('where '.length);\n      }\n\n      sql += '(';\n      sql += where.sql;\n      sql += ')';\n\n      bindings = [...bindings, ...where.bindings];\n    }\n\n    return { sql, bindings };\n  }\n\n  compileWhere(wheres: whereType[]): CompiledSql {\n    let sql = '';\n    let bindings: Parameter[] = [];\n\n    for (const w of wheres) {\n      sql += ' ' + w.joinCondition + ' ';\n      if (w.negateCondition) {\n        sql += 'not ';\n      }\n      const funcName = 'compileWhere' + toUpperFirst(w.type);\n      // @ts-ignore\n      const wh = this[funcName](w);\n      sql += wh.sql;\n      bindings = [...bindings, ...wh.bindings];\n    }\n    if (sql.startsWith(' and ')) {\n      sql = 'where ' + sql.substring(' and '.length);\n    } else if (sql.startsWith(' or ')) {\n      sql = 'where ' + sql.substring(' or '.length);\n    }\n    return { sql, bindings };\n  }\n\n  compileWhereOperation(w: whereOp): CompiledSql {\n    return {\n      sql: `${w.column} ${w.operation} ${this.getVariablePlaceholder()}`,\n      bindings: [w.value],\n    };\n  }\n\n  compileWhereOperationColumn(w: whereOpColumn): CompiledSql {\n    return {\n      sql: `${w.column1} ${w.operation} ${w.column2}`,\n      bindings: [],\n    };\n  }\n\n  compileOrderBy(orderBy: string[]): CompiledSql {\n    let rc = '';\n    if (orderBy.length) {\n      rc = 'order by ' + orderBy.join(', ');\n    }\n\n    return { sql: rc, bindings: [] };\n  }\n\n  compileLimit(limit: number | null): CompiledSql {\n    let rc = '';\n    if (limit !== null) {\n      rc = 'limit ' + limit;\n    }\n\n    return { sql: rc, bindings: [] };\n  }\n\n  compileOffset(offset: number | null): CompiledSql {\n    let rc = '';\n    if (offset !== null) {\n      rc = 'offset ' + offset;\n    }\n\n    return { sql: rc, bindings: [] };\n  }\n\n  abstract getVariablePlaceholder(): string;\n\n  compileWhereNull(w: whereNull): CompiledSql {\n    return {\n      sql: `${w.column} is null`,\n      bindings: [],\n    };\n  }\n\n  compileInsert(query: Query, data: Record<string, Parameter>): CompiledSql {\n    let sql = 'insert into ' + query.parts.table + ' (';\n    const columns: string[] = [];\n    const bindings: Parameter[] = [];\n    const values: string[] = [];\n\n    for (const [k, v] of Object.entries(data)) {\n      columns.push(k);\n      bindings.push(v);\n      values.push(this.getVariablePlaceholder());\n    }\n\n    sql += columns.join(', ') + ') values (' + values + ')';\n\n    return { sql, bindings };\n  }\n\n  abstract compileInsertGetId(\n    query: Query,\n    data: Record<string, Parameter>,\n    options: { primaryKey: string[] }\n  ): CompiledSql;\n\n  compileUpdate(query: Query, data: Record<string, Parameter>): CompiledSql {\n    let sql = 'update ' + query.parts.table + ' set ';\n    const bindings: Parameter[] = [];\n\n    const setParts = [];\n    for (const [k, v] of Object.entries(data)) {\n      setParts.push(`${k} = ${this.getVariablePlaceholder()}`);\n      bindings.push(v);\n    }\n\n    sql += setParts.join(', ');\n\n    const where_csql = this.compileWhere(query.parts.where);\n    sql += ' ' + where_csql.sql;\n    bindings.push(...where_csql.bindings);\n\n    return { sql, bindings };\n  }\n\n  compileDelete(query: Query): CompiledSql {\n    let sql = 'delete from ' + query.parts.table;\n    const where_csql = this.compileWhere(query.parts.where);\n    sql += ' ' + where_csql.sql;\n    return { sql, bindings: where_csql.bindings };\n  }\n\n  compileUpsert(\n    query: Query,\n    data: Record<string, Parameter>,\n    conflictFields: string[],\n    updateFields: string[]\n  ): CompiledSql {\n    let sql = 'insert into ' + query.parts.table + ' (';\n    const columns: string[] = [];\n    const bindings: Parameter[] = [];\n    const values: string[] = [];\n\n    for (const [k, v] of Object.entries(data)) {\n      columns.push(k);\n      bindings.push(v);\n      values.push(this.getVariablePlaceholder());\n    }\n\n    sql += columns.join(', ') + ') values (' + values + ')';\n\n    sql += ' on conflict (' + conflictFields.join(', ') + ') do update set ';\n    const setParts = [];\n    for (const f of updateFields) {\n      setParts.push(`${f} = excluded.${f}`);\n    }\n    sql += setParts.join(', ');\n\n    const where_csql = this.compileWhere(query.parts.where);\n    sql += ' ' + where_csql.sql;\n    bindings.push(...where_csql.bindings);\n\n    return { sql, bindings };\n  }\n\n  compileGroupBy(groupBy: string[]): CompiledSql {\n    let rc = '';\n    if (groupBy.length) {\n      rc = 'group by ' + groupBy.join(', ');\n    }\n\n    return { sql: rc, bindings: [] };\n  }\n\n  compileHaving(having: havingType[]): CompiledSql {\n    let sql = '';\n    let bindings: Parameter[] = [];\n\n    for (const w of having) {\n      sql += ' ' + w.joinCondition + ' ';\n      if (w.negateCondition) {\n        sql += 'not ';\n      }\n      const funcName = 'compileHaving' + toUpperFirst(w.type);\n      // @ts-ignore\n      const wh = this[funcName](w);\n      sql += wh.sql;\n      bindings = [...bindings, ...wh.bindings];\n    }\n    if (sql.startsWith(' and ')) {\n      sql = 'having ' + sql.substring(' and '.length);\n    } else if (sql.startsWith(' or ')) {\n      sql = 'having ' + sql.substring(' or '.length);\n    }\n    return { sql, bindings };\n  }\n\n  compileHavingOperation(w: whereOp): CompiledSql {\n    return {\n      sql: `${w.column} ${w.operation} ${this.getVariablePlaceholder()}`,\n      bindings: [w.value],\n    };\n  }\n\n  compileHavingRaw(w: whereRaw): CompiledSql {\n    return {\n      sql: w.sql,\n      bindings: w.bindings,\n    };\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../src/QueryGrammar.ts"],"sourcesContent":["import { Query } from './Query';\nimport {\n  Parameter,\n  CompiledSql,\n  selectType,\n  whereNull,\n  whereOp,\n  whereType,\n  whereRaw,\n  havingType,\n  whereOpColumn,\n  joinType,\n} from './types';\n\nfunction toUpperFirst(str: string) {\n  return str.substring(0, 1).toUpperCase() + str.substring(1);\n}\nexport abstract class QueryGrammar {\n  sqlParts: string[] = [\n    'select',\n    'table',\n    'join',\n    'where',\n    'groupBy',\n    'having',\n    'orderBy',\n    'limit',\n    'offset',\n  ];\n\n  toSql(query: Query): CompiledSql {\n    let sql = '';\n    let bindings: Parameter[] = [];\n\n    for (const part of this.sqlParts) {\n      // @ts-ignore\n      const funcName: keyof this = 'compile' + toUpperFirst(part);\n      // @ts-ignore\n      const r = this[funcName](query.parts[part]);\n      if (!sql) {\n        sql = r.sql;\n      } else if (r.sql) {\n        sql += ' ' + r.sql;\n      }\n      bindings = [...bindings, ...r.bindings];\n    }\n    return { sql, bindings };\n  }\n\n  compileCount(query: Query): CompiledSql {\n    let sql = '';\n    let bindings: Parameter[] = [];\n\n    for (const part of this.sqlParts) {\n      // @ts-ignore\n      let parts = query.parts[part];\n      if (part === 'select') {\n        parts = ['count(*) as count'];\n      }\n      // @ts-ignore\n      const funcName: keyof this = 'compile' + toUpperFirst(part);\n      // @ts-ignore\n      const r = this[funcName](parts);\n      if (!sql) {\n        sql = r.sql;\n      } else if (r.sql) {\n        sql += ' ' + r.sql;\n      }\n      bindings = [...bindings, ...r.bindings];\n    }\n    return { sql, bindings };\n  }\n\n  compileSelect(selects: selectType[]): CompiledSql {\n    const rc = selects\n      .map((v) => {\n        return v;\n      })\n      .join(', ');\n\n    return { sql: 'select ' + rc, bindings: [] };\n  }\n\n  compileTable(tableName: string): CompiledSql {\n    let rc = '';\n    if (tableName.length) {\n      rc = 'from ' + tableName;\n    }\n\n    return { sql: rc, bindings: [] };\n  }\n\n  compileJoin(joins: joinType[]): CompiledSql {\n    let sql = '';\n    let bindings: Parameter[] = [];\n\n    for (const j of joins) {\n      sql += ' ' + j.type + ' join ' + j.table + ' on ';\n\n      const where = this.compileWhere(j.conditions);\n      if (where.sql.startsWith('where ')) {\n        where.sql = where.sql.substring('where '.length);\n      }\n\n      sql += '(';\n      sql += where.sql;\n      sql += ')';\n\n      bindings = [...bindings, ...where.bindings];\n    }\n\n    return { sql, bindings };\n  }\n\n  compileWhere(wheres: whereType[]): CompiledSql {\n    let sql = '';\n    let bindings: Parameter[] = [];\n\n    for (const w of wheres) {\n      sql += ' ' + w.joinCondition + ' ';\n      if (w.negateCondition) {\n        sql += 'not ';\n      }\n      const funcName = 'compileWhere' + toUpperFirst(w.type);\n      // @ts-ignore\n      const wh = this[funcName](w);\n      sql += wh.sql;\n      bindings = [...bindings, ...wh.bindings];\n    }\n    if (sql.startsWith(' and ')) {\n      sql = 'where ' + sql.substring(' and '.length);\n    } else if (sql.startsWith(' or ')) {\n      sql = 'where ' + sql.substring(' or '.length);\n    }\n    return { sql, bindings };\n  }\n\n  compileWhereOperation(w: whereOp): CompiledSql {\n    return {\n      sql: `${w.column} ${w.operation} ${this.getVariablePlaceholder()}`,\n      bindings: [w.value],\n    };\n  }\n\n  compileWhereOperationColumn(w: whereOpColumn): CompiledSql {\n    return {\n      sql: `${w.column1} ${w.operation} ${w.column2}`,\n      bindings: [],\n    };\n  }\n\n  compileOrderBy(orderBy: string[]): CompiledSql {\n    let rc = '';\n    if (orderBy.length) {\n      rc = 'order by ' + orderBy.join(', ');\n    }\n\n    return { sql: rc, bindings: [] };\n  }\n\n  compileLimit(limit: number | null): CompiledSql {\n    let rc = '';\n    if (limit !== null) {\n      rc = 'limit ' + limit;\n    }\n\n    return { sql: rc, bindings: [] };\n  }\n\n  compileOffset(offset: number | null): CompiledSql {\n    let rc = '';\n    if (offset !== null) {\n      rc = 'offset ' + offset;\n    }\n\n    return { sql: rc, bindings: [] };\n  }\n\n  abstract getVariablePlaceholder(): string;\n\n  compileWhereNull(w: whereNull): CompiledSql {\n    return {\n      sql: `${w.column} is null`,\n      bindings: [],\n    };\n  }\n\n  compileInsert(query: Query, data: Record<string, Parameter>): CompiledSql {\n    let sql = 'insert into ' + query.parts.table + ' (';\n    const columns: string[] = [];\n    const bindings: Parameter[] = [];\n    const values: string[] = [];\n\n    for (const [k, v] of Object.entries(data)) {\n      columns.push(k);\n      bindings.push(v);\n      values.push(this.getVariablePlaceholder());\n    }\n\n    sql += columns.join(', ') + ') values (' + values + ')';\n\n    return { sql, bindings };\n  }\n\n  abstract compileInsertGetId(\n    query: Query,\n    data: Record<string, Parameter>,\n    options: { primaryKey: string[] }\n  ): CompiledSql;\n\n  compileUpdate(query: Query, data: Record<string, Parameter>): CompiledSql {\n    let sql = 'update ' + query.parts.table + ' set ';\n    const bindings: Parameter[] = [];\n\n    const setParts = [];\n    for (const [k, v] of Object.entries(data)) {\n      setParts.push(`${k} = ${this.getVariablePlaceholder()}`);\n      bindings.push(v);\n    }\n\n    sql += setParts.join(', ');\n\n    const where_csql = this.compileWhere(query.parts.where);\n    sql += ' ' + where_csql.sql;\n    bindings.push(...where_csql.bindings);\n\n    return { sql, bindings };\n  }\n\n  compileDelete(query: Query): CompiledSql {\n    let sql = 'delete from ' + query.parts.table;\n    const where_csql = this.compileWhere(query.parts.where);\n    sql += ' ' + where_csql.sql;\n    return { sql, bindings: where_csql.bindings };\n  }\n\n  compileUpsert(\n    query: Query,\n    data: Record<string, Parameter>,\n    conflictFields: string[],\n    updateFields: string[]\n  ): CompiledSql {\n    let sql = 'insert into ' + query.parts.table + ' (';\n    const columns: string[] = [];\n    const bindings: Parameter[] = [];\n    const values: string[] = [];\n\n    for (const [k, v] of Object.entries(data)) {\n      columns.push(k);\n      bindings.push(v);\n      values.push(this.getVariablePlaceholder());\n    }\n\n    sql += columns.join(', ') + ') values (' + values + ')';\n\n    sql += ' on conflict (' + conflictFields.join(', ') + ') do update set ';\n    const setParts = [];\n    for (const f of updateFields) {\n      setParts.push(`${f} = excluded.${f}`);\n    }\n    sql += setParts.join(', ');\n\n    const where_csql = this.compileWhere(query.parts.where);\n    sql += ' ' + where_csql.sql;\n    bindings.push(...where_csql.bindings);\n\n    return { sql, bindings };\n  }\n\n  compileGroupBy(groupBy: string[]): CompiledSql {\n    let rc = '';\n    if (groupBy.length) {\n      rc = 'group by ' + groupBy.join(', ');\n    }\n\n    return { sql: rc, bindings: [] };\n  }\n\n  compileHaving(having: havingType[]): CompiledSql {\n    let sql = '';\n    let bindings: Parameter[] = [];\n\n    for (const w of having) {\n      sql += ' ' + w.joinCondition + ' ';\n      if (w.negateCondition) {\n        sql += 'not ';\n      }\n      const funcName = 'compileHaving' + toUpperFirst(w.type);\n      // @ts-ignore\n      const wh = this[funcName](w);\n      sql += wh.sql;\n      bindings = [...bindings, ...wh.bindings];\n    }\n    if (sql.startsWith(' and ')) {\n      sql = 'having ' + sql.substring(' and '.length);\n    } else if (sql.startsWith(' or ')) {\n      sql = 'having ' + sql.substring(' or '.length);\n    }\n    return { sql, bindings };\n  }\n\n  compileHavingOperation(w: whereOp): CompiledSql {\n    return {\n      sql: `${w.column} ${w.operation} ${this.getVariablePlaceholder()}`,\n      bindings: [w.value],\n    };\n  }\n\n  compileHavingRaw(w: whereRaw): CompiledSql {\n    return {\n      sql: w.sql,\n      bindings: w.bindings,\n    };\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAcA,SAAS,aAAa,KAAa;AACjC,SAAO,IAAI,UAAU,GAAG,CAAC,EAAE,YAAY,IAAI,IAAI,UAAU,CAAC;AAC5D;AACO,MAAe,aAAa;AAAA,EACjC,WAAqB;AAAA,IACnB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAAA,EAEA,MAAM,OAA2B;AAC/B,QAAI,MAAM;AACV,QAAI,WAAwB,CAAC;AAE7B,eAAW,QAAQ,KAAK,UAAU;AAEhC,YAAM,WAAuB,YAAY,aAAa,IAAI;AAE1D,YAAM,IAAI,KAAK,QAAQ,EAAE,MAAM,MAAM,IAAI,CAAC;AAC1C,UAAI,CAAC,KAAK;AACR,cAAM,EAAE;AAAA,MACV,WAAW,EAAE,KAAK;AAChB,eAAO,MAAM,EAAE;AAAA,MACjB;AACA,iBAAW,CAAC,GAAG,UAAU,GAAG,EAAE,QAAQ;AAAA,IACxC;AACA,WAAO,EAAE,KAAK,SAAS;AAAA,EACzB;AAAA,EAEA,aAAa,OAA2B;AACtC,QAAI,MAAM;AACV,QAAI,WAAwB,CAAC;AAE7B,eAAW,QAAQ,KAAK,UAAU;AAEhC,UAAI,QAAQ,MAAM,MAAM,IAAI;AAC5B,UAAI,SAAS,UAAU;AACrB,gBAAQ,CAAC,mBAAmB;AAAA,MAC9B;AAEA,YAAM,WAAuB,YAAY,aAAa,IAAI;AAE1D,YAAM,IAAI,KAAK,QAAQ,EAAE,KAAK;AAC9B,UAAI,CAAC,KAAK;AACR,cAAM,EAAE;AAAA,MACV,WAAW,EAAE,KAAK;AAChB,eAAO,MAAM,EAAE;AAAA,MACjB;AACA,iBAAW,CAAC,GAAG,UAAU,GAAG,EAAE,QAAQ;AAAA,IACxC;AACA,WAAO,EAAE,KAAK,SAAS;AAAA,EACzB;AAAA,EAEA,cAAc,SAAoC;AAChD,UAAM,KAAK,QACR,IAAI,CAAC,MAAM;AACV,aAAO;AAAA,IACT,CAAC,EACA,KAAK,IAAI;AAEZ,WAAO,EAAE,KAAK,YAAY,IAAI,UAAU,CAAC,EAAE;AAAA,EAC7C;AAAA,EAEA,aAAa,WAAgC;AAC3C,QAAI,KAAK;AACT,QAAI,UAAU,QAAQ;AACpB,WAAK,UAAU;AAAA,IACjB;AAEA,WAAO,EAAE,KAAK,IAAI,UAAU,CAAC,EAAE;AAAA,EACjC;AAAA,EAEA,YAAY,OAAgC;AAC1C,QAAI,MAAM;AACV,QAAI,WAAwB,CAAC;AAE7B,eAAW,KAAK,OAAO;AACrB,aAAO,MAAM,EAAE,OAAO,WAAW,EAAE,QAAQ;AAE3C,YAAM,QAAQ,KAAK,aAAa,EAAE,UAAU;AAC5C,UAAI,MAAM,IAAI,WAAW,QAAQ,GAAG;AAClC,cAAM,MAAM,MAAM,IAAI,UAAU,SAAS,MAAM;AAAA,MACjD;AAEA,aAAO;AACP,aAAO,MAAM;AACb,aAAO;AAEP,iBAAW,CAAC,GAAG,UAAU,GAAG,MAAM,QAAQ;AAAA,IAC5C;AAEA,WAAO,EAAE,KAAK,SAAS;AAAA,EACzB;AAAA,EAEA,aAAa,QAAkC;AAC7C,QAAI,MAAM;AACV,QAAI,WAAwB,CAAC;AAE7B,eAAW,KAAK,QAAQ;AACtB,aAAO,MAAM,EAAE,gBAAgB;AAC/B,UAAI,EAAE,iBAAiB;AACrB,eAAO;AAAA,MACT;AACA,YAAM,WAAW,iBAAiB,aAAa,EAAE,IAAI;AAErD,YAAM,KAAK,KAAK,QAAQ,EAAE,CAAC;AAC3B,aAAO,GAAG;AACV,iBAAW,CAAC,GAAG,UAAU,GAAG,GAAG,QAAQ;AAAA,IACzC;AACA,QAAI,IAAI,WAAW,OAAO,GAAG;AAC3B,YAAM,WAAW,IAAI,UAAU,QAAQ,MAAM;AAAA,IAC/C,WAAW,IAAI,WAAW,MAAM,GAAG;AACjC,YAAM,WAAW,IAAI,UAAU,OAAO,MAAM;AAAA,IAC9C;AACA,WAAO,EAAE,KAAK,SAAS;AAAA,EACzB;AAAA,EAEA,sBAAsB,GAAyB;AAC7C,WAAO;AAAA,MACL,KAAK,GAAG,EAAE,MAAM,IAAI,EAAE,SAAS,IAAI,KAAK,uBAAuB,CAAC;AAAA,MAChE,UAAU,CAAC,EAAE,KAAK;AAAA,IACpB;AAAA,EACF;AAAA,EAEA,4BAA4B,GAA+B;AACzD,WAAO;AAAA,MACL,KAAK,GAAG,EAAE,OAAO,IAAI,EAAE,SAAS,IAAI,EAAE,OAAO;AAAA,MAC7C,UAAU,CAAC;AAAA,IACb;AAAA,EACF;AAAA,EAEA,eAAe,SAAgC;AAC7C,QAAI,KAAK;AACT,QAAI,QAAQ,QAAQ;AAClB,WAAK,cAAc,QAAQ,KAAK,IAAI;AAAA,IACtC;AAEA,WAAO,EAAE,KAAK,IAAI,UAAU,CAAC,EAAE;AAAA,EACjC;AAAA,EAEA,aAAa,OAAmC;AAC9C,QAAI,KAAK;AACT,QAAI,UAAU,MAAM;AAClB,WAAK,WAAW;AAAA,IAClB;AAEA,WAAO,EAAE,KAAK,IAAI,UAAU,CAAC,EAAE;AAAA,EACjC;AAAA,EAEA,cAAc,QAAoC;AAChD,QAAI,KAAK;AACT,QAAI,WAAW,MAAM;AACnB,WAAK,YAAY;AAAA,IACnB;AAEA,WAAO,EAAE,KAAK,IAAI,UAAU,CAAC,EAAE;AAAA,EACjC;AAAA,EAIA,iBAAiB,GAA2B;AAC1C,WAAO;AAAA,MACL,KAAK,GAAG,EAAE,MAAM;AAAA,MAChB,UAAU,CAAC;AAAA,IACb;AAAA,EACF;AAAA,EAEA,cAAc,OAAc,MAA8C;AACxE,QAAI,MAAM,iBAAiB,MAAM,MAAM,QAAQ;AAC/C,UAAM,UAAoB,CAAC;AAC3B,UAAM,WAAwB,CAAC;AAC/B,UAAM,SAAmB,CAAC;AAE1B,eAAW,CAAC,GAAG,CAAC,KAAK,OAAO,QAAQ,IAAI,GAAG;AACzC,cAAQ,KAAK,CAAC;AACd,eAAS,KAAK,CAAC;AACf,aAAO,KAAK,KAAK,uBAAuB,CAAC;AAAA,IAC3C;AAEA,WAAO,QAAQ,KAAK,IAAI,IAAI,eAAe,SAAS;AAEpD,WAAO,EAAE,KAAK,SAAS;AAAA,EACzB;AAAA,EAQA,cAAc,OAAc,MAA8C;AACxE,QAAI,MAAM,YAAY,MAAM,MAAM,QAAQ;AAC1C,UAAM,WAAwB,CAAC;AAE/B,UAAM,WAAW,CAAC;AAClB,eAAW,CAAC,GAAG,CAAC,KAAK,OAAO,QAAQ,IAAI,GAAG;AACzC,eAAS,KAAK,GAAG,CAAC,MAAM,KAAK,uBAAuB,CAAC,EAAE;AACvD,eAAS,KAAK,CAAC;AAAA,IACjB;AAEA,WAAO,SAAS,KAAK,IAAI;AAEzB,UAAM,aAAa,KAAK,aAAa,MAAM,MAAM,KAAK;AACtD,WAAO,MAAM,WAAW;AACxB,aAAS,KAAK,GAAG,WAAW,QAAQ;AAEpC,WAAO,EAAE,KAAK,SAAS;AAAA,EACzB;AAAA,EAEA,cAAc,OAA2B;AACvC,QAAI,MAAM,iBAAiB,MAAM,MAAM;AACvC,UAAM,aAAa,KAAK,aAAa,MAAM,MAAM,KAAK;AACtD,WAAO,MAAM,WAAW;AACxB,WAAO,EAAE,KAAK,UAAU,WAAW,SAAS;AAAA,EAC9C;AAAA,EAEA,cACE,OACA,MACA,gBACA,cACa;AACb,QAAI,MAAM,iBAAiB,MAAM,MAAM,QAAQ;AAC/C,UAAM,UAAoB,CAAC;AAC3B,UAAM,WAAwB,CAAC;AAC/B,UAAM,SAAmB,CAAC;AAE1B,eAAW,CAAC,GAAG,CAAC,KAAK,OAAO,QAAQ,IAAI,GAAG;AACzC,cAAQ,KAAK,CAAC;AACd,eAAS,KAAK,CAAC;AACf,aAAO,KAAK,KAAK,uBAAuB,CAAC;AAAA,IAC3C;AAEA,WAAO,QAAQ,KAAK,IAAI,IAAI,eAAe,SAAS;AAEpD,WAAO,mBAAmB,eAAe,KAAK,IAAI,IAAI;AACtD,UAAM,WAAW,CAAC;AAClB,eAAW,KAAK,cAAc;AAC5B,eAAS,KAAK,GAAG,CAAC,eAAe,CAAC,EAAE;AAAA,IACtC;AACA,WAAO,SAAS,KAAK,IAAI;AAEzB,UAAM,aAAa,KAAK,aAAa,MAAM,MAAM,KAAK;AACtD,WAAO,MAAM,WAAW;AACxB,aAAS,KAAK,GAAG,WAAW,QAAQ;AAEpC,WAAO,EAAE,KAAK,SAAS;AAAA,EACzB;AAAA,EAEA,eAAe,SAAgC;AAC7C,QAAI,KAAK;AACT,QAAI,QAAQ,QAAQ;AAClB,WAAK,cAAc,QAAQ,KAAK,IAAI;AAAA,IACtC;AAEA,WAAO,EAAE,KAAK,IAAI,UAAU,CAAC,EAAE;AAAA,EACjC;AAAA,EAEA,cAAc,QAAmC;AAC/C,QAAI,MAAM;AACV,QAAI,WAAwB,CAAC;AAE7B,eAAW,KAAK,QAAQ;AACtB,aAAO,MAAM,EAAE,gBAAgB;AAC/B,UAAI,EAAE,iBAAiB;AACrB,eAAO;AAAA,MACT;AACA,YAAM,WAAW,kBAAkB,aAAa,EAAE,IAAI;AAEtD,YAAM,KAAK,KAAK,QAAQ,EAAE,CAAC;AAC3B,aAAO,GAAG;AACV,iBAAW,CAAC,GAAG,UAAU,GAAG,GAAG,QAAQ;AAAA,IACzC;AACA,QAAI,IAAI,WAAW,OAAO,GAAG;AAC3B,YAAM,YAAY,IAAI,UAAU,QAAQ,MAAM;AAAA,IAChD,WAAW,IAAI,WAAW,MAAM,GAAG;AACjC,YAAM,YAAY,IAAI,UAAU,OAAO,MAAM;AAAA,IAC/C;AACA,WAAO,EAAE,KAAK,SAAS;AAAA,EACzB;AAAA,EAEA,uBAAuB,GAAyB;AAC9C,WAAO;AAAA,MACL,KAAK,GAAG,EAAE,MAAM,IAAI,EAAE,SAAS,IAAI,KAAK,uBAAuB,CAAC;AAAA,MAChE,UAAU,CAAC,EAAE,KAAK;AAAA,IACpB;AAAA,EACF;AAAA,EAEA,iBAAiB,GAA0B;AACzC,WAAO;AAAA,MACL,KAAK,EAAE;AAAA,MACP,UAAU,EAAE;AAAA,IACd;AAAA,EACF;AACF;","names":[]}

package/dist/QueryGrammar.mjs

@@ -28,6 +28,25 @@ class QueryGrammar {
     }
     return { sql, bindings };
   }
+  compileCount(query) {
+    let sql = "";
+    let bindings = [];
+    for (const part of this.sqlParts) {
+      let parts = query.parts[part];
+      if (part === "select") {
+        parts = ["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;
+      }
+      bindings = [...bindings, ...r.bindings];
+    }
+    return { sql, bindings };
+  }
   compileSelect(selects) {
     const rc = selects.map((v) => {
       return v;

package/dist/QueryGrammar.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/QueryGrammar.ts"],"sourcesContent":["import { Query } from './Query';\nimport {\n  Parameter,\n  CompiledSql,\n  selectType,\n  whereNull,\n  whereOp,\n  whereType,\n  whereRaw,\n  havingType,\n  whereOpColumn,\n  joinType,\n} from './types';\n\nfunction toUpperFirst(str: string) {\n  return str.substring(0, 1).toUpperCase() + str.substring(1);\n}\nexport abstract class QueryGrammar {\n  sqlParts: string[] = [\n    'select',\n    'table',\n    'join',\n    'where',\n    'groupBy',\n    'having',\n    'orderBy',\n    'limit',\n    'offset',\n  ];\n\n  toSql(query: Query): CompiledSql {\n    let sql = '';\n    let bindings: Parameter[] = [];\n\n    for (const part of this.sqlParts) {\n      // @ts-ignore\n      const funcName: keyof this = 'compile' + toUpperFirst(part);\n      // @ts-ignore\n      const r = this[funcName](query.parts[part]);\n      if (!sql) {\n        sql = r.sql;\n      } else if (r.sql) {\n        sql += ' ' + r.sql;\n      }\n      bindings = [...bindings, ...r.bindings];\n    }\n    return { sql, bindings };\n  }\n\n  compileSelect(selects: selectType[]): CompiledSql {\n    const rc = selects\n      .map((v) => {\n        return v;\n      })\n      .join(', ');\n\n    return { sql: 'select ' + rc, bindings: [] };\n  }\n\n  compileTable(tableName: string): CompiledSql {\n    let rc = '';\n    if (tableName.length) {\n      rc = 'from ' + tableName;\n    }\n\n    return { sql: rc, bindings: [] };\n  }\n\n  compileJoin(joins: joinType[]): CompiledSql {\n    let sql = '';\n    let bindings: Parameter[] = [];\n\n    for (const j of joins) {\n      sql += ' ' + j.type + ' join ' + j.table + ' on ';\n\n      const where = this.compileWhere(j.conditions);\n      if (where.sql.startsWith('where ')) {\n        where.sql = where.sql.substring('where '.length);\n      }\n\n      sql += '(';\n      sql += where.sql;\n      sql += ')';\n\n      bindings = [...bindings, ...where.bindings];\n    }\n\n    return { sql, bindings };\n  }\n\n  compileWhere(wheres: whereType[]): CompiledSql {\n    let sql = '';\n    let bindings: Parameter[] = [];\n\n    for (const w of wheres) {\n      sql += ' ' + w.joinCondition + ' ';\n      if (w.negateCondition) {\n        sql += 'not ';\n      }\n      const funcName = 'compileWhere' + toUpperFirst(w.type);\n      // @ts-ignore\n      const wh = this[funcName](w);\n      sql += wh.sql;\n      bindings = [...bindings, ...wh.bindings];\n    }\n    if (sql.startsWith(' and ')) {\n      sql = 'where ' + sql.substring(' and '.length);\n    } else if (sql.startsWith(' or ')) {\n      sql = 'where ' + sql.substring(' or '.length);\n    }\n    return { sql, bindings };\n  }\n\n  compileWhereOperation(w: whereOp): CompiledSql {\n    return {\n      sql: `${w.column} ${w.operation} ${this.getVariablePlaceholder()}`,\n      bindings: [w.value],\n    };\n  }\n\n  compileWhereOperationColumn(w: whereOpColumn): CompiledSql {\n    return {\n      sql: `${w.column1} ${w.operation} ${w.column2}`,\n      bindings: [],\n    };\n  }\n\n  compileOrderBy(orderBy: string[]): CompiledSql {\n    let rc = '';\n    if (orderBy.length) {\n      rc = 'order by ' + orderBy.join(', ');\n    }\n\n    return { sql: rc, bindings: [] };\n  }\n\n  compileLimit(limit: number | null): CompiledSql {\n    let rc = '';\n    if (limit !== null) {\n      rc = 'limit ' + limit;\n    }\n\n    return { sql: rc, bindings: [] };\n  }\n\n  compileOffset(offset: number | null): CompiledSql {\n    let rc = '';\n    if (offset !== null) {\n      rc = 'offset ' + offset;\n    }\n\n    return { sql: rc, bindings: [] };\n  }\n\n  abstract getVariablePlaceholder(): string;\n\n  compileWhereNull(w: whereNull): CompiledSql {\n    return {\n      sql: `${w.column} is null`,\n      bindings: [],\n    };\n  }\n\n  compileInsert(query: Query, data: Record<string, Parameter>): CompiledSql {\n    let sql = 'insert into ' + query.parts.table + ' (';\n    const columns: string[] = [];\n    const bindings: Parameter[] = [];\n    const values: string[] = [];\n\n    for (const [k, v] of Object.entries(data)) {\n      columns.push(k);\n      bindings.push(v);\n      values.push(this.getVariablePlaceholder());\n    }\n\n    sql += columns.join(', ') + ') values (' + values + ')';\n\n    return { sql, bindings };\n  }\n\n  abstract compileInsertGetId(\n    query: Query,\n    data: Record<string, Parameter>,\n    options: { primaryKey: string[] }\n  ): CompiledSql;\n\n  compileUpdate(query: Query, data: Record<string, Parameter>): CompiledSql {\n    let sql = 'update ' + query.parts.table + ' set ';\n    const bindings: Parameter[] = [];\n\n    const setParts = [];\n    for (const [k, v] of Object.entries(data)) {\n      setParts.push(`${k} = ${this.getVariablePlaceholder()}`);\n      bindings.push(v);\n    }\n\n    sql += setParts.join(', ');\n\n    const where_csql = this.compileWhere(query.parts.where);\n    sql += ' ' + where_csql.sql;\n    bindings.push(...where_csql.bindings);\n\n    return { sql, bindings };\n  }\n\n  compileDelete(query: Query): CompiledSql {\n    let sql = 'delete from ' + query.parts.table;\n    const where_csql = this.compileWhere(query.parts.where);\n    sql += ' ' + where_csql.sql;\n    return { sql, bindings: where_csql.bindings };\n  }\n\n  compileUpsert(\n    query: Query,\n    data: Record<string, Parameter>,\n    conflictFields: string[],\n    updateFields: string[]\n  ): CompiledSql {\n    let sql = 'insert into ' + query.parts.table + ' (';\n    const columns: string[] = [];\n    const bindings: Parameter[] = [];\n    const values: string[] = [];\n\n    for (const [k, v] of Object.entries(data)) {\n      columns.push(k);\n      bindings.push(v);\n      values.push(this.getVariablePlaceholder());\n    }\n\n    sql += columns.join(', ') + ') values (' + values + ')';\n\n    sql += ' on conflict (' + conflictFields.join(', ') + ') do update set ';\n    const setParts = [];\n    for (const f of updateFields) {\n      setParts.push(`${f} = excluded.${f}`);\n    }\n    sql += setParts.join(', ');\n\n    const where_csql = this.compileWhere(query.parts.where);\n    sql += ' ' + where_csql.sql;\n    bindings.push(...where_csql.bindings);\n\n    return { sql, bindings };\n  }\n\n  compileGroupBy(groupBy: string[]): CompiledSql {\n    let rc = '';\n    if (groupBy.length) {\n      rc = 'group by ' + groupBy.join(', ');\n    }\n\n    return { sql: rc, bindings: [] };\n  }\n\n  compileHaving(having: havingType[]): CompiledSql {\n    let sql = '';\n    let bindings: Parameter[] = [];\n\n    for (const w of having) {\n      sql += ' ' + w.joinCondition + ' ';\n      if (w.negateCondition) {\n        sql += 'not ';\n      }\n      const funcName = 'compileHaving' + toUpperFirst(w.type);\n      // @ts-ignore\n      const wh = this[funcName](w);\n      sql += wh.sql;\n      bindings = [...bindings, ...wh.bindings];\n    }\n    if (sql.startsWith(' and ')) {\n      sql = 'having ' + sql.substring(' and '.length);\n    } else if (sql.startsWith(' or ')) {\n      sql = 'having ' + sql.substring(' or '.length);\n    }\n    return { sql, bindings };\n  }\n\n  compileHavingOperation(w: whereOp): CompiledSql {\n    return {\n      sql: `${w.column} ${w.operation} ${this.getVariablePlaceholder()}`,\n      bindings: [w.value],\n    };\n  }\n\n  compileHavingRaw(w: whereRaw): CompiledSql {\n    return {\n      sql: w.sql,\n      bindings: w.bindings,\n    };\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../src/QueryGrammar.ts"],"sourcesContent":["import { Query } from './Query';\nimport {\n  Parameter,\n  CompiledSql,\n  selectType,\n  whereNull,\n  whereOp,\n  whereType,\n  whereRaw,\n  havingType,\n  whereOpColumn,\n  joinType,\n} from './types';\n\nfunction toUpperFirst(str: string) {\n  return str.substring(0, 1).toUpperCase() + str.substring(1);\n}\nexport abstract class QueryGrammar {\n  sqlParts: string[] = [\n    'select',\n    'table',\n    'join',\n    'where',\n    'groupBy',\n    'having',\n    'orderBy',\n    'limit',\n    'offset',\n  ];\n\n  toSql(query: Query): CompiledSql {\n    let sql = '';\n    let bindings: Parameter[] = [];\n\n    for (const part of this.sqlParts) {\n      // @ts-ignore\n      const funcName: keyof this = 'compile' + toUpperFirst(part);\n      // @ts-ignore\n      const r = this[funcName](query.parts[part]);\n      if (!sql) {\n        sql = r.sql;\n      } else if (r.sql) {\n        sql += ' ' + r.sql;\n      }\n      bindings = [...bindings, ...r.bindings];\n    }\n    return { sql, bindings };\n  }\n\n  compileCount(query: Query): CompiledSql {\n    let sql = '';\n    let bindings: Parameter[] = [];\n\n    for (const part of this.sqlParts) {\n      // @ts-ignore\n      let parts = query.parts[part];\n      if (part === 'select') {\n        parts = ['count(*) as count'];\n      }\n      // @ts-ignore\n      const funcName: keyof this = 'compile' + toUpperFirst(part);\n      // @ts-ignore\n      const r = this[funcName](parts);\n      if (!sql) {\n        sql = r.sql;\n      } else if (r.sql) {\n        sql += ' ' + r.sql;\n      }\n      bindings = [...bindings, ...r.bindings];\n    }\n    return { sql, bindings };\n  }\n\n  compileSelect(selects: selectType[]): CompiledSql {\n    const rc = selects\n      .map((v) => {\n        return v;\n      })\n      .join(', ');\n\n    return { sql: 'select ' + rc, bindings: [] };\n  }\n\n  compileTable(tableName: string): CompiledSql {\n    let rc = '';\n    if (tableName.length) {\n      rc = 'from ' + tableName;\n    }\n\n    return { sql: rc, bindings: [] };\n  }\n\n  compileJoin(joins: joinType[]): CompiledSql {\n    let sql = '';\n    let bindings: Parameter[] = [];\n\n    for (const j of joins) {\n      sql += ' ' + j.type + ' join ' + j.table + ' on ';\n\n      const where = this.compileWhere(j.conditions);\n      if (where.sql.startsWith('where ')) {\n        where.sql = where.sql.substring('where '.length);\n      }\n\n      sql += '(';\n      sql += where.sql;\n      sql += ')';\n\n      bindings = [...bindings, ...where.bindings];\n    }\n\n    return { sql, bindings };\n  }\n\n  compileWhere(wheres: whereType[]): CompiledSql {\n    let sql = '';\n    let bindings: Parameter[] = [];\n\n    for (const w of wheres) {\n      sql += ' ' + w.joinCondition + ' ';\n      if (w.negateCondition) {\n        sql += 'not ';\n      }\n      const funcName = 'compileWhere' + toUpperFirst(w.type);\n      // @ts-ignore\n      const wh = this[funcName](w);\n      sql += wh.sql;\n      bindings = [...bindings, ...wh.bindings];\n    }\n    if (sql.startsWith(' and ')) {\n      sql = 'where ' + sql.substring(' and '.length);\n    } else if (sql.startsWith(' or ')) {\n      sql = 'where ' + sql.substring(' or '.length);\n    }\n    return { sql, bindings };\n  }\n\n  compileWhereOperation(w: whereOp): CompiledSql {\n    return {\n      sql: `${w.column} ${w.operation} ${this.getVariablePlaceholder()}`,\n      bindings: [w.value],\n    };\n  }\n\n  compileWhereOperationColumn(w: whereOpColumn): CompiledSql {\n    return {\n      sql: `${w.column1} ${w.operation} ${w.column2}`,\n      bindings: [],\n    };\n  }\n\n  compileOrderBy(orderBy: string[]): CompiledSql {\n    let rc = '';\n    if (orderBy.length) {\n      rc = 'order by ' + orderBy.join(', ');\n    }\n\n    return { sql: rc, bindings: [] };\n  }\n\n  compileLimit(limit: number | null): CompiledSql {\n    let rc = '';\n    if (limit !== null) {\n      rc = 'limit ' + limit;\n    }\n\n    return { sql: rc, bindings: [] };\n  }\n\n  compileOffset(offset: number | null): CompiledSql {\n    let rc = '';\n    if (offset !== null) {\n      rc = 'offset ' + offset;\n    }\n\n    return { sql: rc, bindings: [] };\n  }\n\n  abstract getVariablePlaceholder(): string;\n\n  compileWhereNull(w: whereNull): CompiledSql {\n    return {\n      sql: `${w.column} is null`,\n      bindings: [],\n    };\n  }\n\n  compileInsert(query: Query, data: Record<string, Parameter>): CompiledSql {\n    let sql = 'insert into ' + query.parts.table + ' (';\n    const columns: string[] = [];\n    const bindings: Parameter[] = [];\n    const values: string[] = [];\n\n    for (const [k, v] of Object.entries(data)) {\n      columns.push(k);\n      bindings.push(v);\n      values.push(this.getVariablePlaceholder());\n    }\n\n    sql += columns.join(', ') + ') values (' + values + ')';\n\n    return { sql, bindings };\n  }\n\n  abstract compileInsertGetId(\n    query: Query,\n    data: Record<string, Parameter>,\n    options: { primaryKey: string[] }\n  ): CompiledSql;\n\n  compileUpdate(query: Query, data: Record<string, Parameter>): CompiledSql {\n    let sql = 'update ' + query.parts.table + ' set ';\n    const bindings: Parameter[] = [];\n\n    const setParts = [];\n    for (const [k, v] of Object.entries(data)) {\n      setParts.push(`${k} = ${this.getVariablePlaceholder()}`);\n      bindings.push(v);\n    }\n\n    sql += setParts.join(', ');\n\n    const where_csql = this.compileWhere(query.parts.where);\n    sql += ' ' + where_csql.sql;\n    bindings.push(...where_csql.bindings);\n\n    return { sql, bindings };\n  }\n\n  compileDelete(query: Query): CompiledSql {\n    let sql = 'delete from ' + query.parts.table;\n    const where_csql = this.compileWhere(query.parts.where);\n    sql += ' ' + where_csql.sql;\n    return { sql, bindings: where_csql.bindings };\n  }\n\n  compileUpsert(\n    query: Query,\n    data: Record<string, Parameter>,\n    conflictFields: string[],\n    updateFields: string[]\n  ): CompiledSql {\n    let sql = 'insert into ' + query.parts.table + ' (';\n    const columns: string[] = [];\n    const bindings: Parameter[] = [];\n    const values: string[] = [];\n\n    for (const [k, v] of Object.entries(data)) {\n      columns.push(k);\n      bindings.push(v);\n      values.push(this.getVariablePlaceholder());\n    }\n\n    sql += columns.join(', ') + ') values (' + values + ')';\n\n    sql += ' on conflict (' + conflictFields.join(', ') + ') do update set ';\n    const setParts = [];\n    for (const f of updateFields) {\n      setParts.push(`${f} = excluded.${f}`);\n    }\n    sql += setParts.join(', ');\n\n    const where_csql = this.compileWhere(query.parts.where);\n    sql += ' ' + where_csql.sql;\n    bindings.push(...where_csql.bindings);\n\n    return { sql, bindings };\n  }\n\n  compileGroupBy(groupBy: string[]): CompiledSql {\n    let rc = '';\n    if (groupBy.length) {\n      rc = 'group by ' + groupBy.join(', ');\n    }\n\n    return { sql: rc, bindings: [] };\n  }\n\n  compileHaving(having: havingType[]): CompiledSql {\n    let sql = '';\n    let bindings: Parameter[] = [];\n\n    for (const w of having) {\n      sql += ' ' + w.joinCondition + ' ';\n      if (w.negateCondition) {\n        sql += 'not ';\n      }\n      const funcName = 'compileHaving' + toUpperFirst(w.type);\n      // @ts-ignore\n      const wh = this[funcName](w);\n      sql += wh.sql;\n      bindings = [...bindings, ...wh.bindings];\n    }\n    if (sql.startsWith(' and ')) {\n      sql = 'having ' + sql.substring(' and '.length);\n    } else if (sql.startsWith(' or ')) {\n      sql = 'having ' + sql.substring(' or '.length);\n    }\n    return { sql, bindings };\n  }\n\n  compileHavingOperation(w: whereOp): CompiledSql {\n    return {\n      sql: `${w.column} ${w.operation} ${this.getVariablePlaceholder()}`,\n      bindings: [w.value],\n    };\n  }\n\n  compileHavingRaw(w: whereRaw): CompiledSql {\n    return {\n      sql: w.sql,\n      bindings: w.bindings,\n    };\n  }\n}\n"],"mappings":"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","names":[]}

package/dist/Schema.d.mts

@@ -1,4 +1,4 @@
 import './Blueprint.mjs';
-export { S as Schema } from './Connection-Z5qLWvdu.mjs';
+export { S as Schema } from './Connection-DhP5VxCW.mjs';
 import './SchemaGrammar.mjs';
 import './types-C_aDrXJN.mjs';

package/dist/Schema.d.ts

@@ -1,4 +1,4 @@
 import './Blueprint.js';
-export { S as Schema } from './Connection-DBxWn3YO.js';
+export { S as Schema } from './Connection-CM5zdBeX.js';
 import './SchemaGrammar.js';
 import './types-C_aDrXJN.js';

package/dist/databases/index.d.mts

@@ -1,7 +1,7 @@
 export { PostgresqlConnection } from './postgresql/PostgresqlConnection.mjs';
 export { PostgresqlQueryGrammar } from './postgresql/PostgresqlQueryGrammar.mjs';
 export { PostgresqlSchemaGrammar } from './postgresql/PostgresqlSchemaGrammar.mjs';
-import '../Connection-Z5qLWvdu.mjs';
+import '../Connection-DhP5VxCW.mjs';
 import '../Blueprint.mjs';
 import '../types-C_aDrXJN.mjs';
 import '../SchemaGrammar.mjs';

package/dist/databases/index.d.ts

@@ -1,7 +1,7 @@
 export { PostgresqlConnection } from './postgresql/PostgresqlConnection.js';
 export { PostgresqlQueryGrammar } from './postgresql/PostgresqlQueryGrammar.js';
 export { PostgresqlSchemaGrammar } from './postgresql/PostgresqlSchemaGrammar.js';
-import '../Connection-DBxWn3YO.js';
+import '../Connection-CM5zdBeX.js';
 import '../Blueprint.js';
 import '../types-C_aDrXJN.js';
 import '../SchemaGrammar.js';

package/dist/databases/postgresql/PostgresqlConnection.d.mts

@@ -1,4 +1,4 @@
-import { C as Connection, a as Query, S as Schema } from '../../Connection-Z5qLWvdu.mjs';
+import { C as Connection, a as Query, S as Schema } from '../../Connection-DhP5VxCW.mjs';
 import { PoolClient, Pool, PoolConfig } from 'pg';
 import { C as CompiledSql } from '../../types-C_aDrXJN.mjs';
 import '../../Blueprint.mjs';

package/dist/databases/postgresql/PostgresqlConnection.d.ts

@@ -1,4 +1,4 @@
-import { C as Connection, a as Query, S as Schema } from '../../Connection-DBxWn3YO.js';
+import { C as Connection, a as Query, S as Schema } from '../../Connection-CM5zdBeX.js';
 import { PoolClient, Pool, PoolConfig } from 'pg';
 import { C as CompiledSql } from '../../types-C_aDrXJN.js';
 import '../../Blueprint.js';

package/dist/databases/postgresql/PostgresqlQueryGrammar.d.mts

@@ -1,4 +1,4 @@
-import { b as QueryGrammar, a as Query } from '../../Connection-Z5qLWvdu.mjs';
+import { b as QueryGrammar, a as Query } from '../../Connection-DhP5VxCW.mjs';
 import { C as CompiledSql, P as Parameter } from '../../types-C_aDrXJN.mjs';
 import '../../Blueprint.mjs';
 import '../../SchemaGrammar.mjs';
@@ -15,6 +15,7 @@ declare class PostgresqlQueryGrammar extends QueryGrammar {
     compileUpdate(query: Query, data: Record<string, any>): CompiledSql;
     compileDelete(query: Query): CompiledSql;
     compileUpsert(query: Query, data: Record<string, Parameter>, conflictFields: string[], updateFields: string[]): CompiledSql;
+    compileCount(query: Query): CompiledSql;
 }
 
 export { PostgresqlQueryGrammar };

package/dist/databases/postgresql/PostgresqlQueryGrammar.d.ts

@@ -1,4 +1,4 @@
-import { b as QueryGrammar, a as Query } from '../../Connection-DBxWn3YO.js';
+import { b as QueryGrammar, a as Query } from '../../Connection-CM5zdBeX.js';
 import { C as CompiledSql, P as Parameter } from '../../types-C_aDrXJN.js';
 import '../../Blueprint.js';
 import '../../SchemaGrammar.js';
@@ -15,6 +15,7 @@ declare class PostgresqlQueryGrammar extends QueryGrammar {
     compileUpdate(query: Query, data: Record<string, any>): CompiledSql;
     compileDelete(query: Query): CompiledSql;
     compileUpsert(query: Query, data: Record<string, Parameter>, conflictFields: string[], updateFields: string[]): CompiledSql;
+    compileCount(query: Query): CompiledSql;
 }
 
 export { PostgresqlQueryGrammar };

package/dist/databases/postgresql/PostgresqlQueryGrammar.js

@@ -57,6 +57,10 @@ class PostgresqlQueryGrammar extends import_QueryGrammar.QueryGrammar {
     this.parameterIndex = 1;
     return super.compileUpsert(query, data, conflictFields, updateFields);
   }
+  compileCount(query) {
+    this.parameterIndex = 1;
+    return super.compileCount(query);
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/databases/postgresql/PostgresqlQueryGrammar.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/databases/postgresql/PostgresqlQueryGrammar.ts"],"sourcesContent":["import { Query } from '../../Query';\nimport { QueryGrammar } from '../../QueryGrammar';\nimport { CompiledSql, Parameter } from '../../types';\n\nexport class PostgresqlQueryGrammar extends QueryGrammar {\n  private parameterIndex: number;\n  constructor() {\n    super();\n    this.parameterIndex = 1;\n  }\n\n  toSql(query: Query): CompiledSql {\n    this.parameterIndex = 1;\n    return super.toSql(query);\n  }\n\n  getVariablePlaceholder(): string {\n    return '$' + this.parameterIndex++;\n  }\n\n  compileInsert(query: Query, data: Record<string, any>): CompiledSql {\n    this.parameterIndex = 1;\n    return super.compileInsert(query, data);\n  }\n\n  compileInsertGetId(\n    query: Query,\n    data: Record<string, any>,\n    options: { primaryKey: string[] } = { primaryKey: ['id'] }\n  ): CompiledSql {\n    this.parameterIndex = 1;\n    const rc = super.compileInsert(query, data);\n    rc.sql += ` RETURNING ${options.primaryKey.join(', ')}`;\n    return rc;\n  }\n\n  compileUpdate(query: Query, data: Record<string, any>): CompiledSql {\n    this.parameterIndex = 1;\n    return super.compileUpdate(query, data);\n  }\n\n  compileDelete(query: Query): CompiledSql {\n    this.parameterIndex = 1;\n    return super.compileDelete(query);\n  }\n\n  compileUpsert(\n    query: Query,\n    data: Record<string, Parameter>,\n    conflictFields: string[],\n    updateFields: string[]\n  ): CompiledSql {\n    this.parameterIndex = 1;\n    return super.compileUpsert(query, data, conflictFields, updateFields);\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,0BAA6B;AAGtB,MAAM,+BAA+B,iCAAa;AAAA,EAC/C;AAAA,EACR,cAAc;AACZ,UAAM;AACN,SAAK,iBAAiB;AAAA,EACxB;AAAA,EAEA,MAAM,OAA2B;AAC/B,SAAK,iBAAiB;AACtB,WAAO,MAAM,MAAM,KAAK;AAAA,EAC1B;AAAA,EAEA,yBAAiC;AAC/B,WAAO,MAAM,KAAK;AAAA,EACpB;AAAA,EAEA,cAAc,OAAc,MAAwC;AAClE,SAAK,iBAAiB;AACtB,WAAO,MAAM,cAAc,OAAO,IAAI;AAAA,EACxC;AAAA,EAEA,mBACE,OACA,MACA,UAAoC,EAAE,YAAY,CAAC,IAAI,EAAE,GAC5C;AACb,SAAK,iBAAiB;AACtB,UAAM,KAAK,MAAM,cAAc,OAAO,IAAI;AAC1C,OAAG,OAAO,cAAc,QAAQ,WAAW,KAAK,IAAI,CAAC;AACrD,WAAO;AAAA,EACT;AAAA,EAEA,cAAc,OAAc,MAAwC;AAClE,SAAK,iBAAiB;AACtB,WAAO,MAAM,cAAc,OAAO,IAAI;AAAA,EACxC;AAAA,EAEA,cAAc,OAA2B;AACvC,SAAK,iBAAiB;AACtB,WAAO,MAAM,cAAc,KAAK;AAAA,EAClC;AAAA,EAEA,cACE,OACA,MACA,gBACA,cACa;AACb,SAAK,iBAAiB;AACtB,WAAO,MAAM,cAAc,OAAO,MAAM,gBAAgB,YAAY;AAAA,EACtE;AACF;","names":[]}
+{"version":3,"sources":["../../../src/databases/postgresql/PostgresqlQueryGrammar.ts"],"sourcesContent":["import { Query } from '../../Query';\nimport { QueryGrammar } from '../../QueryGrammar';\nimport { CompiledSql, Parameter } from '../../types';\n\nexport class PostgresqlQueryGrammar extends QueryGrammar {\n  private parameterIndex: number;\n  constructor() {\n    super();\n    this.parameterIndex = 1;\n  }\n\n  toSql(query: Query): CompiledSql {\n    this.parameterIndex = 1;\n    return super.toSql(query);\n  }\n\n  getVariablePlaceholder(): string {\n    return '$' + this.parameterIndex++;\n  }\n\n  compileInsert(query: Query, data: Record<string, any>): CompiledSql {\n    this.parameterIndex = 1;\n    return super.compileInsert(query, data);\n  }\n\n  compileInsertGetId(\n    query: Query,\n    data: Record<string, any>,\n    options: { primaryKey: string[] } = { primaryKey: ['id'] }\n  ): CompiledSql {\n    this.parameterIndex = 1;\n    const rc = super.compileInsert(query, data);\n    rc.sql += ` RETURNING ${options.primaryKey.join(', ')}`;\n    return rc;\n  }\n\n  compileUpdate(query: Query, data: Record<string, any>): CompiledSql {\n    this.parameterIndex = 1;\n    return super.compileUpdate(query, data);\n  }\n\n  compileDelete(query: Query): CompiledSql {\n    this.parameterIndex = 1;\n    return super.compileDelete(query);\n  }\n\n  compileUpsert(\n    query: Query,\n    data: Record<string, Parameter>,\n    conflictFields: string[],\n    updateFields: string[]\n  ): CompiledSql {\n    this.parameterIndex = 1;\n    return super.compileUpsert(query, data, conflictFields, updateFields);\n  }\n\n  compileCount(query: Query): CompiledSql {\n    this.parameterIndex = 1;\n    return super.compileCount(query);\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,0BAA6B;AAGtB,MAAM,+BAA+B,iCAAa;AAAA,EAC/C;AAAA,EACR,cAAc;AACZ,UAAM;AACN,SAAK,iBAAiB;AAAA,EACxB;AAAA,EAEA,MAAM,OAA2B;AAC/B,SAAK,iBAAiB;AACtB,WAAO,MAAM,MAAM,KAAK;AAAA,EAC1B;AAAA,EAEA,yBAAiC;AAC/B,WAAO,MAAM,KAAK;AAAA,EACpB;AAAA,EAEA,cAAc,OAAc,MAAwC;AAClE,SAAK,iBAAiB;AACtB,WAAO,MAAM,cAAc,OAAO,IAAI;AAAA,EACxC;AAAA,EAEA,mBACE,OACA,MACA,UAAoC,EAAE,YAAY,CAAC,IAAI,EAAE,GAC5C;AACb,SAAK,iBAAiB;AACtB,UAAM,KAAK,MAAM,cAAc,OAAO,IAAI;AAC1C,OAAG,OAAO,cAAc,QAAQ,WAAW,KAAK,IAAI,CAAC;AACrD,WAAO;AAAA,EACT;AAAA,EAEA,cAAc,OAAc,MAAwC;AAClE,SAAK,iBAAiB;AACtB,WAAO,MAAM,cAAc,OAAO,IAAI;AAAA,EACxC;AAAA,EAEA,cAAc,OAA2B;AACvC,SAAK,iBAAiB;AACtB,WAAO,MAAM,cAAc,KAAK;AAAA,EAClC;AAAA,EAEA,cACE,OACA,MACA,gBACA,cACa;AACb,SAAK,iBAAiB;AACtB,WAAO,MAAM,cAAc,OAAO,MAAM,gBAAgB,YAAY;AAAA,EACtE;AAAA,EAEA,aAAa,OAA2B;AACtC,SAAK,iBAAiB;AACtB,WAAO,MAAM,aAAa,KAAK;AAAA,EACjC;AACF;","names":[]}

package/dist/databases/postgresql/PostgresqlQueryGrammar.mjs

@@ -34,6 +34,10 @@ class PostgresqlQueryGrammar extends QueryGrammar {
     this.parameterIndex = 1;
     return super.compileUpsert(query, data, conflictFields, updateFields);
   }
+  compileCount(query) {
+    this.parameterIndex = 1;
+    return super.compileCount(query);
+  }
 }
 export {
   PostgresqlQueryGrammar

package/dist/databases/postgresql/PostgresqlQueryGrammar.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/databases/postgresql/PostgresqlQueryGrammar.ts"],"sourcesContent":["import { Query } from '../../Query';\nimport { QueryGrammar } from '../../QueryGrammar';\nimport { CompiledSql, Parameter } from '../../types';\n\nexport class PostgresqlQueryGrammar extends QueryGrammar {\n  private parameterIndex: number;\n  constructor() {\n    super();\n    this.parameterIndex = 1;\n  }\n\n  toSql(query: Query): CompiledSql {\n    this.parameterIndex = 1;\n    return super.toSql(query);\n  }\n\n  getVariablePlaceholder(): string {\n    return '$' + this.parameterIndex++;\n  }\n\n  compileInsert(query: Query, data: Record<string, any>): CompiledSql {\n    this.parameterIndex = 1;\n    return super.compileInsert(query, data);\n  }\n\n  compileInsertGetId(\n    query: Query,\n    data: Record<string, any>,\n    options: { primaryKey: string[] } = { primaryKey: ['id'] }\n  ): CompiledSql {\n    this.parameterIndex = 1;\n    const rc = super.compileInsert(query, data);\n    rc.sql += ` RETURNING ${options.primaryKey.join(', ')}`;\n    return rc;\n  }\n\n  compileUpdate(query: Query, data: Record<string, any>): CompiledSql {\n    this.parameterIndex = 1;\n    return super.compileUpdate(query, data);\n  }\n\n  compileDelete(query: Query): CompiledSql {\n    this.parameterIndex = 1;\n    return super.compileDelete(query);\n  }\n\n  compileUpsert(\n    query: Query,\n    data: Record<string, Parameter>,\n    conflictFields: string[],\n    updateFields: string[]\n  ): CompiledSql {\n    this.parameterIndex = 1;\n    return super.compileUpsert(query, data, conflictFields, updateFields);\n  }\n}\n"],"mappings":"AACA,SAAS,oBAAoB;AAGtB,MAAM,+BAA+B,aAAa;AAAA,EAC/C;AAAA,EACR,cAAc;AACZ,UAAM;AACN,SAAK,iBAAiB;AAAA,EACxB;AAAA,EAEA,MAAM,OAA2B;AAC/B,SAAK,iBAAiB;AACtB,WAAO,MAAM,MAAM,KAAK;AAAA,EAC1B;AAAA,EAEA,yBAAiC;AAC/B,WAAO,MAAM,KAAK;AAAA,EACpB;AAAA,EAEA,cAAc,OAAc,MAAwC;AAClE,SAAK,iBAAiB;AACtB,WAAO,MAAM,cAAc,OAAO,IAAI;AAAA,EACxC;AAAA,EAEA,mBACE,OACA,MACA,UAAoC,EAAE,YAAY,CAAC,IAAI,EAAE,GAC5C;AACb,SAAK,iBAAiB;AACtB,UAAM,KAAK,MAAM,cAAc,OAAO,IAAI;AAC1C,OAAG,OAAO,cAAc,QAAQ,WAAW,KAAK,IAAI,CAAC;AACrD,WAAO;AAAA,EACT;AAAA,EAEA,cAAc,OAAc,MAAwC;AAClE,SAAK,iBAAiB;AACtB,WAAO,MAAM,cAAc,OAAO,IAAI;AAAA,EACxC;AAAA,EAEA,cAAc,OAA2B;AACvC,SAAK,iBAAiB;AACtB,WAAO,MAAM,cAAc,KAAK;AAAA,EAClC;AAAA,EAEA,cACE,OACA,MACA,gBACA,cACa;AACb,SAAK,iBAAiB;AACtB,WAAO,MAAM,cAAc,OAAO,MAAM,gBAAgB,YAAY;AAAA,EACtE;AACF;","names":[]}
+{"version":3,"sources":["../../../src/databases/postgresql/PostgresqlQueryGrammar.ts"],"sourcesContent":["import { Query } from '../../Query';\nimport { QueryGrammar } from '../../QueryGrammar';\nimport { CompiledSql, Parameter } from '../../types';\n\nexport class PostgresqlQueryGrammar extends QueryGrammar {\n  private parameterIndex: number;\n  constructor() {\n    super();\n    this.parameterIndex = 1;\n  }\n\n  toSql(query: Query): CompiledSql {\n    this.parameterIndex = 1;\n    return super.toSql(query);\n  }\n\n  getVariablePlaceholder(): string {\n    return '$' + this.parameterIndex++;\n  }\n\n  compileInsert(query: Query, data: Record<string, any>): CompiledSql {\n    this.parameterIndex = 1;\n    return super.compileInsert(query, data);\n  }\n\n  compileInsertGetId(\n    query: Query,\n    data: Record<string, any>,\n    options: { primaryKey: string[] } = { primaryKey: ['id'] }\n  ): CompiledSql {\n    this.parameterIndex = 1;\n    const rc = super.compileInsert(query, data);\n    rc.sql += ` RETURNING ${options.primaryKey.join(', ')}`;\n    return rc;\n  }\n\n  compileUpdate(query: Query, data: Record<string, any>): CompiledSql {\n    this.parameterIndex = 1;\n    return super.compileUpdate(query, data);\n  }\n\n  compileDelete(query: Query): CompiledSql {\n    this.parameterIndex = 1;\n    return super.compileDelete(query);\n  }\n\n  compileUpsert(\n    query: Query,\n    data: Record<string, Parameter>,\n    conflictFields: string[],\n    updateFields: string[]\n  ): CompiledSql {\n    this.parameterIndex = 1;\n    return super.compileUpsert(query, data, conflictFields, updateFields);\n  }\n\n  compileCount(query: Query): CompiledSql {\n    this.parameterIndex = 1;\n    return super.compileCount(query);\n  }\n}\n"],"mappings":"AACA,SAAS,oBAAoB;AAGtB,MAAM,+BAA+B,aAAa;AAAA,EAC/C;AAAA,EACR,cAAc;AACZ,UAAM;AACN,SAAK,iBAAiB;AAAA,EACxB;AAAA,EAEA,MAAM,OAA2B;AAC/B,SAAK,iBAAiB;AACtB,WAAO,MAAM,MAAM,KAAK;AAAA,EAC1B;AAAA,EAEA,yBAAiC;AAC/B,WAAO,MAAM,KAAK;AAAA,EACpB;AAAA,EAEA,cAAc,OAAc,MAAwC;AAClE,SAAK,iBAAiB;AACtB,WAAO,MAAM,cAAc,OAAO,IAAI;AAAA,EACxC;AAAA,EAEA,mBACE,OACA,MACA,UAAoC,EAAE,YAAY,CAAC,IAAI,EAAE,GAC5C;AACb,SAAK,iBAAiB;AACtB,UAAM,KAAK,MAAM,cAAc,OAAO,IAAI;AAC1C,OAAG,OAAO,cAAc,QAAQ,WAAW,KAAK,IAAI,CAAC;AACrD,WAAO;AAAA,EACT;AAAA,EAEA,cAAc,OAAc,MAAwC;AAClE,SAAK,iBAAiB;AACtB,WAAO,MAAM,cAAc,OAAO,IAAI;AAAA,EACxC;AAAA,EAEA,cAAc,OAA2B;AACvC,SAAK,iBAAiB;AACtB,WAAO,MAAM,cAAc,KAAK;AAAA,EAClC;AAAA,EAEA,cACE,OACA,MACA,gBACA,cACa;AACb,SAAK,iBAAiB;AACtB,WAAO,MAAM,cAAc,OAAO,MAAM,gBAAgB,YAAY;AAAA,EACtE;AAAA,EAEA,aAAa,OAA2B;AACtC,SAAK,iBAAiB;AACtB,WAAO,MAAM,aAAa,KAAK;AAAA,EACjC;AACF;","names":[]}

package/dist/databases/postgresql/index.d.mts

@@ -1,7 +1,7 @@
 export { PostgresqlConnection } from './PostgresqlConnection.mjs';
 export { PostgresqlQueryGrammar } from './PostgresqlQueryGrammar.mjs';
 export { PostgresqlSchemaGrammar } from './PostgresqlSchemaGrammar.mjs';
-import '../../Connection-Z5qLWvdu.mjs';
+import '../../Connection-DhP5VxCW.mjs';
 import '../../Blueprint.mjs';
 import '../../types-C_aDrXJN.mjs';
 import '../../SchemaGrammar.mjs';

package/dist/databases/postgresql/index.d.ts

@@ -1,7 +1,7 @@
 export { PostgresqlConnection } from './PostgresqlConnection.js';
 export { PostgresqlQueryGrammar } from './PostgresqlQueryGrammar.js';
 export { PostgresqlSchemaGrammar } from './PostgresqlSchemaGrammar.js';
-import '../../Connection-DBxWn3YO.js';
+import '../../Connection-CM5zdBeX.js';
 import '../../Blueprint.js';
 import '../../types-C_aDrXJN.js';
 import '../../SchemaGrammar.js';

package/dist/index.d.mts

@@ -2,7 +2,7 @@ export { PostgresqlConnection } from './databases/postgresql/PostgresqlConnectio
 export { PostgresqlQueryGrammar } from './databases/postgresql/PostgresqlQueryGrammar.mjs';
 export { PostgresqlSchemaGrammar } from './databases/postgresql/PostgresqlSchemaGrammar.mjs';
 export { Blueprint, Column, ColumnPropertiesType } from './Blueprint.mjs';
-export { C as Connection, a as Query, b as QueryGrammar, Q as QueryParts, S as Schema } from './Connection-Z5qLWvdu.mjs';
+export { C as Connection, a as Query, b as QueryGrammar, Q as QueryParts, S as Schema } from './Connection-DhP5VxCW.mjs';
 export { C as CompiledSql, J as JoinCondition, P as Parameter, h as havingType, j as joinType, s as selectType, w as whereBasic, d as whereNull, a as whereOp, b as whereOpColumn, c as whereRaw, e as whereType } from './types-C_aDrXJN.mjs';
 export { Migration } from './Migration.mjs';
 import 'pg';

package/dist/index.d.ts

@@ -2,7 +2,7 @@ export { PostgresqlConnection } from './databases/postgresql/PostgresqlConnectio
 export { PostgresqlQueryGrammar } from './databases/postgresql/PostgresqlQueryGrammar.js';
 export { PostgresqlSchemaGrammar } from './databases/postgresql/PostgresqlSchemaGrammar.js';
 export { Blueprint, Column, ColumnPropertiesType } from './Blueprint.js';
-export { C as Connection, a as Query, b as QueryGrammar, Q as QueryParts, S as Schema } from './Connection-DBxWn3YO.js';
+export { C as Connection, a as Query, b as QueryGrammar, Q as QueryParts, S as Schema } from './Connection-CM5zdBeX.js';
 export { C as CompiledSql, J as JoinCondition, P as Parameter, h as havingType, j as joinType, s as selectType, w as whereBasic, d as whereNull, a as whereOp, b as whereOpColumn, c as whereRaw, e as whereType } from './types-C_aDrXJN.js';
 export { Migration } from './Migration.js';
 import 'pg';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devbro/neko-sql",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "generic sql generator",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",