@opengis/fastify-table 1.3.15 → 1.3.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.3.15",
+  "version": "1.3.17",
   "type": "module",
   "description": "core-plugins",
   "keywords": [

package/server/plugins/migration/exec.sql.js

@@ -1,7 +1,10 @@
 import path from 'node:path';
+import { createHash } from 'node:crypto';
 import { existsSync, readFileSync } from 'node:fs';
 
-import { logger, pgClients } from '../../../utils.js';
+import { config, logger, pgClients, getRedis } from '../../../utils.js';
+
+const rclient = getRedis();
 
 export default async function execSql(filepath, pg = pgClients.client) {
     const start = Date.now();
@@ -21,9 +24,18 @@ export default async function execSql(filepath, pg = pgClients.client) {
 
     const sql = readFileSync(filepath, 'utf-8');
 
+    const hash = createHash('md5').update(sql).digest('hex');
+    const hashes = await rclient.hgetall(`${pg.options?.database}:migration-hashes`).then(obj => Object.keys(obj));
+
+    if (hashes.includes(hash) && !config.disableCache) {
+        console.log(filename, 'skip equal hash', Date.now() - start);
+        return null;
+    }
+
     try {
         console.log(filename, 'start', Date.now() - start);
         await pg.query(sql);
+        if (!config.disableCache) await rclient.hset(`${pg.options?.database}:migration-hashes`, hash, 1);
         console.log(filename, 'finish', Date.now() - start);
         logger.file('migration/success', {
             filepath,

package/server/routes/table/controllers/data.js

@@ -120,8 +120,8 @@ export default async function dataAPI(req, reply, called) {
   const [orderColumn, orderDir] = (query.order || loadTable?.order || '').split(/[- ]/);
 
   const order = query.order && columnList.includes(orderColumn) && orderColumn?.length
-    ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}`
-    : `order by ${(loadTable?.order || 'true::boolean')}`;
+    ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''} nulls last`
+    : `order by ${(loadTable?.order || 'true::boolean')} nulls last`;
   const search = loadTable?.meta?.search && query.search
     ? `(${loadTable?.meta?.search?.split(',')?.map(el => `${el} ilike '%${query.search.replace(/%/g, '\\%').replace(/'/g, "''")}%'`).join(' or ')})`
     : null;
@@ -142,7 +142,7 @@ export default async function dataAPI(req, reply, called) {
                       
                      ${params.id ? cardSqlTable : ''} 
                      where ${where.join(' and ') || 'true'} 
-                     ${order} ${offset}  limit ${limit}`
+                     ${order} ${offset} limit ${limit}`
     .replace(/{{uid}}/g, uid);
 
   // if (user?.user_type === 'superadmin') console.log(q);