w-orm-postgresql 1.0.2 → 1.0.3

package/src/WOrmPostgresql.mjs

@@ -19,6 +19,7 @@ import isnum from 'wsemi/src/isnum.mjs'
 import isint from 'wsemi/src/isint.mjs'
 import isbol from 'wsemi/src/isbol.mjs'
 import isDate from 'wsemi/src/isDate.mjs'
+import haskey from 'wsemi/src/haskey.mjs'
 import pmSeries from 'wsemi/src/pmSeries.mjs'
 
 
@@ -30,15 +31,16 @@ import pmSeries from 'wsemi/src/pmSeries.mjs'
  * @param {String} [opt.url='postgresql://127.0.0.1:5432'] 輸入連接資料庫字串，預設'postgresql://127.0.0.1:5432'
  * @param {String} [opt.db='worm'] 輸入使用資料庫名稱字串，預設'worm'
  * @param {String} [opt.cl='test'] 輸入使用資料表名稱字串，預設'test'
+ * @param {Boolean} [opt.useCache=false] 輸入是否使用select快取，適用於單程序操作，預設false
  * @returns {Object} 回傳操作資料庫物件，各事件功能詳見說明
  */
-function WOrmPostgresql(opt = {}) {
-
-    //_cache
-    let _cache = null
-
-    //url
-    let url = get(opt, 'url')
+function WOrmPostgresql(opt = {}) {
+
+    //_cache
+    let _cache = null
+
+    //url
+    let url = get(opt, 'url')
     if (!isestr(url)) {
         url = 'postgresql://user:password@127.0.0.1:5432'
     }
@@ -55,6 +57,12 @@ function WOrmPostgresql(opt = {}) {
         cl = 'test'
     }
 
+    //useCache
+    let useCache = get(opt, 'useCache')
+    if (!isbol(useCache)) {
+        useCache = false
+    }
+
     //getValueType
     function getValueType(value) {
         if (isstr(value)) {
@@ -143,43 +151,43 @@ function WOrmPostgresql(opt = {}) {
     //ee
     let ee = new events.EventEmitter()
 
-    //PgClient
-    let PgClient = pg.Client
-    // console.log('PgClient', PgClient)
-
-    //clearCache
-    function clearCache() {
-        _cache = null
-    }
-
-    //getCacheKey
-    function getCacheKey(find = {}, order = {}) {
-        return JSON.stringify({
-            find,
-            order,
-        })
-    }
-
-    //getCache
-    function getCache(find = {}, order = {}) {
-        if (iseobj(_cache)) {
-            let key = getCacheKey(find, order)
-            if (Object.prototype.hasOwnProperty.call(_cache, key)) {
-                return cloneDeep(_cache[key]) //與外部使用數據脫勾
-            }
-        }
-        return null
-    }
-
-    //setCache
-    function setCache(find = {}, order = {}, data = []) {
-        if (!iseobj(_cache)) {
-            _cache = {}
-        }
-        let key = getCacheKey(find, order)
-        _cache[key] = cloneDeep(data) //與外部使用數據脫勾
-    }
-
+    //PgClient
+    let PgClient = pg.Client
+    // console.log('PgClient', PgClient)
+
+    //clearCache
+    function clearCache() {
+        _cache = null
+    }
+
+    //getCacheKey
+    function getCacheKey(find = {}, order = {}) {
+        return JSON.stringify({
+            find,
+            order,
+        })
+    }
+
+    //getCache
+    function getCache(find = {}, order = {}) {
+        if (iseobj(_cache)) {
+            let key = getCacheKey(find, order)
+            if (haskey(_cache, key)) {
+                return cloneDeep(_cache[key]) //與外部使用數據脫勾
+            }
+        }
+        return null
+    }
+
+    //setCache
+    function setCache(find = {}, order = {}, data = []) {
+        if (!iseobj(_cache)) {
+            _cache = {}
+        }
+        let key = getCacheKey(find, order)
+        _cache[key] = cloneDeep(data) //與外部使用數據脫勾
+    }
+
     /**
      * 創建資料表
      *
@@ -251,15 +259,17 @@ function WOrmPostgresql(opt = {}) {
         finally {
             await client.end()
             client = null
-        }
-        // console.log('res', res)
-
-        //update
-        clearCache()
-
-        //check
-        if (isErr) {
-            return Promise.reject(res)
+        }
+        // console.log('res', res)
+
+        //update
+        if (useCache) {
+            clearCache()
+        }
+
+        //check
+        if (isErr) {
+            return Promise.reject(res)
         }
 
         return res
@@ -273,18 +283,20 @@ function WOrmPostgresql(opt = {}) {
      * @param {Object} [order={}] 輸入排序條件物件
      * @returns {Promise} 回傳Promise，resolve回傳數據，reject回傳錯誤訊息
      */
-    async function select(find = {}, order = {}) {
-        let isErr = false
-        let res = null
-
-        //cache
-        let cache = getCache(find, order)
-        if (isarr(cache)) {
-            return cache
-        }
-
-        //client
-        let client = new PgClient({ connectionString })
+    async function select(find = {}, order = {}) {
+        let isErr = false
+        let res = null
+
+        //cache
+        if (useCache) {
+            let cache = getCache(find, order)
+            if (isarr(cache)) {
+                return cache
+            }
+        }
+
+        //client
+        let client = new PgClient({ connectionString })
 
         //connect
         try {
@@ -326,17 +338,17 @@ function WOrmPostgresql(opt = {}) {
             res = get(r, 'rows')
 
             //check
-            if (!isarr(res)) {
-                isErr = true
-                res = `can not select by find[${JSON.stringify(find)}]`
-            }
-
-            //cache
-            if (!isErr) {
-                setCache(find, order, res)
-            }
-
-        }
+            if (!isarr(res)) {
+                isErr = true
+                res = `can not select by find[${JSON.stringify(find)}]`
+            }
+
+            //cache
+            if (useCache && !isErr) {
+                setCache(find, order, res)
+            }
+
+        }
         catch (err) {
             isErr = true
             res = err
@@ -433,17 +445,17 @@ function WOrmPostgresql(opt = {}) {
                 .then(() => {
 
                     //res
-                    res = {
-                        n: nAll,
-                        nInserted: nInsert,
-                        ok: 1,
-                    }
-
-                })
-                .catch((err) => {
-                    isErr = true
-                    res = err.message
-                })
+                    res = {
+                        n: nAll,
+                        nInserted: nInsert,
+                        ok: 1,
+                    }
+
+                })
+                .catch((err) => {
+                    isErr = true
+                    res = err.message
+                })
 
         }
         catch (err) {
@@ -451,26 +463,28 @@ function WOrmPostgresql(opt = {}) {
             res = err
         }
         finally {
-            await client.end()
-            client = null
-        }
-
-        //update
-        clearCache()
-
-        //emit
-        if (!isErr) {
-            try {
-                ee.emit('change', 'insert', data, res)
-            }
-            catch (err) {
-                console.log(err)
-            }
-        }
-
-        //check
-        if (isErr) {
-            return Promise.reject(res)
+            await client.end()
+            client = null
+        }
+
+        //update
+        if (useCache) {
+            clearCache()
+        }
+
+        //emit
+        if (!isErr) {
+            try {
+                ee.emit('change', 'insert', data, res)
+            }
+            catch (err) {
+                console.log(err)
+            }
+        }
+
+        //check
+        if (isErr) {
+            return Promise.reject(res)
         }
 
         return res
@@ -698,35 +712,37 @@ function WOrmPostgresql(opt = {}) {
 
                 }
 
-                return rest
-            })
-
-        }
-        catch (err) {
-            isErr = true
-            res = err
-        }
+                return rest
+            })
+
+        }
+        catch (err) {
+            isErr = true
+            res = err
+        }
         finally {
-            await client.end()
-            client = null
-        }
-
-        //update
-        clearCache()
-
-        //emit
-        if (!isErr) {
-            try {
-                ee.emit('change', 'save', data, res)
-            }
-            catch (err) {
-                console.log(err)
-            }
-        }
-
-        //check
-        if (isErr) {
-            return Promise.reject(res)
+            await client.end()
+            client = null
+        }
+
+        //update
+        if (useCache) {
+            clearCache()
+        }
+
+        //emit
+        if (!isErr) {
+            try {
+                ee.emit('change', 'save', data, res)
+            }
+            catch (err) {
+                console.log(err)
+            }
+        }
+
+        //check
+        if (isErr) {
+            return Promise.reject(res)
         }
 
         return res
@@ -832,36 +848,38 @@ function WOrmPostgresql(opt = {}) {
                         }
 
                     })
-
-                return rest
-            })
-
-        }
-        catch (err) {
-            isErr = true
-            res = err
-        }
+
+                return rest
+            })
+
+        }
+        catch (err) {
+            isErr = true
+            res = err
+        }
         finally {
-            await client.end()
-            client = null
-        }
-
-        //update
-        clearCache()
-
-        //emit
-        if (!isErr) {
-            try {
-                ee.emit('change', 'del', data, res)
-            }
-            catch (err) {
-                console.log(err)
-            }
-        }
-
-        //check
-        if (isErr) {
-            return Promise.reject(res)
+            await client.end()
+            client = null
+        }
+
+        //update
+        if (useCache) {
+            clearCache()
+        }
+
+        //emit
+        if (!isErr) {
+            try {
+                ee.emit('change', 'del', data, res)
+            }
+            catch (err) {
+                console.log(err)
+            }
+        }
+
+        //check
+        if (isErr) {
+            return Promise.reject(res)
         }
 
         return res
@@ -930,17 +948,17 @@ function WOrmPostgresql(opt = {}) {
                 .then((r) => {
 
                     //res
-                    res = {
-                        n: r.rowCount,
-                        nDeleted: r.rowCount,
-                        ok: 1,
-                    }
-
-                })
-                .catch((err) => {
-                    isErr = true
-                    res = err.message
-                })
+                    res = {
+                        n: r.rowCount,
+                        nDeleted: r.rowCount,
+                        ok: 1,
+                    }
+
+                })
+                .catch((err) => {
+                    isErr = true
+                    res = err.message
+                })
 
         }
         catch (err) {
@@ -948,26 +966,28 @@ function WOrmPostgresql(opt = {}) {
             res = err
         }
         finally {
-            await client.end()
-            client = null
-        }
-
-        //update
-        clearCache()
-
-        //emit
-        if (!isErr) {
-            try {
-                ee.emit('change', 'delAll', null, res)
-            }
-            catch (err) {
-                console.log(err)
-            }
-        }
-
-        //check
-        if (isErr) {
-            return Promise.reject(res)
+            await client.end()
+            client = null
+        }
+
+        //update
+        if (useCache) {
+            clearCache()
+        }
+
+        //emit
+        if (!isErr) {
+            try {
+                ee.emit('change', 'delAll', null, res)
+            }
+            catch (err) {
+                console.log(err)
+            }
+        }
+
+        //check
+        if (isErr) {
+            return Promise.reject(res)
         }
 
         return res