bun-query-builder 0.2.21 → 0.2.23

package/dist/bin/cli.js

@@ -15800,6 +15800,18 @@ function createQueryBuilder(state) {
           }
           return this;
         },
+        whereNull(column) {
+          const keyword = SQL_PATTERNS.WHERE.test(sqlText) ? "AND" : "WHERE";
+          sqlText = `${sqlText} ${keyword} ${quoteId(String(column))} IS NULL`;
+          built = _sql.unsafe(sqlText, params);
+          return this;
+        },
+        whereNotNull(column) {
+          const keyword = SQL_PATTERNS.WHERE.test(sqlText) ? "AND" : "WHERE";
+          sqlText = `${sqlText} ${keyword} ${quoteId(String(column))} IS NOT NULL`;
+          built = _sql.unsafe(sqlText, params);
+          return this;
+        },
         returning(...cols) {
           const retText = `${sqlText} RETURNING ${cols.join(", ")}`;
           const q = params.length > 0 ? _sql.unsafe(retText, params) : _sql.unsafe(retText);
@@ -15927,6 +15939,16 @@ function createQueryBuilder(state) {
           built = applyWhere({}, ensureDelBuilt(), expr);
           return this;
         },
+        whereNull(column) {
+          sqlText += ` ${getWhereKeyword()} ${quoteId(String(column))} IS NULL`;
+          built = null;
+          return this;
+        },
+        whereNotNull(column) {
+          sqlText += ` ${getWhereKeyword()} ${quoteId(String(column))} IS NOT NULL`;
+          built = null;
+          return this;
+        },
         returning(...cols) {
           const retText = `${sqlText} RETURNING ${cols.join(", ")}`;
           const q = delParams.length > 0 ? _sql.unsafe(retText, delParams) : _sql.unsafe(retText);
@@ -17890,20 +17912,23 @@ async function buildPgTable(qb, table, enumLabels) {
     WHERE t.relname = $1 AND t.relkind = 'r'
     ORDER BY i.relname, ord`, [table]);
   const fkRows = await qb.unsafe(`SELECT kcu.column_name, ccu.table_name AS ref_table, ccu.column_name AS ref_column,
-            tc.constraint_name, rc.delete_rule, rc.update_rule,
-            (SELECT COUNT(*) FROM information_schema.key_column_usage count_kcu
-              WHERE count_kcu.constraint_name = tc.constraint_name
-                AND count_kcu.constraint_schema = tc.constraint_schema) AS constraint_column_count
+            tc.constraint_name, rc.delete_rule, rc.update_rule
     FROM information_schema.table_constraints tc
       JOIN information_schema.key_column_usage kcu ON kcu.constraint_name = tc.constraint_name
       JOIN information_schema.constraint_column_usage ccu ON ccu.constraint_name = tc.constraint_name
       JOIN information_schema.referential_constraints rc ON rc.constraint_name = tc.constraint_name
     WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name = $1 AND tc.table_schema = 'public'`, [table]);
   const fkByColumn = new Map;
+  const fkColumnCounts = new Map;
+  for (const fk of fkRows) {
+    const constraintName = String(fk.constraint_name);
+    fkColumnCounts.set(constraintName, (fkColumnCounts.get(constraintName) ?? 0) + 1);
+  }
   for (const fk of fkRows) {
     const name = String(fk.column_name);
     const existing = fkByColumn.get(name);
-    const constraintNames = Number(fk.constraint_column_count) === 1 ? [...new Set([...existing?.constraintNames ?? [], String(fk.constraint_name)])] : existing?.constraintNames;
+    const constraintName = String(fk.constraint_name);
+    const constraintNames = fkColumnCounts.get(constraintName) === 1 ? [...new Set([...existing?.constraintNames ?? [], constraintName])] : existing?.constraintNames;
     fkByColumn.set(name, existing ? { ...existing, constraintNames } : {
       table: String(fk.ref_table),
       column: String(fk.ref_column ?? "id"),
@@ -17948,21 +17973,22 @@ async function buildMysqlTable(qb, table) {
     WHERE table_name = ? AND table_schema = DATABASE()
     ORDER BY index_name, seq_in_index`, [table]);
   const fkRows = await qb.unsafe(`SELECT kcu.column_name, kcu.referenced_table_name AS ref_table, kcu.referenced_column_name AS ref_column,
-            kcu.constraint_name, rc.delete_rule, rc.update_rule,
-            (SELECT COUNT(*) FROM information_schema.key_column_usage count_kcu
-              WHERE count_kcu.constraint_name = kcu.constraint_name
-                AND count_kcu.constraint_schema = kcu.constraint_schema) AS constraint_column_count
+            kcu.constraint_name, rc.delete_rule, rc.update_rule
     FROM information_schema.key_column_usage kcu
       JOIN information_schema.referential_constraints rc
         ON rc.constraint_name = kcu.constraint_name AND rc.constraint_schema = kcu.table_schema
     WHERE kcu.table_name = ? AND kcu.table_schema = DATABASE() AND kcu.referenced_table_name IS NOT NULL`, [table]);
   const fkByColumn = new Map;
+  const fkColumnCounts = new Map;
+  for (const fk of fkRows) {
+    const constraintName = String(fk.constraint_name ?? fk.CONSTRAINT_NAME);
+    fkColumnCounts.set(constraintName, (fkColumnCounts.get(constraintName) ?? 0) + 1);
+  }
   for (const fk of fkRows) {
     const name = String(fk.column_name ?? fk.COLUMN_NAME);
     const existing = fkByColumn.get(name);
-    const columnCount = Number(fk.constraint_column_count ?? fk.CONSTRAINT_COLUMN_COUNT);
     const constraintName = String(fk.constraint_name ?? fk.CONSTRAINT_NAME);
-    const constraintNames = columnCount === 1 ? [...new Set([...existing?.constraintNames ?? [], constraintName])] : existing?.constraintNames;
+    const constraintNames = fkColumnCounts.get(constraintName) === 1 ? [...new Set([...existing?.constraintNames ?? [], constraintName])] : existing?.constraintNames;
     fkByColumn.set(name, existing ? { ...existing, constraintNames } : {
       table: String(fk.ref_table ?? fk.REF_TABLE),
       column: String(fk.ref_column ?? fk.REF_COLUMN ?? "id"),
@@ -31630,7 +31656,7 @@ function getPrefix() {
 }
 var prefix = getPrefix();
 // package.json
-var version2 = "0.2.21";
+var version2 = "0.2.23";
 
 // bin/cli.ts
 init_actions();

package/dist/client.d.ts

@@ -238,6 +238,8 @@ export declare interface InsertQueryBuilder<DB extends DatabaseSchema<any>, TTab
 export declare interface UpdateQueryBuilder<DB extends DatabaseSchema<any>, TTable extends keyof DB & string> {
   set: (values: Partial<{ [K in keyof DB[TTable]['columns']]: DB[TTable]['columns'][K] | SqlFragment }>) => UpdateQueryBuilder<DB, TTable>
   where: (expr: WhereExpression<DB[TTable]['columns']> | string | SqlFragment, op?: WhereOperator, value?: any) => UpdateQueryBuilder<DB, TTable>
+  whereNull: <K extends keyof DB[TTable]['columns'] & string>(column: K) => UpdateQueryBuilder<DB, TTable>
+  whereNotNull: <K extends keyof DB[TTable]['columns'] & string>(column: K) => UpdateQueryBuilder<DB, TTable>
   returning: <K extends keyof DB[TTable]['columns'] & string>(...cols: K[]) => SelectQueryBuilder<DB, TTable, Pick<DB[TTable]['columns'], K>>
   toSQL: () => string
   execute: () => Promise<number>
@@ -247,6 +249,8 @@ export declare interface UpdateQueryBuilder<DB extends DatabaseSchema<any>, TTab
 }
 export declare interface DeleteQueryBuilder<DB extends DatabaseSchema<any>, TTable extends keyof DB & string> {
   where: (expr: WhereExpression<DB[TTable]['columns']> | string, op?: WhereOperator, value?: any) => DeleteQueryBuilder<DB, TTable>
+  whereNull: <K extends keyof DB[TTable]['columns'] & string>(column: K) => DeleteQueryBuilder<DB, TTable>
+  whereNotNull: <K extends keyof DB[TTable]['columns'] & string>(column: K) => DeleteQueryBuilder<DB, TTable>
   returning: <K extends keyof DB[TTable]['columns'] & string>(...cols: K[]) => SelectQueryBuilder<DB, TTable, Pick<DB[TTable]['columns'], K>>
   toSQL: () => string
   execute: () => Promise<number>

package/dist/src/index.js

@@ -15799,6 +15799,18 @@ function createQueryBuilder(state) {
           }
           return this;
         },
+        whereNull(column) {
+          const keyword = SQL_PATTERNS.WHERE.test(sqlText) ? "AND" : "WHERE";
+          sqlText = `${sqlText} ${keyword} ${quoteId(String(column))} IS NULL`;
+          built = _sql.unsafe(sqlText, params);
+          return this;
+        },
+        whereNotNull(column) {
+          const keyword = SQL_PATTERNS.WHERE.test(sqlText) ? "AND" : "WHERE";
+          sqlText = `${sqlText} ${keyword} ${quoteId(String(column))} IS NOT NULL`;
+          built = _sql.unsafe(sqlText, params);
+          return this;
+        },
         returning(...cols) {
           const retText = `${sqlText} RETURNING ${cols.join(", ")}`;
           const q = params.length > 0 ? _sql.unsafe(retText, params) : _sql.unsafe(retText);
@@ -15926,6 +15938,16 @@ function createQueryBuilder(state) {
           built = applyWhere({}, ensureDelBuilt(), expr);
           return this;
         },
+        whereNull(column) {
+          sqlText += ` ${getWhereKeyword()} ${quoteId(String(column))} IS NULL`;
+          built = null;
+          return this;
+        },
+        whereNotNull(column) {
+          sqlText += ` ${getWhereKeyword()} ${quoteId(String(column))} IS NOT NULL`;
+          built = null;
+          return this;
+        },
         returning(...cols) {
           const retText = `${sqlText} RETURNING ${cols.join(", ")}`;
           const q = delParams.length > 0 ? _sql.unsafe(retText, delParams) : _sql.unsafe(retText);
@@ -17889,20 +17911,23 @@ async function buildPgTable(qb, table, enumLabels) {
     WHERE t.relname = $1 AND t.relkind = 'r'
     ORDER BY i.relname, ord`, [table]);
   const fkRows = await qb.unsafe(`SELECT kcu.column_name, ccu.table_name AS ref_table, ccu.column_name AS ref_column,
-            tc.constraint_name, rc.delete_rule, rc.update_rule,
-            (SELECT COUNT(*) FROM information_schema.key_column_usage count_kcu
-              WHERE count_kcu.constraint_name = tc.constraint_name
-                AND count_kcu.constraint_schema = tc.constraint_schema) AS constraint_column_count
+            tc.constraint_name, rc.delete_rule, rc.update_rule
     FROM information_schema.table_constraints tc
       JOIN information_schema.key_column_usage kcu ON kcu.constraint_name = tc.constraint_name
       JOIN information_schema.constraint_column_usage ccu ON ccu.constraint_name = tc.constraint_name
       JOIN information_schema.referential_constraints rc ON rc.constraint_name = tc.constraint_name
     WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name = $1 AND tc.table_schema = 'public'`, [table]);
   const fkByColumn = new Map;
+  const fkColumnCounts = new Map;
+  for (const fk of fkRows) {
+    const constraintName = String(fk.constraint_name);
+    fkColumnCounts.set(constraintName, (fkColumnCounts.get(constraintName) ?? 0) + 1);
+  }
   for (const fk of fkRows) {
     const name = String(fk.column_name);
     const existing = fkByColumn.get(name);
-    const constraintNames = Number(fk.constraint_column_count) === 1 ? [...new Set([...existing?.constraintNames ?? [], String(fk.constraint_name)])] : existing?.constraintNames;
+    const constraintName = String(fk.constraint_name);
+    const constraintNames = fkColumnCounts.get(constraintName) === 1 ? [...new Set([...existing?.constraintNames ?? [], constraintName])] : existing?.constraintNames;
     fkByColumn.set(name, existing ? { ...existing, constraintNames } : {
       table: String(fk.ref_table),
       column: String(fk.ref_column ?? "id"),
@@ -17947,21 +17972,22 @@ async function buildMysqlTable(qb, table) {
     WHERE table_name = ? AND table_schema = DATABASE()
     ORDER BY index_name, seq_in_index`, [table]);
   const fkRows = await qb.unsafe(`SELECT kcu.column_name, kcu.referenced_table_name AS ref_table, kcu.referenced_column_name AS ref_column,
-            kcu.constraint_name, rc.delete_rule, rc.update_rule,
-            (SELECT COUNT(*) FROM information_schema.key_column_usage count_kcu
-              WHERE count_kcu.constraint_name = kcu.constraint_name
-                AND count_kcu.constraint_schema = kcu.constraint_schema) AS constraint_column_count
+            kcu.constraint_name, rc.delete_rule, rc.update_rule
     FROM information_schema.key_column_usage kcu
       JOIN information_schema.referential_constraints rc
         ON rc.constraint_name = kcu.constraint_name AND rc.constraint_schema = kcu.table_schema
     WHERE kcu.table_name = ? AND kcu.table_schema = DATABASE() AND kcu.referenced_table_name IS NOT NULL`, [table]);
   const fkByColumn = new Map;
+  const fkColumnCounts = new Map;
+  for (const fk of fkRows) {
+    const constraintName = String(fk.constraint_name ?? fk.CONSTRAINT_NAME);
+    fkColumnCounts.set(constraintName, (fkColumnCounts.get(constraintName) ?? 0) + 1);
+  }
   for (const fk of fkRows) {
     const name = String(fk.column_name ?? fk.COLUMN_NAME);
     const existing = fkByColumn.get(name);
-    const columnCount = Number(fk.constraint_column_count ?? fk.CONSTRAINT_COLUMN_COUNT);
     const constraintName = String(fk.constraint_name ?? fk.CONSTRAINT_NAME);
-    const constraintNames = columnCount === 1 ? [...new Set([...existing?.constraintNames ?? [], constraintName])] : existing?.constraintNames;
+    const constraintNames = fkColumnCounts.get(constraintName) === 1 ? [...new Set([...existing?.constraintNames ?? [], constraintName])] : existing?.constraintNames;
     fkByColumn.set(name, existing ? { ...existing, constraintNames } : {
       table: String(fk.ref_table ?? fk.REF_TABLE),
       column: String(fk.ref_column ?? fk.REF_COLUMN ?? "id"),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bun-query-builder",
   "type": "module",
-  "version": "0.2.21",
+  "version": "0.2.23",
   "description": "A simple yet performant query builder for TypeScript. Built with Bun.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",