w-orm-postgresql 1.0.2 → 1.0.4

package/g-basic.mjs

@@ -76,7 +76,7 @@ let rs = [
     },
 ]
 
-let rsm = [
+let rsm = [
     { //相同
         time: '2025-01-01T00:09:00Z',
         name: 'peter',
@@ -100,17 +100,17 @@ let rsm = [
     { //無time須新增且新增數據無value
         time: '2025-01-01T00:13:00Z',
         name: 'sandler',
-    },
-]
-
-let rsa = [
-    {
-        time: '2025-01-01T00:13:00Z',
-        name: 'sandler',
-    },
-]
-
-async function test() {
+    },
+]
+
+let rsa = [
+    {
+        time: '2025-01-01T00:13:00Z',
+        name: 'sandler',
+    },
+]
+
+async function test() {
 
     //wo
     let wo = WOrm(opt)
@@ -151,18 +151,18 @@ async function test() {
             console.log('insert catch', msg)
         })
 
-    //save
-    await wo.save(rsm, { autoInsert: false })
-        .then(function(msg) {
-            console.log('save then', msg)
-        })
-        .catch(function(msg) {
-            console.log('save catch', msg)
-        })
-
-    //select all
-    let ss = await wo.select()
-    console.log('select all', ss)
+    //save
+    await wo.save(rsm, { autoInsert: false })
+        .then(function(msg) {
+            console.log('save then', msg)
+        })
+        .catch(function(msg) {
+            console.log('save catch', msg)
+        })
+
+    //select all
+    let ss = await wo.select()
+    console.log('select all', ss)
 
     //select
     let so = await wo.select({ name: 'rosemary' })
@@ -180,22 +180,22 @@ async function test() {
     let spc = await wo.select({ '$or': [{ '$and': [{ value: { '$ne': 123 } }, { value: { '$in': [123, 321, 123.456, 456] } }, { value: { '$nin': [456, 654] } }] }, { '$or': [{ value: { '$lte': -1 } }, { value: { '$gte': 400 } }] }] })
     console.log('select by $or, $and, $ne, $in, $nin', spc)
 
-    // //select by regex
-    // let sr = await wo.select({ name: { $regex: 'PeT', $options: '$i' } })
-    // console.log('selectReg', sr)
-
-    //save
-    await wo.save(rsa, { autoInsert: true })
-        .then(function(msg) {
-            console.log('save then', msg)
-        })
-        .catch(function(msg) {
-            console.log('save catch', msg)
-        })
-
-    //del
-    let d = {
-        time: '2024-01-01T00:00:00Z',
+    // //select by regex
+    // let sr = await wo.select({ name: { $regex: 'PeT', $options: '$i' } })
+    // console.log('selectReg', sr)
+
+    //save
+    await wo.save(rsa, { autoInsert: true })
+        .then(function(msg) {
+            console.log('save then', msg)
+        })
+        .catch(function(msg) {
+            console.log('save catch', msg)
+        })
+
+    //del
+    let d = {
+        time: '2024-01-01T00:00:00Z',
     }
     await wo.del(d)
         .then(function(msg) {
@@ -203,13 +203,13 @@ async function test() {
         })
         .catch(function(msg) {
             console.log('del catch', msg)
-        })
-
-    //del
-    let ssDel = await wo.select()
-    let ds = ssDel.filter(function(v) {
-        return v.name.indexOf('peter') >= 0 || v.name.indexOf('kettle') >= 0 || v.name.indexOf('sandler') >= 0
-    })
+        })
+
+    //del
+    let ssDel = await wo.select()
+    let ds = ssDel.filter(function(v) {
+        return v.name.indexOf('peter') >= 0 || v.name.indexOf('kettle') >= 0 || v.name.indexOf('sandler') >= 0
+    })
     await wo.del(ds)
         .then(function(msg) {
             console.log('del then', msg)
@@ -222,6 +222,68 @@ async function test() {
     let ss2 = await wo.select()
     console.log('select all final', ss2)
 
+    //清除數據, 後續cache測試共用users表
+    await wo.delAll()
+
+    //woc, 啟用useCache
+    let woc = WOrm({
+        ...opt,
+        useCache: true,
+    })
+
+    let rsc = [
+        {
+            time: '2025-01-01T00:00:00Z',
+            name: 'peter',
+            value: 123,
+        },
+        {
+            time: '2025-01-01T00:01:00Z',
+            name: 'rosemary',
+            value: 123.456,
+        },
+        {
+            time: '2025-01-01T00:02:00Z',
+            name: 'kettle',
+            value: 456,
+        },
+    ]
+
+    let rscm = [
+        {
+            time: '2025-01-01T00:01:00Z',
+            name: 'rosemary(modify)',
+            value: 654.321,
+        },
+    ]
+
+    //insert
+    await woc.insert(rsc)
+
+    //select all (1st time, 從DB讀取並填入快取)
+    let sc1 = await woc.select()
+    sc1 = sc1.sort((a, b) => a.time - b.time)
+    console.log('select all 1st (fill cache)', sc1)
+
+    //select all (2nd time, 命中快取, 內容須與第一次相同)
+    let sc2 = await woc.select()
+    sc2 = sc2.sort((a, b) => a.time - b.time)
+    console.log('select all 2nd (cache hit)', sc2)
+
+    //save (更新rosemary, 觸發快取重設)
+    await woc.save(rscm, { autoInsert: false })
+        .then(function(msg) {
+            console.log('save (invalidate cache) then', msg)
+        })
+        .catch(function(msg) {
+            console.log('save (invalidate cache) catch', msg)
+        })
+
+    //select all (3rd time, 快取已重設, 從DB重新讀取, 須反映rosemary更新)
+    let sc3 = await woc.select()
+    sc3 = sc3.sort((a, b) => a.time - b.time)
+    console.log('select all 3rd (reload after save)', sc3)
+
 }
 test()
 // change delAll
@@ -230,13 +292,13 @@ test()
 // insert then { n: 13, nInserted: 13, ok: 1 }
 // change save
 // save then [
-//   { n: 1, nModified: 0, ok: 1 },
-//   { n: 1, nModified: 1, ok: 1 },
-//   { n: 1, nModified: 1, ok: 1 },
-//   { n: 1, nModified: 1, ok: 1 },
-//   { n: 0, nModified: 0, ok: 1 }
-// ]
-// select all [
+//   { n: 1, nModified: 0, ok: 1 },
+//   { n: 1, nModified: 1, ok: 1 },
+//   { n: 1, nModified: 1, ok: 1 },
+//   { n: 1, nModified: 1, ok: 1 },
+//   { n: 0, nModified: 0, ok: 1 }
+// ]
+// select all [
 //   { time: 2025-01-01T00:00:00.000Z, name: 'peter', value: 123 },
 //   { time: 2025-01-01T00:01:00.000Z, name: 'rosemary', value: 123.456 },
 //   { time: 2025-01-01T00:02:00.000Z, name: 'kettle', value: 456 },
@@ -255,10 +317,10 @@ test()
 //   {
 //     time: 2025-01-01T00:11:00.000Z,
 //     name: 'kettle(modify)',
-//     value: 447
-//   },
-//   { time: 2025-01-01T00:12:00.000Z, name: 'peter', value: 99 }
-// ]
+//     value: 447
+//   },
+//   { time: 2025-01-01T00:12:00.000Z, name: 'peter', value: 99 }
+// ]
 // select by name [
 //   { time: 2025-01-01T00:01:00.000Z, name: 'rosemary', value: 123.456 },
 //   { time: 2025-01-01T00:04:00.000Z, name: 'rosemary', value: 123.1236 },
@@ -290,13 +352,13 @@ test()
 //   {
 //     time: 2025-01-01T00:11:00.000Z,
 //     name: 'kettle(modify)',
-//     value: 447
-//   }
-// ]
-// change save
-// save then [ { n: 1, nInserted: 1, ok: 1 } ]
-// change del
-// del then [ { n: 1, nDeleted: 0, ok: 1 } ]
+//     value: 447
+//   }
+// ]
+// change save
+// save then [ { n: 1, nInserted: 1, ok: 1 } ]
+// change del
+// del then [ { n: 1, nDeleted: 0, ok: 1 } ]
 // change del
 // del then [
 //   { n: 1, nDeleted: 1, ok: 1 },
@@ -320,5 +382,26 @@ test()
 //     value: 113.98
 //   }
 // ]
+// change delAll
+// select all 1st (fill cache) [
+//   { time: 2025-01-01T00:00:00.000Z, name: 'peter', value: 123 },
+//   { time: 2025-01-01T00:01:00.000Z, name: 'rosemary', value: 123.456 },
+//   { time: 2025-01-01T00:02:00.000Z, name: 'kettle', value: 456 }
+// ]
+// select all 2nd (cache hit) [
+//   { time: 2025-01-01T00:00:00.000Z, name: 'peter', value: 123 },
+//   { time: 2025-01-01T00:01:00.000Z, name: 'rosemary', value: 123.456 },
+//   { time: 2025-01-01T00:02:00.000Z, name: 'kettle', value: 456 }
+// ]
+// save (invalidate cache) then [ { n: 1, nModified: 1, ok: 1 } ]
+// select all 3rd (reload after save) [
+//   { time: 2025-01-01T00:00:00.000Z, name: 'peter', value: 123 },
+//   {
+//     time: 2025-01-01T00:01:00.000Z,
+//     name: 'rosemary(modify)',
+//     value: 654.321
+//   },
+//   { time: 2025-01-01T00:02:00.000Z, name: 'kettle', value: 456 }
+// ]
 
 //node g-basic.mjs

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "w-orm-postgresql",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "main": "dist/w-orm-postgresql.umd.js",
   "dependencies": {
     "mongo-sql": "^6.2.0",
     "pg": "^8.20.0",
     "lodash-es": "^4.18.1",
-    "wsemi": "^1.8.52"
+    "wsemi": "^1.8.66"
   },
   "devDependencies": {
-    "w-package-tools": "^1.1.5"
+    "w-package-tools": "^1.1.11"
   },
   "scripts": {
     "test": "mocha --parallel --timeout 60000",