neopg 2.2.6 → 2.2.8

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/lib/SchemaSync.js

@@ -102,9 +102,9 @@ class SchemaSync {
     for (const c of cols) inf[c.column_name] = c;
 
     await this.syncColumn(sql, def, inf, curTableName, debug, force, dropNotExistCol);
+    await this.autoRemoveIndex(sql, def, schema, tableName, debug);
     await this.syncIndex(sql, def, schema, curTableName, debug);
     await this.syncUnique(sql, def, schema, curTableName, debug);
-    await this.autoRemoveIndex(sql, def, schema, tableName, debug);
     await this.syncReferences(sql, def, schema, curTableName, schemaOid, debug, ctx, options);
 
     if (debug) console.log(` - 表结构同步完成 (${tableName}) - `);
@@ -290,6 +290,33 @@ class SchemaSync {
     const indices = def.index || [];
     if (!Array.isArray(indices)) return;
 
+    let gen_real_index = indname => {
+      let real_indexname
+      if (Array.isArray(indname)) {
+        real_indexname = indname.sort((a,b) => a.localeCompare(b)).join('_');
+      } else if (typeof indname === 'string') {
+        if (indname.indexOf(',') >= 0) {
+          real_indexname = indname.split(',').map(s=>s.trim()).filter(s=>s)
+                                .sort((a,b)=>a.localeCompare(b))
+                                .join('_');
+        } else {
+          real_indexname = indname.trim();
+        }
+      }
+
+      return real_indexname;
+    }
+
+    let unique_indexs = (def.unique || []).map(a => gen_real_index(a));
+
+    let check_in_unique = (indname) => {
+      for (let a of unique_indexs) {
+        if (a === gen_real_index(indname)) return true;
+      }
+
+      return false;
+    }
+
     for (const indname of indices) {
         const removeIndex = def.removeIndex || [];
         if (removeIndex.includes(indname)) continue;
@@ -299,7 +326,21 @@ class SchemaSync {
             continue;
         }
 
-        let idxCols = Array.isArray(indname) ? indname : indname.split(',').map(s=>s.trim()).filter(s=>s);
+        if (!Array.isArray(indname) && typeof indname !== 'string') {
+          debug && console.error(`Index ${indname} 不是字符串或数组，跳过。`);
+          continue;
+        }
+
+        if (check_in_unique(indname)) {
+          debug && console.error(`Index ${indname} 是唯一索引，不会创建index索引，跳过。`);
+          continue;
+        }
+
+        let idxCols = Array.isArray(indname)
+                     ? indname.sort((a,b) => a.localeCompare(b))
+                      : indname.split(',').map(s=>s.trim()).filter(s=>s)
+                              .sort((a,b) => a.localeCompare(b));
+
         const idxNamePart = idxCols.join('_');
         const targetIdxName = `${def.tableName}_${idxNamePart}_idx`;
 
@@ -339,7 +380,14 @@ class SchemaSync {
       for (const indname of uniques) {
           if (!this._checkColumnsExist(indname, def)) continue;
 
-          let idxCols = Array.isArray(indname) ? indname : indname.split(',').map(s=>s.trim()).filter(s=>s);
+          if (!Array.isArray(indname) && typeof indname !== 'string') {
+            debug && console.error(`Index ${indname} 不是字符串或数组，跳过。`);
+            continue;
+          }
+
+          let idxCols = Array.isArray(indname)
+                          ? indname.sort((a,b)=>a.localeCompare(b))
+                          : indname.split(',').map(s=>s.trim()).filter(s=>s).sort((a,b)=>a.localeCompare(b));
 
           // 监测是否等于主键
           if (pkSet.size > 0 && idxCols.length === pkSet.size) {
@@ -368,7 +416,7 @@ class SchemaSync {
 
   static async autoRemoveIndex(sql, def, schema, tableName, debug) {
       const allIdx = await sql`
-        SELECT indexname FROM pg_indexes 
+        SELECT * FROM pg_indexes 
         WHERE tablename = ${tableName} 
         AND schemaname = ${schema} 
         AND indexname != ${tableName + '_pkey'}
@@ -377,22 +425,51 @@ class SchemaSync {
       if (allIdx.length === 0) return;
 
       const currentIdxNames = allIdx.map(i => i.indexname);
+      let indexTable = Object.create(null);
+      for (let a of allIdx) {
+        indexTable[a.indexname] = a;
+      }
       
       const indices = def.index || [];
       const uniques = def.unique || [];
-      
-      const keepSet = new Set();
-      const makeName = (n) => `${tableName}_${Array.isArray(n) ? n.map(x=>x.trim()).join('_') : n.split(',').map(x=>x.trim()).filter(x=>x).join('_')}_idx`;
 
-      indices.forEach(n => keepSet.add(makeName(n)));
-      uniques.forEach(n => keepSet.add(makeName(n)));
+      const makeName = (n) => `${tableName}_${Array.isArray(n) 
+                        ? n.map(x=>x.trim()).sort((a,b) => a.localeCompare(b)).join('_')
+                        : n.split(',').map(x=>x.trim()).filter(x=>x).sort((a,b) => a.localeCompare(b)).join('_')}_idx`;
+
+      let allIndex = Object.create(null);
+      for (let k of indices) {
+        allIndex[makeName(k)] = k;
+      }
+
+      let allUnique = Object.create(null);
+      for (let k of uniques) {
+        allUnique[makeName(k)] = k;
+      }
 
       for (const idxName of currentIdxNames) {
-          if (!keepSet.has(idxName)) {
+          if (!allIndex[idxName] && !allUnique[idxName]) {
               if (debug) console.log('Auto removing index:', idxName);
               await sql.unsafe(`DROP INDEX ${schema}.${idxName}`);
           }
       }
+
+      for (let k in allIndex) {
+        if (!indexTable[k]) continue;
+
+        if (indexTable[k].indexdef.toLowerCase().indexOf('create index') !== 0) {
+          debug && console.log('Auto remove index with inconsistent type:', k);
+          await sql.unsafe(`DROP INDEX ${schema}.${k};`);
+        }
+      }
+
+      for (let k in allUnique) {
+        if (!indexTable[k]) continue;
+        if (indexTable[k].indexdef.toLowerCase().indexOf('create unique') !== 0) {
+          debug && console.log('Auto remove index with inconsistent type:', k);
+          await sql.unsafe(`DROP INDEX ${schema}.${k};`);
+        }
+      }
   }
 
   // --- 外键同步 ---

package/package.json

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

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')