From 1240f9e5f3d6a36e7dfa663e37a3de71cfd3e6b5 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Thu, 4 Jan 2024 13:19:29 +0000 Subject: [PATCH] fix: remove default value from CreatedTime field since it's programmatically generated --- packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts | 3 +-- packages/nocodb-sdk/src/lib/sqlUi/MysqlUi.ts | 4 +--- packages/nocodb-sdk/src/lib/sqlUi/PgUi.ts | 3 +-- packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts | 3 +-- packages/nocodb-sdk/src/lib/sqlUi/SqliteUi.ts | 3 +-- .../version-upgrader/ncXcdbCreatedAndUpdatedTimeUpgrader.ts | 3 ++- 6 files changed, 7 insertions(+), 12 deletions(-) diff --git a/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts index b42c3148b7..c985460635 100644 --- a/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts +++ b/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts @@ -100,7 +100,7 @@ export class MssqlUi { pk: false, un: false, ai: false, - cdf: 'GETDATE()', + cdf: '', clen: 45, np: null, ns: null, @@ -736,7 +736,6 @@ export class MssqlUi { break; case 'CreatedTime': colProp.dt = 'datetime'; - colProp.cdf = 'GETDATE()'; break; case 'LastModifiedTime': colProp.dt = 'datetime'; diff --git a/packages/nocodb-sdk/src/lib/sqlUi/MysqlUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/MysqlUi.ts index 142540fc1b..af2f5b76c2 100644 --- a/packages/nocodb-sdk/src/lib/sqlUi/MysqlUi.ts +++ b/packages/nocodb-sdk/src/lib/sqlUi/MysqlUi.ts @@ -104,7 +104,7 @@ export class MysqlUi { pk: false, un: false, ai: false, - cdf: 'CURRENT_TIMESTAMP', + cdf: '', clen: 45, np: null, ns: null, @@ -1074,11 +1074,9 @@ export class MysqlUi { break; case 'CreatedTime': colProp.dt = 'timestamp'; - colProp.cdf = 'CURRENT_TIMESTAMP'; break; case 'LastModifiedTime': colProp.dt = 'timestamp'; - colProp.cdf = 'CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP'; break; case 'AutoNumber': colProp.dt = 'int'; diff --git a/packages/nocodb-sdk/src/lib/sqlUi/PgUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/PgUi.ts index 4173e2246c..adc93028b9 100644 --- a/packages/nocodb-sdk/src/lib/sqlUi/PgUi.ts +++ b/packages/nocodb-sdk/src/lib/sqlUi/PgUi.ts @@ -163,7 +163,7 @@ export class PgUi { pk: false, un: false, ai: false, - cdf: 'now()', + cdf: '', clen: 45, np: null, ns: null, @@ -1687,7 +1687,6 @@ export class PgUi { break; case 'CreatedTime': colProp.dt = 'timestamp'; - colProp.cdf = 'now()'; break; case 'LastModifiedTime': colProp.dt = 'timestamp'; diff --git a/packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts index d418f54234..64e300436b 100644 --- a/packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts +++ b/packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts @@ -99,7 +99,7 @@ export class SnowflakeUi { pk: false, un: false, ai: false, - cdf: 'current_timestamp()', + cdf: '', clen: 45, np: null, ns: null, @@ -778,7 +778,6 @@ export class SnowflakeUi { break; case 'CreatedTime': colProp.dt = 'TIMESTAMP'; - colProp.cdf = 'current_timestamp()'; break; case 'LastModifiedTime': colProp.dt = 'TIMESTAMP'; diff --git a/packages/nocodb-sdk/src/lib/sqlUi/SqliteUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/SqliteUi.ts index 20d6d850f7..fc98005d98 100644 --- a/packages/nocodb-sdk/src/lib/sqlUi/SqliteUi.ts +++ b/packages/nocodb-sdk/src/lib/sqlUi/SqliteUi.ts @@ -87,7 +87,7 @@ export class SqliteUi { pk: false, un: false, ai: false, - cdf: 'CURRENT_TIMESTAMP', + cdf: '', clen: 45, np: null, ns: null, @@ -629,7 +629,6 @@ export class SqliteUi { break; case 'CreatedTime': colProp.dt = 'datetime'; - colProp.cdf = 'CURRENT_TIMESTAMP'; break; case 'LastModifiedTime': colProp.dt = 'datetime'; diff --git a/packages/nocodb/src/version-upgrader/ncXcdbCreatedAndUpdatedTimeUpgrader.ts b/packages/nocodb/src/version-upgrader/ncXcdbCreatedAndUpdatedTimeUpgrader.ts index 6a3fb9b04e..2d61adedc2 100644 --- a/packages/nocodb/src/version-upgrader/ncXcdbCreatedAndUpdatedTimeUpgrader.ts +++ b/packages/nocodb/src/version-upgrader/ncXcdbCreatedAndUpdatedTimeUpgrader.ts @@ -113,6 +113,7 @@ async function upgradeModels({ }, source, )), + cdf: null, system: true, altered: Altered.NEW_COLUMN, }); @@ -125,10 +126,10 @@ async function upgradeModels({ uidt: UITypes.LastModifiedTime, column_name: getUniqueColumnName(columns, 'updated_at'), title: getUniqueColumnAliasName(columns, 'Updated At'), - cdf: null, }, source, )), + cdf: null, system: true, altered: Altered.NEW_COLUMN, });