Merge branch 'develop' into feat/pnpm

packages/nc-lib-gui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nc-lib-gui",
-  "version": "0.109.3",
+  "version": "0.109.4",
   "description": "NocoDB GUI",
   "author": {
     "name": "NocoDB",

packages/nocodb-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nocodb-sdk",
-  "version": "0.109.3",
+  "version": "0.109.4",
   "description": "NocoDB SDK",
   "main": "build/main/index.js",
   "typings": "build/main/index.d.ts",

packages/nocodb/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nocodb",
-  "version": "0.109.3",
+  "version": "0.109.4",
   "description": "NocoDB Backend",
   "main": "dist/bundle.js",
   "author": {
@@ -119,7 +119,7 @@
     "mysql2": "^3.2.0",
     "nanoid": "^3.1.20",
     "nc-help": "^0.2.88",
-    "nc-lib-gui": "0.109.3",
+    "nc-lib-gui": "0.109.4",
     "nc-plugin": "^0.1.3",
     "ncp": "^2.0.0",
     "nocodb-sdk": "file:../nocodb-sdk",

packages/nocodb/src/db/BaseModelSqlv2.ts

@@ -3966,7 +3966,25 @@ function _wherePk(primaryKeys: Column[], id) {
   const ids = (id + '').split('___');
   const where = {};
   for (let i = 0; i < primaryKeys.length; ++i) {
-    where[primaryKeys[i].column_name] = ids[i];
+    //Cast the id to string.
+    const idAsString = ids[i] + '';
+    // Check if the id is a UUID and the column is binary(16)
+    const isUUIDBinary16 =
+      primaryKeys[i].ct === 'binary(16)' &&
+      (idAsString.length === 36 || idAsString.length === 32);
+    // If the id is a UUID and the column is binary(16), convert the id to a Buffer. Otherwise, return null to indicate that the id is not a UUID.
+    const idAsUUID = isUUIDBinary16
+      ? idAsString.length === 32
+        ? idAsString.replace(
+            /(.{8})(.{4})(.{4})(.{4})(.{12})/,
+            '$1-$2-$3-$4-$5',
+          )
+        : idAsString
+      : null;
+
+    where[primaryKeys[i].column_name] = idAsUUID
+      ? Buffer.from(idAsUUID.replace(/-/g, ''), 'hex')
+      : ids[i];
   }
   return where;
 }

packages/nocodb/src/db/conditionV2.ts

@@ -419,6 +419,8 @@ const parseConditionV2 = async (
                 ].includes(column.uidt)
               ) {
                 qb = qb.where(field, val);
+              } else if (column.ct === 'timestamp') {
+                qb = qb.whereRaw('DATE(??) = DATE(?)', [field, val]);
               } else {
                 // mysql is case-insensitive for strings, turn to case-sensitive
                 qb = qb.whereRaw('BINARY ?? = ?', [field, val]);

packages/nocodb/src/models/Column.ts

@@ -1075,6 +1075,30 @@ export default class Column<T = any> implements ColumnType {
       // set cache
       await NocoCache.set(key, o);
     }
+
+    // get model column list from cache
+    const columnListFromCache = await NocoCache.getList(CacheScope.COLUMN, [
+      oldCol.fk_model_id,
+    ]);
+
+    // update column list in cache if cache exists
+    if (!columnListFromCache.list?.length) {
+      const updatedColumnList = columnListFromCache.list.map((column: any) => {
+        if (column.id === colId) {
+          return {
+            ...column,
+            ...updateObj,
+          };
+        }
+        return column;
+      });
+      await NocoCache.setList(
+        CacheScope.COLUMN,
+        [oldCol.fk_model_id],
+        updatedColumnList,
+      );
+    }
+
     // set meta
     await ncMeta.metaUpdate(
       null,

packages/nocodb/src/services/meta-diffs.service.ts

@@ -17,6 +17,7 @@ export enum MetaDiffType {
   TABLE_REMOVE = 'TABLE_REMOVE',
   TABLE_COLUMN_ADD = 'TABLE_COLUMN_ADD',
   TABLE_COLUMN_TYPE_CHANGE = 'TABLE_COLUMN_TYPE_CHANGE',
+  TABLE_COLUMN_PROPS_CHANGED = 'TABLE_COLUMN_PROPS_CHANGED',
   TABLE_COLUMN_REMOVE = 'TABLE_COLUMN_REMOVE',
   VIEW_NEW = 'VIEW_NEW',
   VIEW_REMOVE = 'VIEW_REMOVE',
@@ -103,6 +104,15 @@ type MetaDiffChange = {
       relationType: RelationTypes;
       cstn?: string;
     }
+  | {
+      type: MetaDiffType.TABLE_COLUMN_PROPS_CHANGED;
+      tn?: string;
+      model?: Model;
+      id?: string;
+      cn: string;
+      column: Column;
+      colId?: string;
+    }
 );
 
 @Injectable()
@@ -217,6 +227,21 @@ export class MetaDiffsService {
             column: oldCol,
           });
         }
+        if (
+          !!oldCol.pk !== !!column.pk ||
+          !!oldCol.rqd !== !!column.rqd ||
+          !!oldCol.un !== !!column.un ||
+          !!oldCol.ai !== !!column.ai ||
+          !!oldCol.unique !== !!column.unique
+        ) {
+          tableProp.detectedChanges.push({
+            type: MetaDiffType.TABLE_COLUMN_PROPS_CHANGED,
+            msg: `Column properties changed (${column.cn})`,
+            cn: oldCol.column_name,
+            id: oldMeta.id,
+            column: oldCol,
+          });
+        }
       }
       for (const column of oldMeta.columns) {
         if (
@@ -688,6 +713,23 @@ export class MetaDiffsService {
                 await Column.update(change.column.id, column);
               }
               break;
+            case MetaDiffType.TABLE_COLUMN_PROPS_CHANGED:
+              {
+                const columns = (
+                  await sqlClient.columnList({ tn: table_name })
+                )?.data?.list?.map((c) => ({ ...c, column_name: c.cn }));
+                const colMeta = columns.find((c) => c.cn === change.cn);
+                if (!colMeta) break;
+                const { pk, ai, rqd, un, unique } = colMeta;
+                await Column.update(change.column.id, {
+                  pk,
+                  ai,
+                  rqd,
+                  un,
+                  unique,
+                });
+              }
+              break;
             case MetaDiffType.TABLE_COLUMN_REMOVE:
             case MetaDiffType.VIEW_COLUMN_REMOVE:
               await change.column.delete();
@@ -884,6 +926,23 @@ export class MetaDiffsService {
               await Column.update(change.column.id, column);
             }
             break;
+          case MetaDiffType.TABLE_COLUMN_PROPS_CHANGED:
+            {
+              const columns = (
+                await sqlClient.columnList({ tn: table_name })
+              )?.data?.list?.map((c) => ({ ...c, column_name: c.cn }));
+              const colMeta = columns.find((c) => c.cn === change.cn);
+              if (!colMeta) break;
+              const { pk, ai, rqd, un, unique } = colMeta;
+              await Column.update(change.column.id, {
+                pk,
+                ai,
+                rqd,
+                un,
+                unique,
+              });
+            }
+            break;
           case MetaDiffType.TABLE_COLUMN_REMOVE:
           case MetaDiffType.VIEW_COLUMN_REMOVE:
             await change.column.delete();

packages/nocodb/src/services/users/users.service.ts

@@ -503,7 +503,7 @@ export class UsersService {
       if (user?.id) {
         await User.update(user.id, {
           refresh_token: null,
-          token_version: null,
+          token_version: randomTokenString(),
         });
       }
       return { msg: 'Signed out successfully' };