Merge branch 'knex:master' into master

YoutacRandS-VA · Sep 24, 2024 · 77ffe25 · 77ffe25
2 parents 8f9467b + 176151d
commit 77ffe25
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 2 deletions.
diff --git a/lib/dialects/oracle/utils.js b/lib/dialects/oracle/utils.js
@@ -93,6 +93,7 @@ function isConnectionError(err) {
     'ORA-56600', // an illegal OCI function call was issued
     'NJS-024',
     'NJS-003',
+    'NJS-500',
   ].some(function (prefix) {
     return err.message.indexOf(prefix) === 0;
   });

diff --git a/lib/dialects/sqlite3/query/sqlite-querycompiler.js b/lib/dialects/sqlite3/query/sqlite-querycompiler.js
@@ -329,6 +329,13 @@ class QueryCompiler_SQLite3 extends QueryCompiler {
   onJsonPathEquals(clause) {
     return this._onJsonPathEquals('json_extract', clause);
   }
+
+  whereILike(statement) {
+    return `${this._columnClause(statement)} ${this._not(
+      statement,
+      'like '
+    )}${this._valueClause(statement)}`;
+  }
 }
 
 module.exports = QueryCompiler_SQLite3;
diff --git a/test/integration2/query/select/where.spec.js b/test/integration2/query/select/where.spec.js
@@ -556,7 +556,14 @@ describe('Where', function () {
 
       describe('where like', async function () {
         beforeEach(function () {
-          if (!(isPostgreSQL(knex) || isMssql(knex) || isMysql(knex))) {
+          if (
+            !(
+              isPostgreSQL(knex) ||
+              isSQLite(knex) ||
+              isMssql(knex) ||
+              isMysql(knex)
+            )
+          ) {
             return this.skip();
           }
         });
@@ -630,10 +637,23 @@ describe('Where', function () {
           expect(result[7].email).to.equal('test8@example.com');
         });
 
-        it("doesn't find data using whereLike when different case sensitivity", async () => {
+        it("doesn't find data using whereLike when different case sensitivity", async function () {
           const result = await knex('accounts').whereLike('email', 'Test1%');
+          // sqlite only supports case-insensitive search
+          if (isSQLite(knex)) {
+            this.skip();
+          }
           expect(result).to.deep.equal([]);
         });
+
+        it('supports only case-insensitive searches in sqlite', async function () {
+          const result = await knex('accounts').whereILike('email', 'Test1%');
+          if (!isSQLite(knex)) {
+            this.skip();
+          }
+          expect(result.length).to.equal(1);
+          expect(result[0].email).to.equal('test1@example.com');
+        });
       });
 
       it('Retains array bindings, #228', function () {

diff --git a/test/unit/query/builder.js b/test/unit/query/builder.js
@@ -879,6 +879,10 @@ describe('QueryBuilder', () => {
         sql: 'select * from [users] where [name] collate SQL_Latin1_General_CP1_CI_AS like ?',
         bindings: ['luk%'],
       },
+      sqlite3: {
+        sql: 'select * from `users` where `name` like ?',
+        bindings: ['luk%'],
+      },
     });
   });
 
@@ -903,6 +907,10 @@ describe('QueryBuilder', () => {
           sql: 'select * from [users] where [name] collate SQL_Latin1_General_CP1_CS_AS like ? and [name] collate SQL_Latin1_General_CP1_CS_AS like ? or [name] collate SQL_Latin1_General_CP1_CS_AS like ?',
           bindings: ['luk1%', 'luk2%', 'luk3%'],
         },
+        sqlite3: {
+          sql: 'select * from `users` where `name` like ? and `name` like ? or `name` like ?',
+          bindings: ['luk1%', 'luk2%', 'luk3%'],
+        },
       }
     );
   });
@@ -928,6 +936,10 @@ describe('QueryBuilder', () => {
           sql: 'select * from [users] where [name] collate SQL_Latin1_General_CP1_CI_AS like ? and [name] collate SQL_Latin1_General_CP1_CI_AS like ? or [name] collate SQL_Latin1_General_CP1_CI_AS like ?',
           bindings: ['luk1%', 'luk2%', 'luk3%'],
         },
+        sqlite3: {
+          sql: 'select * from `users` where `name` like ? and `name` like ? or `name` like ?',
+          bindings: ['luk1%', 'luk2%', 'luk3%'],
+        },
       }
     );
   });