neopg 2.2.2 → 2.2.4

package/README.cn.md

@@ -263,7 +263,10 @@ const users = await db.model('User')
 const user = await db.model('User').where({ id: '123' }).get();
 
 // 分页查询
-const page2 = await db.model('User').page(2, 20).find(); // 第 2 页，每页 20 条
+const page2 = await db.model('User')
+                      .select(['id', 'username', 'level'])
+                      .page(2, 20)
+                      .find(); // 第 2 页，每页 20 条
 ```
 
 ### 链式 Where 条件
@@ -276,6 +279,7 @@ await db.model('User')
   })
   .where('create_time', '>', 1600000000)
   .where('id IS NOT NULL')
+  .select(db.sql`id, username, role`)
   .find()
 ```
 

package/README.md

@@ -261,7 +261,10 @@ const users = await db.model('User')
 const user = await db.model('User').where({ id: '123' }).get();
 
 // Pagination
-const page2 = await db.model('User').page(2, 20).find(); // Page 2, Size 20
+const page2 = await db.model('User')
+                      .select(['id', 'username', 'role'])
+                      .page(2, 20)
+                      .find(); // Page 2, Size 20
 ```
 
 ### Chained Where
@@ -274,6 +277,7 @@ await db.model('User')
   })
   .where('create_time', '>', 1600000000)
   .where('id IS NOT NULL')
+  .select(db.sql`id, username, role`)
   .find()
 ```
 

package/lib/ModelChain.js

@@ -90,11 +90,19 @@ class ModelChain {
 
   select(columns) {
     if (!columns) return this
-    if (typeof columns === 'string') {
-        this._columns = columns.split(',').map(s => s.trim())
-    } else if (Array.isArray(columns)) {
-        this._columns = columns
+
+    // 1. 判断是否为 postgres.js 的原生 SQL 片段 (Tag Function 返回的对象)
+    // 如果不是数组且具备 Query 构造器特征，认为是开发者手写的 sql`...` 片段
+    if (!Array.isArray(columns) && typeof columns === 'object' && columns.constructor?.name === 'Query') {
+      this._columns = columns
+    }
+    else if (typeof columns === 'string') {
+      this._columns = columns.split(',').map(s => s.trim()).filter(Boolean)
     }
+    else if (Array.isArray(columns)) {
+      this._columns = columns
+    }
+
     return this
   }
 
@@ -163,11 +171,10 @@ class ModelChain {
     }
     if (typeof arg === 'string') {
       if (arg.includes(',')) {
-        arg.split(',').map(s => s.trim()).filter(s=>s).forEach(s => {
-          this._group.push(this.sql(s))
-        })
+        const parts = arg.split(',').map(s => s.trim()).filter(Boolean)
+        this._group.push(...parts)
       } else {
-        this._group.push(this.sql(arg))
+        this._group.push(arg)
       }
     }
     return this
@@ -268,14 +275,24 @@ class ModelChain {
 
   _buildGroup() {
     if (this._group.length === 0) return this.sql``
-    return this.sql`GROUP BY ${this._group}`
+    return this.sql`GROUP BY ${this.sql(this._group)}`
   }
 
   _buildSelectQuery() {
     const t = this.sql(this.def.tableName)
-    const c = this._columns
-              ? ((this._columns.length===1 && this._columns[0] === '*') ? this.sql`*` : this.sql(this._columns))
-              : this.sql`*`
+    let c
+    if (Array.isArray(this._columns)) {
+      if ((this._columns.length === 1 && this._columns[0] === '*') || this._columns.length === 0) {
+        c = this.sql`*`
+      } else {
+        c = this.sql(this._columns)
+      }
+    } else if (this._columns) {
+      // 如果是 sql`...` 片段，直接使用，不加任何额外处理
+      c = this._columns
+    } else {
+      c = this.sql`*`
+    }
 
     const w = this._buildWhere()
     const o = this._buildOrder()

package/lib/SchemaSync.js

@@ -311,7 +311,17 @@ class SchemaSync {
         `;
 
         if (exist.length > 0) continue;
-        await sql.unsafe(`CREATE INDEX ON ${curTableName} (${idxCols.map(c=>this.fmtColName(c)).join(',')})`);
+        let using_text = '';
+        if (typeof indname === 'string' && def.columns[indname]) {
+          if (!def.columns[indname].indexType) {
+            if (def.columns[indname].type.toLowerCase() === 'jsonb' || def.columns[indname].type.includes('[')) {
+              using_text = `USING GIN`;
+            }
+          } else {
+            using_text = `USING ${def.columns[indname].indexType}`;
+          }
+        }
+        await sql.unsafe(`CREATE INDEX ${targetIdxName} ON ${curTableName} ${using_text} (${idxCols.map(c=>this.fmtColName(c)).join(',')})`);
     }
   }
 
@@ -352,7 +362,7 @@ class SchemaSync {
 
           if (exist.length > 0) continue;
 
-          await sql.unsafe(`CREATE UNIQUE INDEX ON ${curTableName} (${idxCols.map(c=>this.fmtColName(c)).join(',')})`);
+          await sql.unsafe(`CREATE UNIQUE INDEX ${targetIdxName} ON ${curTableName} (${idxCols.map(c=>this.fmtColName(c)).join(',')})`);
       }
   }
 

package/lib/dataTypes.js

@@ -45,6 +45,15 @@ let types = {
   SERIAL: 'serial',
   BIGSERIAL: 'bigserial',
   BigSerial: 'bigserial',
+
+  //几何类型
+  POINT: 'point',
+  LINE: 'LINE',
+  LSEG: 'lseg',
+  BOX: 'box',
+  PATH: 'path',
+  POLYGON: 'polygon',
+  CIRCLE: 'circle'
 }
 
 types.DECIMAL = types.NUMBER

package/package.json

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

package/test/test-db.js

@@ -122,6 +122,14 @@ const User = {
     is_root: {
       type: dataTypes.SMALLINT,
       default: 0
+    },
+    skills: {
+      type: dataTypes.ARRAY(dataTypes.STRING(30))
+    },
+    points: {
+      type: dataTypes.POINT,
+      default: '(0,0)',
+      indexType: 'GiST'
     }
   },
 
@@ -130,7 +138,9 @@ const User = {
     'create_time',
     'level',
     'is_root',
-    ['level', 'is_root']
+    ['level', 'is_root'],
+    'skills',
+    'points'
   ],
 
   //唯一索引
@@ -278,6 +288,11 @@ db.add(User)
       'test select * count',
       await tx.model('User').select('*').findAndCount()
     )
+    
+    console.log(
+      'test select  group',
+      await tx.model('User').group('level').select(tx.sql`level, MAX(username) as username`).findAndCount()
+    )
 
     console.log(
       'test avg',