@platformatic/sql-mapper 0.20.0 → 0.21.0

package/lib/entity.js

@@ -206,6 +206,15 @@ function createMapper (defaultDb, sql, log, table, fields, primaryKeys, relation
     const where = opts.where || {}
     const criteria = []
     for (const key of Object.keys(where)) {
+      if (key === 'or') {
+        const orCriteria = []
+        for (const orPart of where[key]) {
+          const cret = computeCriteria({ where: orPart })
+          orCriteria.push(sql`(${sql.join(cret, sql` AND `)})`)
+        }
+        criteria.push(sql`(${sql.join(orCriteria, sql` OR `)})`)
+        continue
+      }
       const value = where[key]
       const field = inputToFieldMap[key]
       for (const key of Object.keys(value)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/sql-mapper",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "A data mapper utility for SQL databases",
   "main": "mapper.js",
   "repository": {

package/test/or.test.js

@@ -0,0 +1,193 @@
+'use strict'
+
+const { test } = require('tap')
+const { connect } = require('..')
+const { clear, connInfo, isSQLite, isMysql } = require('./helper')
+const fakeLogger = {
+  trace: () => { },
+  error: () => { }
+}
+
+test('where clause with or operation', async ({ pass, teardown, same }) => {
+  const mapper = await connect({
+    ...connInfo,
+    autoTimestamp: true,
+    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 if (isMysql) {
+        await db.query(sql`CREATE TABLE posts (
+          id SERIAL 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: 'Foo',
+    counter: 10
+  }, {
+    title: 'Cat',
+    longText: 'Bar',
+    counter: 20
+  }, {
+    title: 'Mouse',
+    longText: 'Baz',
+    counter: 30
+  }, {
+    title: 'Duck',
+    longText: 'A duck tale',
+    counter: 40
+  }]
+
+  await entity.insert({
+    inputs: posts
+  })
+
+  {
+    const data = await entity.find({
+      where: {
+        or: [
+          {
+            counter: {
+              eq: 10
+            }
+          },
+          {
+            counter: {
+              eq: 20
+            }
+          }
+        ]
+      }
+    })
+
+    same(data, [
+      { id: '1', title: 'Dog', longText: 'Foo', counter: 10 },
+      { id: '2', title: 'Cat', longText: 'Bar', counter: 20 }
+    ])
+  }
+
+  {
+    const data = await entity.find({
+      where: {
+        or: [
+          {
+            counter: {
+              eq: 20
+            }
+          },
+          {
+            counter: {
+              gte: 30
+            }
+          }
+        ]
+      }
+    })
+
+    same(data, [
+      { id: '2', title: 'Cat', longText: 'Bar', counter: 20 },
+      { id: '3', title: 'Mouse', longText: 'Baz', counter: 30 },
+      { id: '4', title: 'Duck', longText: 'A duck tale', counter: 40 }
+    ])
+  }
+
+  {
+    const data = await entity.find({
+      where: {
+        or: [
+          {
+            title: {
+              eq: 'Dog'
+            }
+          },
+          {
+            title: {
+              eq: 'Duck'
+            }
+          }
+        ]
+      }
+    })
+
+    same(data, [
+      { id: '1', title: 'Dog', longText: 'Foo', counter: 10 },
+      { id: '4', title: 'Duck', longText: 'A duck tale', counter: 40 }
+    ])
+  }
+
+  {
+    const data = await entity.find({
+      where: {
+        or: [
+          {
+            title: {
+              eq: 'Dog'
+            }
+          },
+          {
+            longText: {
+              eq: 'Baz'
+            }
+          }
+        ]
+      }
+    })
+
+    same(data, [
+      { id: '1', title: 'Dog', longText: 'Foo', counter: 10 },
+      { id: '3', title: 'Mouse', longText: 'Baz', counter: 30 }
+    ])
+  }
+
+  {
+    const data = await entity.find({
+      where: {
+        counter: {
+          in: [10, 20]
+        },
+        or: [
+          {
+            title: {
+              eq: 'Dog'
+            }
+          },
+          {
+            longText: {
+              eq: 'Baz'
+            }
+          }
+        ]
+      }
+    })
+
+    same(data, [
+      { id: '1', title: 'Dog', longText: 'Foo', counter: 10 }
+    ])
+  }
+})