From eb5f03f8e5555ed57dcf5fff5594ee4333982395 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 6 Sep 2024 12:28:16 +0200 Subject: [PATCH] IDEMPIERE-6223 Add new field JsonData to AD_PInstance - Peer Review Fixes (#2448) --- migration/iD11/postgresql/202409041533_IDEMPIERE-6223.sql | 4 ++-- org.adempiere.base/src/org/compiere/model/MPInstanceLog.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/migration/iD11/postgresql/202409041533_IDEMPIERE-6223.sql b/migration/iD11/postgresql/202409041533_IDEMPIERE-6223.sql index 89cba3109e..faa51c3861 100644 --- a/migration/iD11/postgresql/202409041533_IDEMPIERE-6223.sql +++ b/migration/iD11/postgresql/202409041533_IDEMPIERE-6223.sql @@ -6,7 +6,7 @@ INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,AD_Table_ID,ColumnN ; -- Sep 4, 2024, 3:33:16 PM BRT -ALTER TABLE AD_PInstance ADD COLUMN JsonData TEXT DEFAULT NULL CONSTRAINT AD_PInstance_JsonData_isjson CHECK (JsonData IS JSON) +ALTER TABLE AD_PInstance ADD COLUMN JsonData JSON DEFAULT NULL ; -- Sep 4, 2024, 3:33:39 PM BRT @@ -62,7 +62,7 @@ INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,AD_Table_ID,ColumnN ; -- Sep 4, 2024, 3:34:43 PM BRT -ALTER TABLE AD_PInstance_Log ADD COLUMN JsonData TEXT DEFAULT NULL CONSTRAINT AD_PInstance_Log_JsonData_isjson CHECK (JsonData IS JSON) +ALTER TABLE AD_PInstance_Log ADD COLUMN JsonData JSON DEFAULT NULL ; -- Sep 4, 2024, 3:35:54 PM BRT diff --git a/org.adempiere.base/src/org/compiere/model/MPInstanceLog.java b/org.adempiere.base/src/org/compiere/model/MPInstanceLog.java index a6eaad21c5..bbaa7884f0 100644 --- a/org.adempiere.base/src/org/compiere/model/MPInstanceLog.java +++ b/org.adempiere.base/src/org/compiere/model/MPInstanceLog.java @@ -170,7 +170,7 @@ public class MPInstanceLog private final static String insertSql = "INSERT INTO AD_PInstance_Log " + "(AD_PInstance_ID, Log_ID, P_Date, P_ID, P_Number, P_Msg, AD_Table_ID, Record_ID, AD_PInstance_Log_UU, JsonData, PInstanceLogType)" - + " VALUES (?,?,?,?,?,?,?,?,?,?,?) "; + + " VALUES (?,?,?,?,?,?,?,?,?," + DB.getJSONCast() + ",?) "; private final static String updateSql = "UPDATE AD_PInstance_Log " + " SET P_Date = ?, " @@ -179,7 +179,7 @@ public class MPInstanceLog + " P_Msg = ?, " + " AD_Table_ID = ?, " + " Record_ID = ?, " - + " JsonData = ?, " + + " JsonData = " + DB.getJSONCast() + ", " + " PInstanceLogType = ? " + " WHERE AD_PInstance_Log_UU = ? ";