neopg 2.2.3 → 2.2.4

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.3",
+  "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'
   ],
 
   //唯一索引