@platformatic/sql-mapper 0.33.1 → 0.34.0

package/lib/entity.js

@@ -200,6 +200,7 @@ function createMapper (defaultDb, sql, log, table, fields, primaryKeys, relation
     lt: '<',
     lte: '<=',
     like: 'LIKE',
+    ilike: 'ILIKE',
     any: 'ANY',
     all: 'ALL'
   }
@@ -241,14 +242,15 @@ function createMapper (defaultDb, sql, log, table, fields, primaryKeys, relation
           criteria.push(sql`${sql.ident(field)} IS NULL`)
         } else if (operator === '<>' && value[key] === null) {
           criteria.push(sql`${sql.ident(field)} IS NOT NULL`)
-        } else if (operator === 'LIKE') {
+        } else if (operator === 'LIKE' || operator === 'ILIKE') {
           let leftHand = sql.ident(field)
           // NOTE: cast fields AS CHAR(64) and TRIM the whitespaces
           // to prevent errors with fields different than VARCHAR & TEXT
           if (!['text', 'varchar'].includes(fieldWrap.sqlType)) {
             leftHand = sql`TRIM(CAST(${sql.ident(field)} AS CHAR(64)))`
           }
-          criteria.push(sql`${leftHand} LIKE ${value[key]}`)
+          const like = operator === 'LIKE' ? sql`LIKE` : queries.hasILIKE ? sql`ILIKE` : sql`LIKE`
+          criteria.push(sql`${leftHand} ${like} ${value[key]}`)
         } else if (operator === 'ANY' || operator === 'ALL') {
           throw new Error('Unsupported operator for non Array field')
         } else {

package/lib/queries/mysql-shared.js

@@ -115,3 +115,5 @@ module.exports = {
   updateOne,
   updateMany
 }
+
+module.exports.hasILIKE = false

package/lib/queries/pg.js

@@ -127,3 +127,5 @@ async function listEnumValues (db, sql, table, schema) {
 }
 
 module.exports.listEnumValues = listEnumValues
+
+module.exports.hasILIKE = true

package/lib/queries/sqlite.js

@@ -245,3 +245,5 @@ async function updateMany (db, sql, table, schema, criteria, input, fieldsToRetr
 }
 
 module.exports.updateMany = updateMany
+
+module.exports.hasILIKE = false

package/mapper.d.ts

@@ -100,6 +100,10 @@ export interface WhereCondition {
      * Like value.
      */
     like?: string
+    /**
+     * Like ignore-case value.
+     */
+    ilike?: string
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/sql-mapper",
-  "version": "0.33.1",
+  "version": "0.34.0",
   "description": "A data mapper utility for SQL databases",
   "main": "mapper.js",
   "types": "mapper.d.ts",
@@ -29,7 +29,7 @@
     "camelcase": "^6.3.0",
     "fastify-plugin": "^4.5.0",
     "inflected": "^2.1.0",
-    "@platformatic/types": "0.33.1"
+    "@platformatic/types": "0.34.0"
   },
   "tsd": {
     "directory": "test/types"

package/test/where.test.js

@@ -740,3 +740,145 @@ test('LIKE', async ({ pass, teardown, same, equal }) => {
 
   same(await entity.find({ where: { counter: { like: null } } }), [], 'where: { counter: { like: null } }')
 })
+
+test('ILIKE', async ({ pass, teardown, same, equal }) => {
+  const mapper = await connect({
+    ...connInfo,
+    log: fakeLogger,
+    async onDatabaseLoad (db, sql) {
+      teardown(() => db.dispose())
+      pass('onDatabaseLoad called')
+
+      await clear(db, sql)
+
+      if (isSQLite) {
+        await db.query(sql`CREATE TABLE posts (
+          id INTEGER PRIMARY KEY,
+          title VARCHAR(42),
+          long_text TEXT,
+          counter INTEGER
+        );`)
+      } else {
+        await db.query(sql`CREATE TABLE posts (
+          id SERIAL PRIMARY KEY,
+          title VARCHAR(42),
+          long_text TEXT,
+          counter INTEGER
+        );`)
+      }
+    }
+  })
+
+  const entity = mapper.entities.post
+
+  const posts = [
+    {
+      title: 'Dog',
+      longText: 'The Dog barks',
+      counter: 1
+    },
+    {
+      title: 'Cat',
+      longText: 'The Cat meows',
+      counter: 2
+    },
+    {
+      title: 'Potato',
+      longText: 'The Potato is vegetable',
+      counter: 3
+    },
+    {
+      title: 'Atmosphere',
+      longText: 'The atmosphere is not a sphere',
+      counter: 4
+    },
+    {
+      title: 'planet',
+      longText: 'The planet have atmosphere',
+      counter: 14
+    }
+  ]
+
+  await entity.insert({
+    inputs: posts
+  })
+
+  same(await entity.find({ where: { title: { ilike: '%at' } } }), [{
+    id: '2',
+    title: 'Cat',
+    longText: 'The Cat meows',
+    counter: 2
+  }], 'where: { title: { like: \'%at\' } }')
+
+  same(await entity.find({ where: { title: { ilike: '%at%' } } }), [{
+    id: '2',
+    title: 'Cat',
+    longText: 'The Cat meows',
+    counter: 2
+  },
+  {
+    id: '3',
+    title: 'Potato',
+    longText: 'The Potato is vegetable',
+    counter: 3
+  },
+  {
+    id: '4',
+    title: 'Atmosphere',
+    longText: 'The atmosphere is not a sphere',
+    counter: 4
+  }], 'where: { title: { ilike: \'%at%\' } }')
+
+  same(await entity.find({ where: { title: { ilike: 'at%' } } }), [{
+    id: '4',
+    title: 'Atmosphere',
+    longText: 'The atmosphere is not a sphere',
+    counter: 4
+  }], 'where: { title: { ilike: \'at%\' } }')
+
+  same(await entity.find({ where: { longText: { ilike: '%is%' } } }), [{
+    id: '3',
+    title: 'Potato',
+    longText: 'The Potato is vegetable',
+    counter: 3
+  },
+  {
+    id: '4',
+    title: 'Atmosphere',
+    longText: 'The atmosphere is not a sphere',
+    counter: 4
+  }], 'where: { longText: { ilike: \'%is%\' } }')
+
+  same(await entity.find({ where: { longText: { ilike: null } } }), [], 'where: { longText: { ilike: null } }')
+
+  if (!isSQLite) {
+    same(await entity.find({ where: { counter: { ilike: 4 } } }), [{
+      id: '4',
+      title: 'Atmosphere',
+      longText: 'The atmosphere is not a sphere',
+      counter: 4
+    }], 'where: { counter: { ilike: 4 } }')
+  }
+
+  same(await entity.find({ where: { counter: { ilike: '%4' } } }), [{
+    id: '4',
+    title: 'Atmosphere',
+    longText: 'The atmosphere is not a sphere',
+    counter: 4
+  },
+  {
+    id: '5',
+    title: 'planet',
+    longText: 'The planet have atmosphere',
+    counter: 14
+  }], 'where: { counter: { ilike: \'%4\' } }')
+
+  same(await entity.find({ where: { counter: { ilike: '4%' } } }), [{
+    id: '4',
+    title: 'Atmosphere',
+    longText: 'The atmosphere is not a sphere',
+    counter: 4
+  }], 'where: { counter: { ilike: \'4%\' } }')
+
+  same(await entity.find({ where: { counter: { ilike: null } } }), [], 'where: { counter: { ilike: null } }')
+})