sql-love 0.9.2 → 0.9.4

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Change Log
 
+### v0.9.4 - 30 Nov 2023
+
+- Support parsing and building "ILIKE" and "NOT ILIKE"
+
 ### v0.9.2 - 30 Nov 2023
 
 - Fixes to readme

package/README.md

@@ -1,10 +1,12 @@
+<img alt="SQL Love Logo" src="https://github.com/kensnyder/sql-love/raw/main/assets/sql-love-logo.png?v=0.9.4" width="250" height="208" />
+
 # sql-love
 
-[![NPM Link](https://badgen.net/npm/v/sql-love?v=0.9.2)](https://npm.com/package/sql-love)
-[![Dependencies](https://badgen.net/static/dependencies/0/green?v=0.9.2)](https://npm.com/package/sql-love)
-[![Build Status](https://github.com/kensnyder/sql-love/actions/workflows/node.js.yml/badge.svg?v=0.9.2)](https://github.com/kensnyder/sql-love/actions)
-[![Code Coverage](https://codecov.io/gh/kensnyder/sql-love/branch/main/graph/badge.svg?v=0.9.2)](https://codecov.io/gh/kensnyder/sql-love)
-[![ISC License](https://badgen.net/static/license/ISC/green?v=0.9.2)](https://opensource.org/licenses/ISC)
+[![NPM Link](https://badgen.net/npm/v/sql-love?v=0.9.4)](https://npmjs.com/package/sql-love)
+[![Dependencies](https://badgen.net/static/dependencies/0/green?v=0.9.4)](https://npmjs.com/package/sql-love)
+[![Build Status](https://github.com/kensnyder/sql-love/actions/workflows/node.js.yml/badge.svg?v=0.9.4)](https://github.com/kensnyder/sql-love/actions)
+[![Code Coverage](https://codecov.io/gh/kensnyder/sql-love/branch/main/graph/badge.svg?v=0.9.4)](https://codecov.io/gh/kensnyder/sql-love)
+[![ISC License](https://badgen.net/static/license/ISC/green?v=0.9.4)](https://opensource.org/licenses/ISC)
 
 Classes for parsing and building SQL select queries in Node
 
@@ -55,9 +57,9 @@ const { sql, bindings } = query.compile();
 
 // then execute the SQL in your preferred client:
 // like mysql2
-mysql.query(sql, bindings);
+connection.query(sql, bindings, (err, results, fields) => {});
 // or Prisma
-const result = await prisma.$executeRaw(sql, bindings);
+const result = await prisma.$queryRawUnsafe(sql, ...bindings);
 ```
 
 It is possible to add placeholders to the base query.

package/dist/src/SelectBuilder/SelectBuilder.d.ts

@@ -86,10 +86,10 @@ export default class SelectBuilder {
     _compileOFFSET(engineStyle: EngineStyle, offset: number): string;
     /**
      * Get SQL needed to return the found rows of this query
-     * @param countExpr  The expression to use inside the COUNT()
      * @param engineStyle  The database engine style (mssql, mysql, oracle, pg)
+     * @param countExpr  The expression to use inside the COUNT()
      */
-    compileCount(countExpr?: string, engineStyle?: EngineStyle): {
+    compileCount(engineStyle?: EngineStyle, countExpr?: string): {
         sql: string;
         bindings: any;
     };
@@ -352,4 +352,5 @@ export default class SelectBuilder {
      * @param number  The page number (integer greater than 0)
      */
     page(number: number | string): this;
+    fetch(engine: any): void;
 }

package/dist/src/SelectBuilder/SelectBuilder.js

@@ -153,10 +153,10 @@ export default class SelectBuilder {
     }
     /**
      * Get SQL needed to return the found rows of this query
-     * @param countExpr  The expression to use inside the COUNT()
      * @param engineStyle  The database engine style (mssql, mysql, oracle, pg)
+     * @param countExpr  The expression to use inside the COUNT()
      */
-    compileCount(countExpr = '*', engineStyle = 'mysql') {
+    compileCount(engineStyle = 'mysql', countExpr = '*') {
         const query = this.getFoundRowsQuery(countExpr);
         const { sql, bindings } = query.compile(engineStyle);
         if (this._havings.length === 0) {
@@ -526,7 +526,7 @@ export default class SelectBuilder {
             operator = '=';
         }
         operator = operator.toLocaleUpperCase();
-        const likeMatch = operator.match(/^(LIKE|NOT LIKE)(?: (\?|\?%|%\?|%\?%))?$/i);
+        const likeMatch = operator.match(/^(LIKE|NOT LIKE|ILIKE|NOT ILIKE)(?: (\?|\?%|%\?|%\?%))?$/i);
         if (operator === 'NOT BETWEEN' || operator === 'BETWEEN') {
             // expect a two-item array
             const one = this._bindings.length;
@@ -535,7 +535,7 @@ export default class SelectBuilder {
             this._bindings.push(value[0], value[1]);
         }
         else if (likeMatch) {
-            const like = likeMatch[1].toUpperCase(); // Either LIKE or NOT LIKE
+            const like = likeMatch[1].toUpperCase(); // Either "LIKE", "NOT LIKE" etc.
             const infix = likeMatch[2] || '?'; // ONE OF ?% or %?% or %? or ?
             if (Array.isArray(value)) {
                 const ors = [];
@@ -769,4 +769,9 @@ export default class SelectBuilder {
         }
         return this;
     }
+    fetch(engine) {
+        if (engine.$queryRawUnsafe) {
+            //
+        }
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sql-love",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "description": "Build SQL queries with JavaScript",
   "main": "dist/index.js",
   "type": "module",

package/src/SelectBuilder/SelectBuilder.spec.ts

@@ -600,7 +600,7 @@ describe('compileCount()', () => {
   });
   it('should handle a distinct', () => {
     const query = new SelectBuilder('SELECT * FROM posts');
-    const { sql, bindings } = query.compileCount('DISTINCT group_id');
+    const { sql, bindings } = query.compileCount('mysql', 'DISTINCT group_id');
     expect(trim(sql)).toBe(
       'SELECT COUNT(DISTINCT group_id) AS found_rows FROM posts'
     );

package/src/SelectBuilder/SelectBuilder.ts

@@ -187,10 +187,10 @@ export default class SelectBuilder {
 
   /**
    * Get SQL needed to return the found rows of this query
-   * @param countExpr  The expression to use inside the COUNT()
    * @param engineStyle  The database engine style (mssql, mysql, oracle, pg)
+   * @param countExpr  The expression to use inside the COUNT()
    */
-  compileCount(countExpr: string = '*', engineStyle: EngineStyle = 'mysql') {
+  compileCount(engineStyle: EngineStyle = 'mysql', countExpr: string = '*') {
     const query = this.getFoundRowsQuery(countExpr);
     const { sql, bindings } = query.compile(engineStyle);
     if (this._havings.length === 0) {
@@ -580,7 +580,7 @@ export default class SelectBuilder {
     }
     operator = operator.toLocaleUpperCase();
     const likeMatch = operator.match(
-      /^(LIKE|NOT LIKE)(?: (\?|\?%|%\?|%\?%))?$/i
+      /^(LIKE|NOT LIKE|ILIKE|NOT ILIKE)(?: (\?|\?%|%\?|%\?%))?$/i
     );
     if (operator === 'NOT BETWEEN' || operator === 'BETWEEN') {
       // expect a two-item array
@@ -591,7 +591,7 @@ export default class SelectBuilder {
       );
       this._bindings.push(value[0], value[1]);
     } else if (likeMatch) {
-      const like = likeMatch[1].toUpperCase(); // Either LIKE or NOT LIKE
+      const like = likeMatch[1].toUpperCase(); // Either "LIKE", "NOT LIKE" etc.
       const infix = likeMatch[2] || '?'; // ONE OF ?% or %?% or %? or ?
       if (Array.isArray(value)) {
         const ors = [];
@@ -842,4 +842,10 @@ export default class SelectBuilder {
     }
     return this;
   }
+
+  fetch(engine) {
+    if (engine.$queryRawUnsafe) {
+      //
+    }
+  }
 }