neopg 2.2.5 → 2.2.7

package/lib/ModelChain.js

@@ -198,8 +198,16 @@ class ModelChain {
           const v = arg1[k]
           if (v === undefined) continue
           if (v === null) this._conditions.push(this.sql`${this.sql(k)} IS NULL`)
-          else if (Array.isArray(v)) this._conditions.push(this.sql`${this.sql(k)} IN ${this.sql(v)}`)
-          else this._conditions.push(this.sql`${this.sql(k)} = ${v}`)
+          else if (Array.isArray(v)) {
+            //this._conditions.push(this.sql`${this.sql(k)} IN ${this.sql(v)}`)
+            if (v.length === 0) {
+              // 性能优化：空数组直接在应用层生成 FALSE，不触发数据库复杂的数组运算
+              this._conditions.push(this.sql`FALSE`)
+            } else {
+              // 在 postgres.js 中，${v} 会被转换为 Postgres 数组变量 $1
+              this._conditions.push(this.sql`${this.sql(k)} = ANY(${v})`)
+            }
+          } else this._conditions.push(this.sql`${this.sql(k)} = ${v}`)
         }
         return this
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neopg",
-  "version": "2.2.5",
+  "version": "2.2.7",
   "description": "orm for postgres",
   "keywords": [
     "neopg",

package/postgres/connection.js

@@ -350,7 +350,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
   }
 
   function reconnect() {
-    setTimeout(connect, closedDate ? closedDate + delay - performance.now() : 0)
+    setTimeout(connect, closedDate ? Math.max(0, closedDate + delay - performance.now()) : 0)
   }
 
   function connected() {

package/test/test-db.js

@@ -130,6 +130,11 @@ const User = {
       type: dataTypes.POINT,
       default: '(0,0)',
       indexType: 'GiST'
+    },
+
+    role: {
+      type: dataTypes.STRING(16),
+      default: 'user'
     }
   },
 
@@ -213,6 +218,7 @@ db.add(User)
   console.log('test has', db.has('User'))
 
   await db.model('ShopOrder').where('1=1').delete()
+
   await db.model('ShopOrder').insert([
     {
       name: 'topbit',
@@ -222,6 +228,10 @@ db.add(User)
     {
       name: 'neopg',
       order_no: Math.random().toString(16)
+    },
+    {
+      name: 'hydra-thread',
+      order_no: Math.random().toString(16)
     }
   ])
 
@@ -240,20 +250,23 @@ db.add(User)
                   username: 'Neo',
                   email: '123@w.com',
                   sex: 1,
-                  level: Math.floor((Math.random() * 105))
+                  level: Math.floor((Math.random() * 105)),
+                  role: 'user'
                 },
                 {
                   username: 'PG',
                   email: '1234@w.com',
                   sex: 2,
-                  level: Math.floor((Math.random() * 100))
+                  level: Math.floor((Math.random() * 100)),
+                  role: 'db'
                 },
 
                 {
                   username: 'NPG',
                   email: '1235@w.com',
                   sex: 3,
-                  level: 3
+                  level: 3,
+                  role: 'test'
                 }
             ])
     )
@@ -294,6 +307,16 @@ db.add(User)
       await tx.model('User').group('level').select(tx.sql`level, MAX(username) as username`).findAndCount()
     )
 
+    console.log(
+      'test for any (role in ...)',
+      await tx.model('User').where({role: ['test', 'db']}).find()
+    )
+
+    console.log(
+      'test for any (empty)',
+      await tx.model('User').where({role: []}).find()
+    )
+
     console.log(
       'test avg',
       await tx.model('User').avg('level')