midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-5683 Peer review (#1825)

This commit is contained in:
Carlos Ruiz 2023-05-06 00:58:43 +02:00 committed by GitHub
parent 3bf447b009
commit af2d735cc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 417 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
migration/iD11/oracle/202304280940_IDEMPIERE-5683.sql
View File

@ -5,29 +5,49 @@ SET SQLBLANKLINES ON
SET DEFINE OFF SET DEFINE OFF
-- Apr 28, 2023, 9:41:24 AM CEST -- Apr 28, 2023, 9:41:24 AM CEST
UPDATE AD_Field SET DisplayLogic='@AD_Reference_ID@=19 | @AD_Reference_ID@=30 | @AD_Reference_ID@=18 | @AD_Reference_ID@=21 | @AD_Reference_ID@=25 | @AD_Reference_ID@=31 | @AD_Reference_ID@=35 | @AD_Reference_ID@=33 | @AD_Reference_ID@=32 | @AD_Reference_ID@=53370 | @AD_Reference_ID@=200233 | @AD_Reference_ID@=200234 | @AD_Reference_ID@=200235 | @AD_Reference_ID@=200202 | @AD_Reference_ID@=200240',Updated=TO_TIMESTAMP('2023-04-28 09:41:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202519 UPDATE AD_Field SET DisplayLogic='@AD_Reference_ID@=19 | @AD_Reference_ID@=30 | @AD_Reference_ID@=18 | @AD_Reference_ID@=21 | @AD_Reference_ID@=25 | @AD_Reference_ID@=31 | @AD_Reference_ID@=35 | @AD_Reference_ID@=33 | @AD_Reference_ID@=32 | @AD_Reference_ID@=53370 | @AD_Reference_ID@=200233 | @AD_Reference_ID@=200234 | @AD_Reference_ID@=200235 | @AD_Reference_ID@=200202',Updated=TO_TIMESTAMP('2023-04-28 09:41:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202519
; ;
-- update Constraint Type based on java arrays from PO_Record.java -- update Constraint Type based on java arrays from PO_Record.java
UPDATE AD_Column UPDATE AD_Column
SET FKConstraintType = SET FKConstraintType =
CASE CASE
WHEN AD_Table_ID IN(254,754,389,200000,200215,200347) THEN 'C' /* AD_Attachment, AD_Archive, AD_Note, AD_RecentItem, AD_PostIt, AD_LabelAssignment - Cascade */ WHEN AD_Table_ID IN(254,754,389,200000,200215,200347) THEN 'M' /* AD_Attachment, AD_Archive, AD_Note, AD_RecentItem, AD_PostIt, AD_LabelAssignment - Model Cascade */
WHEN AD_Table_ID IN(417,876) THEN 'N' /* R_Request, CM_Chat - No Action */ WHEN AD_Table_ID IN(417,876,270) THEN 'O' /* R_Request, CM_Chat, Fact_Acct - No Action - Model No Action Forbid Deletion */
ELSE 'D' ELSE 'D'
END END
WHERE AD_Reference_ID IN(200202,200240) /* Record ID, Record UU */ WHERE AD_Reference_ID = 200202 /* Record ID */
; ;
-- May 4, 2023, 5:28:36 PM CEST -- May 5, 2023, 7:57:28 PM CEST
UPDATE AD_Process_Para SET IsActive='N',Updated=TO_TIMESTAMP('2023-05-05 19:57:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=200269
;
-- May 5, 2023, 8:23:32 PM CEST
INSERT INTO AD_Ref_List (AD_Ref_List_ID,Name,AD_Reference_ID,Value,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,EntityType,AD_Ref_List_UU) VALUES (200640,'Model Set Null',200075,'T',0,0,'Y',TO_TIMESTAMP('2023-05-05 20:23:31','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2023-05-05 20:23:31','YYYY-MM-DD HH24:MI:SS'),100,'D','6591e7a2-e8f9-4cd4-9ef2-afea1275e578')
;
-- May 5, 2023, 8:23:59 PM CEST
INSERT INTO AD_Ref_List (AD_Ref_List_ID,Name,AD_Reference_ID,Value,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,EntityType,AD_Ref_List_UU) VALUES (200641,'Model No Action - Forbid Deletion',200075,'O',0,0,'Y',TO_TIMESTAMP('2023-05-05 20:23:59','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2023-05-05 20:23:59','YYYY-MM-DD HH24:MI:SS'),100,'D','8300ca2c-50f9-4882-8776-dfdc949db534')
;
-- May 5, 2023, 8:24:07 PM CEST
UPDATE AD_Ref_List SET Name='No Action - Forbid Deletion',Updated=TO_TIMESTAMP('2023-05-05 20:24:07','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Ref_List_ID=200162
;
-- May 5, 2023, 8:24:13 PM CEST
UPDATE AD_Ref_List SET Name='Do Not Create - Ignore',Updated=TO_TIMESTAMP('2023-05-05 20:24:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Ref_List_ID=200161
;
-- May 5, 2023, 8:57:26 PM CEST
UPDATE AD_Val_Rule SET Code='( UPDATE AD_Val_Rule SET Code='(
(AD_Ref_List.Value!=''M'' OR @AD_Reference_ID@ IN (18,19,30,200233,200234,200235,200202,200240)) AD_Ref_List.Value = ''D''
AND /* Cascade/SetNull/Forbid supported for all DB constraints */
((AD_Ref_List.Value=''C'' AND @AD_Reference_ID@ NOT IN (200202,200240)) OR (AD_Ref_List.Value!=''C'')) OR (AD_Ref_List.Value IN (''C'',''S'',''N'') AND @AD_Reference_ID@ IN (18,19,21,25,30,31,32,33,35,53370,200233,200234,200235))
)',Updated=TO_TIMESTAMP('2023-05-04 17:28:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Val_Rule_ID=200064 /* ModelCascade supported for Table/TableDir/Search/RecordID */
; OR (AD_Ref_List.Value = ''M'' AND @AD_Reference_ID@ IN (18,19,30,200202))
/* ModelSetNull/ModelForbid supported for RecordID */
-- May 5, 2023, 8:15:59 AM CEST OR (AD_Ref_List.Value IN (''T'',''O'') AND @AD_Reference_ID@ IN (200202))
DELETE FROM AD_Process_Para WHERE AD_Process_Para_UU='459a7f88-ec79-47cf-9c7b-7429ac565f55' )',Updated=TO_TIMESTAMP('2023-05-05 20:57:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Val_Rule_ID=200064
; ;

46
migration/iD11/postgresql/202304280940_IDEMPIERE-5683.sql
View File

@ -2,29 +2,49 @@
SELECT register_migration_script('202304280940_IDEMPIERE-5683.sql') FROM dual; SELECT register_migration_script('202304280940_IDEMPIERE-5683.sql') FROM dual;
-- Apr 28, 2023, 9:41:24 AM CEST -- Apr 28, 2023, 9:41:24 AM CEST
UPDATE AD_Field SET DisplayLogic='@AD_Reference_ID@=19 | @AD_Reference_ID@=30 | @AD_Reference_ID@=18 | @AD_Reference_ID@=21 | @AD_Reference_ID@=25 | @AD_Reference_ID@=31 | @AD_Reference_ID@=35 | @AD_Reference_ID@=33 | @AD_Reference_ID@=32 | @AD_Reference_ID@=53370 | @AD_Reference_ID@=200233 | @AD_Reference_ID@=200234 | @AD_Reference_ID@=200235 | @AD_Reference_ID@=200202 | @AD_Reference_ID@=200240',Updated=TO_TIMESTAMP('2023-04-28 09:41:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202519 UPDATE AD_Field SET DisplayLogic='@AD_Reference_ID@=19 | @AD_Reference_ID@=30 | @AD_Reference_ID@=18 | @AD_Reference_ID@=21 | @AD_Reference_ID@=25 | @AD_Reference_ID@=31 | @AD_Reference_ID@=35 | @AD_Reference_ID@=33 | @AD_Reference_ID@=32 | @AD_Reference_ID@=53370 | @AD_Reference_ID@=200233 | @AD_Reference_ID@=200234 | @AD_Reference_ID@=200235 | @AD_Reference_ID@=200202',Updated=TO_TIMESTAMP('2023-04-28 09:41:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202519
; ;
-- update Constraint Type based on java arrays from PO_Record.java -- update Constraint Type based on java arrays from PO_Record.java
UPDATE AD_Column UPDATE AD_Column
SET FKConstraintType = SET FKConstraintType =
CASE CASE
WHEN AD_Table_ID IN(254,754,389,200000,200215,200347) THEN 'C' /* AD_Attachment, AD_Archive, AD_Note, AD_RecentItem, AD_PostIt, AD_LabelAssignment - Cascade */ WHEN AD_Table_ID IN(254,754,389,200000,200215,200347) THEN 'M' /* AD_Attachment, AD_Archive, AD_Note, AD_RecentItem, AD_PostIt, AD_LabelAssignment - Model Cascade */
WHEN AD_Table_ID IN(417,876) THEN 'N' /* R_Request, CM_Chat - No Action */ WHEN AD_Table_ID IN(417,876,270) THEN 'O' /* R_Request, CM_Chat, Fact_Acct - No Action - Model No Action Forbid Deletion */
ELSE 'D' ELSE 'D'
END END
WHERE AD_Reference_ID IN(200202,200240) /* Record ID, Record UU */ WHERE AD_Reference_ID = 200202 /* Record ID */
; ;
-- May 4, 2023, 5:28:36 PM CEST -- May 5, 2023, 7:57:28 PM CEST
UPDATE AD_Process_Para SET IsActive='N',Updated=TO_TIMESTAMP('2023-05-05 19:57:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=200269
;
-- May 5, 2023, 8:23:32 PM CEST
INSERT INTO AD_Ref_List (AD_Ref_List_ID,Name,AD_Reference_ID,Value,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,EntityType,AD_Ref_List_UU) VALUES (200640,'Model Set Null',200075,'T',0,0,'Y',TO_TIMESTAMP('2023-05-05 20:23:31','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2023-05-05 20:23:31','YYYY-MM-DD HH24:MI:SS'),100,'D','6591e7a2-e8f9-4cd4-9ef2-afea1275e578')
;
-- May 5, 2023, 8:23:59 PM CEST
INSERT INTO AD_Ref_List (AD_Ref_List_ID,Name,AD_Reference_ID,Value,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,EntityType,AD_Ref_List_UU) VALUES (200641,'Model No Action - Forbid Deletion',200075,'O',0,0,'Y',TO_TIMESTAMP('2023-05-05 20:23:59','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2023-05-05 20:23:59','YYYY-MM-DD HH24:MI:SS'),100,'D','8300ca2c-50f9-4882-8776-dfdc949db534')
;
-- May 5, 2023, 8:24:07 PM CEST
UPDATE AD_Ref_List SET Name='No Action - Forbid Deletion',Updated=TO_TIMESTAMP('2023-05-05 20:24:07','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Ref_List_ID=200162
;
-- May 5, 2023, 8:24:13 PM CEST
UPDATE AD_Ref_List SET Name='Do Not Create - Ignore',Updated=TO_TIMESTAMP('2023-05-05 20:24:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Ref_List_ID=200161
;
-- May 5, 2023, 8:57:26 PM CEST
UPDATE AD_Val_Rule SET Code='( UPDATE AD_Val_Rule SET Code='(
(AD_Ref_List.Value!=''M'' OR @AD_Reference_ID@ IN (18,19,30,200233,200234,200235,200202,200240)) AD_Ref_List.Value = ''D''
AND /* Cascade/SetNull/Forbid supported for all DB constraints */
((AD_Ref_List.Value=''C'' AND @AD_Reference_ID@ NOT IN (200202,200240)) OR (AD_Ref_List.Value!=''C'')) OR (AD_Ref_List.Value IN (''C'',''S'',''N'') AND @AD_Reference_ID@ IN (18,19,21,25,30,31,32,33,35,53370,200233,200234,200235))
)',Updated=TO_TIMESTAMP('2023-05-04 17:28:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Val_Rule_ID=200064 /* ModelCascade supported for Table/TableDir/Search/RecordID */
; OR (AD_Ref_List.Value = ''M'' AND @AD_Reference_ID@ IN (18,19,30,200202))
/* ModelSetNull/ModelForbid supported for RecordID */
-- May 5, 2023, 8:15:59 AM CEST OR (AD_Ref_List.Value IN (''T'',''O'') AND @AD_Reference_ID@ IN (200202))
DELETE FROM AD_Process_Para WHERE AD_Process_Para_UU='459a7f88-ec79-47cf-9c7b-7429ac565f55' )',Updated=TO_TIMESTAMP('2023-05-05 20:57:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Val_Rule_ID=200064
; ;

45
org.adempiere.base.process/src/org/idempiere/process/CleanOrphanCascade.java
View File

@ -26,15 +26,16 @@ package org.idempiere.process;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.logging.Level; import java.util.logging.Level;
import org.compiere.model.MColumn; import org.compiere.model.MColumn;
import org.compiere.model.MProcessPara;
import org.compiere.model.MTable; import org.compiere.model.MTable;
import org.compiere.model.MTree_Base; import org.compiere.model.MTree_Base;
import org.compiere.model.PO; import org.compiere.model.PO;
import org.compiere.model.Query; import org.compiere.model.Query;
import org.compiere.model.X_AD_Package_UUID_Map; import org.compiere.model.X_AD_Package_UUID_Map;
import org.compiere.process.ProcessInfoParameter;
import org.compiere.process.SvrProcess; import org.compiere.process.SvrProcess;
import org.compiere.util.DB; import org.compiere.util.DB;
import org.compiere.util.Msg; import org.compiere.util.Msg;
@ -53,6 +54,10 @@ public class CleanOrphanCascade extends SvrProcess
*/ */
protected void prepare() protected void prepare()
{ {
for (ProcessInfoParameter para : getParameter())
{
MProcessPara.validateUnknownParameter(getProcessInfo().getAD_Process_ID(), para);
}
} // prepare } // prepare
/** /**
@ -119,20 +124,20 @@ public class CleanOrphanCascade extends SvrProcess
boolean isUUIDMap = X_AD_Package_UUID_Map.Table_Name.equals(tableName); boolean isUUIDMap = X_AD_Package_UUID_Map.Table_Name.equals(tableName);
StringBuilder sqlRef = new StringBuilder(); StringBuilder sqlRef = new StringBuilder();
sqlRef.append("SELECT DISTINCT t.AD_Table_ID, ") sqlRef.append("SELECT DISTINCT t.AD_Table_ID, ");
.append(" t.TableName, ") sqlRef.append(" t.TableName, ");
.append(" c.FKConstraintType, ") sqlRef.append(" c.FKConstraintType, ");
.append(" c.IsMandatory ") sqlRef.append(" c.IsMandatory ");
.append("FROM ").append(tableName).append(" r ") sqlRef.append("FROM ").append(tableName).append(" r ");
.append(" JOIN AD_Table t ON ( r.AD_Table_ID = t.AD_Table_ID ) ") sqlRef.append(" JOIN AD_Table t ON ( r.AD_Table_ID = t.AD_Table_ID ) ");
.append(" JOIN AD_Column c ON (t.AD_Table_ID = c.AD_Table_ID AND c.ColumnName = 'Record_ID') ") sqlRef.append(" JOIN AD_Column c ON (t.AD_Table_ID = c.AD_Table_ID AND c.ColumnName = 'Record_ID') ");
.append("ORDER BY t.Tablename"); sqlRef.append("ORDER BY t.Tablename");
List<List<Object>> rowTables = DB.getSQLArrayObjectsEx(get_TrxName(), sqlRef.toString()); List<List<Object>> rowTables = DB.getSQLArrayObjectsEx(get_TrxName(), sqlRef.toString());
if (rowTables != null) { if (rowTables != null) {
for (List<Object> row : rowTables) { for (List<Object> row : rowTables) {
int refTableID = ((BigDecimal) row.get(0)).intValue(); int refTableID = ((BigDecimal) row.get(0)).intValue();
String refTableName = row.get(1).toString(); String refTableName = row.get(1).toString();
String constraintType = Objects.toString(row.get(2), ""); String constraintType = row.get(2).toString();
Boolean isMandatory = row.get(3).toString().equalsIgnoreCase("Y"); Boolean isMandatory = row.get(3).toString().equalsIgnoreCase("Y");
MTable refTable = MTable.get(getCtx(), refTableID); MTable refTable = MTable.get(getCtx(), refTableID);
@ -157,23 +162,24 @@ public class CleanOrphanCascade extends SvrProcess
} }
} }
int noDel = 0; int noDeleted = 0;
int noSetNull = 0;
List<PO> poList = new Query(getCtx(), tableName, whereClause.toString(), get_TrxName()).list(); List<PO> poList = new Query(getCtx(), tableName, whereClause.toString(), get_TrxName()).list();
for (PO po : poList) { for (PO po : poList) {
if(MColumn.FKCONSTRAINTTYPE_ModelCascade.equals(constraintType)) { if (MColumn.FKCONSTRAINTTYPE_ModelCascade.equals(constraintType)) {
po.deleteEx(true, get_TrxName()); po.deleteEx(true, get_TrxName());
} noDeleted++;
else if(MColumn.FKCONSTRAINTTYPE_SetNull.equals(constraintType)) { } else if (MColumn.FKCONSTRAINTTYPE_ModelSetNull.equals(constraintType)) {
if(isMandatory) if (isMandatory)
po.set_ValueOfColumn("Record_ID", 0); po.set_ValueOfColumn("Record_ID", 0);
else else
po.set_ValueOfColumn("Record_ID", null); po.set_ValueOfColumn("Record_ID", null);
po.saveEx(get_TrxName()); po.saveEx(get_TrxName());
noSetNull++;
} }
noDel++;
} }
if (noDel > 0) { if (noDeleted > 0 || noSetNull > 0) {
addLog(Msg.parseTranslation(getCtx(), noDel + " " + tableName + " " + "@Deleted@ -> " + refTableName)); addLog(Msg.parseTranslation(getCtx(), tableName + ": " + noDeleted + " @Deleted@ / " + noSetNull + " @Reset@ -> " + refTableName));
} }
} }
@ -195,8 +201,7 @@ public class CleanOrphanCascade extends SvrProcess
noDel++; noDel++;
} }
if (noDel > 0) { if (noDel > 0) {
addLog(Msg.parseTranslation(getCtx(), noDel + " " + treeTable + " " + "@Deleted@ -> " + foreignTable addLog(Msg.parseTranslation(getCtx(), treeTable + ": " + noDel + " @Deleted@ -> " + foreignTable + (treeId > 0 ? " Tree=" + treeId: "" )));
+ (treeId > 0 ? " Tree=" + treeId: "" )));
} }
} // delTree } // delTree

2
org.adempiere.base/src/org/compiere/model/GridTable.java
View File

@ -2844,7 +2844,7 @@ public class GridTable extends AbstractTableModel
if (!ok) if (!ok)
{ {
ValueNamePair vp = CLogger.retrieveError(); ValueNamePair vp = CLogger.retrieveError();
if (vp != null) if (vp != null && !(Util.isEmpty(vp.getValue()) || Util.isEmpty(vp.getName())))
fireDataStatusEEvent(vp); fireDataStatusEEvent(vp);
else else
fireDataStatusEEvent("DeleteError", "", true); fireDataStatusEEvent("DeleteError", "", true);

20
org.adempiere.base/src/org/compiere/model/MColumn.java
View File

@ -1014,7 +1014,7 @@ public class MColumn extends X_AD_Column implements ImmutablePOSupport
else if (dbForeignKey.getDeleteRule() == DatabaseMetaData.importedKeySetNull) else if (dbForeignKey.getDeleteRule() == DatabaseMetaData.importedKeySetNull)
dbDeleteRule = MColumn.FKCONSTRAINTTYPE_SetNull; dbDeleteRule = MColumn.FKCONSTRAINTTYPE_SetNull;
else if (dbForeignKey.getDeleteRule() == DatabaseMetaData.importedKeyNoAction || dbForeignKey.getDeleteRule() == DatabaseMetaData.importedKeyRestrict) else if (dbForeignKey.getDeleteRule() == DatabaseMetaData.importedKeyNoAction || dbForeignKey.getDeleteRule() == DatabaseMetaData.importedKeyRestrict)
dbDeleteRule = MColumn.FKCONSTRAINTTYPE_NoAction; dbDeleteRule = MColumn.FKCONSTRAINTTYPE_NoAction_ForbidDeletion;
String fkConstraintType = column.getFKConstraintType(); String fkConstraintType = column.getFKConstraintType();
if (fkConstraintType == null) { if (fkConstraintType == null) {
fkConstraintType = dbDeleteRule; fkConstraintType = dbDeleteRule;
@ -1024,12 +1024,12 @@ public class MColumn extends X_AD_Column implements ImmutablePOSupport
|| "CreatedBy".equals(column.getColumnName()) || "CreatedBy".equals(column.getColumnName())
|| "UpdatedBy".equals(column.getColumnName()) || "UpdatedBy".equals(column.getColumnName())
) )
fkConstraintType = MColumn.FKCONSTRAINTTYPE_DoNotCreate; fkConstraintType = MColumn.FKCONSTRAINTTYPE_DoNotCreate_Ignore;
else else
fkConstraintType = MColumn.FKCONSTRAINTTYPE_NoAction; fkConstraintType = MColumn.FKCONSTRAINTTYPE_NoAction_ForbidDeletion;
} }
} }
if (!fkConstraintType.equals(MColumn.FKCONSTRAINTTYPE_DoNotCreate)) if (!fkConstraintType.equals(MColumn.FKCONSTRAINTTYPE_DoNotCreate_Ignore))
{ {
String fkConstraintName = column.getFKConstraintName(); String fkConstraintName = column.getFKConstraintName();
if (fkConstraintName == null || fkConstraintName.trim().length() == 0) if (fkConstraintName == null || fkConstraintName.trim().length() == 0)
@ -1051,7 +1051,7 @@ public class MColumn extends X_AD_Column implements ImmutablePOSupport
} }
fkConstraint.append(")"); fkConstraint.append(")");
if (fkConstraintType.equals(MColumn.FKCONSTRAINTTYPE_NoAction)) if (fkConstraintType.equals(MColumn.FKCONSTRAINTTYPE_NoAction_ForbidDeletion))
; ;
else if (fkConstraintType.equals(MColumn.FKCONSTRAINTTYPE_Cascade)) else if (fkConstraintType.equals(MColumn.FKCONSTRAINTTYPE_Cascade))
fkConstraint.append(" ON DELETE CASCADE"); fkConstraint.append(" ON DELETE CASCADE");
@ -1073,8 +1073,8 @@ public class MColumn extends X_AD_Column implements ImmutablePOSupport
if ( dbForeignKey.getKeyName().equalsIgnoreCase(column.getFKConstraintName()) if ( dbForeignKey.getKeyName().equalsIgnoreCase(column.getFKConstraintName())
&& ( (dbForeignKey.getDeleteRule() == DatabaseMetaData.importedKeyCascade && MColumn.FKCONSTRAINTTYPE_Cascade.equals(column.getFKConstraintType())) && ( (dbForeignKey.getDeleteRule() == DatabaseMetaData.importedKeyCascade && MColumn.FKCONSTRAINTTYPE_Cascade.equals(column.getFKConstraintType()))
|| (dbForeignKey.getDeleteRule() == DatabaseMetaData.importedKeySetNull && MColumn.FKCONSTRAINTTYPE_SetNull.equals(column.getFKConstraintType())) || (dbForeignKey.getDeleteRule() == DatabaseMetaData.importedKeySetNull && MColumn.FKCONSTRAINTTYPE_SetNull.equals(column.getFKConstraintType()))
|| (dbForeignKey.getDeleteRule() == DatabaseMetaData.importedKeyNoAction && MColumn.FKCONSTRAINTTYPE_NoAction.equals(column.getFKConstraintType())) || (dbForeignKey.getDeleteRule() == DatabaseMetaData.importedKeyNoAction && MColumn.FKCONSTRAINTTYPE_NoAction_ForbidDeletion.equals(column.getFKConstraintType()))
|| (dbForeignKey.getDeleteRule() == DatabaseMetaData.importedKeyRestrict && MColumn.FKCONSTRAINTTYPE_NoAction.equals(column.getFKConstraintType())) || (dbForeignKey.getDeleteRule() == DatabaseMetaData.importedKeyRestrict && MColumn.FKCONSTRAINTTYPE_NoAction_ForbidDeletion.equals(column.getFKConstraintType()))
) )
) { ) {
// nothing changed // nothing changed
@ -1149,9 +1149,9 @@ public class MColumn extends X_AD_Column implements ImmutablePOSupport
{ {
String fkConstraintType = column.getFKConstraintType(); String fkConstraintType = column.getFKConstraintType();
if (fkConstraintType == null) if (fkConstraintType == null)
fkConstraintType = MColumn.FKCONSTRAINTTYPE_NoAction; fkConstraintType = MColumn.FKCONSTRAINTTYPE_NoAction_ForbidDeletion;
if (fkConstraintType.equals(MColumn.FKCONSTRAINTTYPE_DoNotCreate)) if (fkConstraintType.equals(MColumn.FKCONSTRAINTTYPE_DoNotCreate_Ignore))
return ""; return "";
int refid = column.getAD_Reference_ID(); int refid = column.getAD_Reference_ID();
@ -1202,7 +1202,7 @@ public class MColumn extends X_AD_Column implements ImmutablePOSupport
} }
fkConstraint.append(")"); fkConstraint.append(")");
if (fkConstraintType.equals(MColumn.FKCONSTRAINTTYPE_NoAction)) if (fkConstraintType.equals(MColumn.FKCONSTRAINTTYPE_NoAction_ForbidDeletion))
; ;
else if (fkConstraintType.equals(MColumn.FKCONSTRAINTTYPE_Cascade)) else if (fkConstraintType.equals(MColumn.FKCONSTRAINTTYPE_Cascade))
fkConstraint.append(" ON DELETE CASCADE"); fkConstraint.append(" ON DELETE CASCADE");

11
org.adempiere.base/src/org/compiere/model/PO.java
View File

@ -3965,17 +3965,16 @@ public abstract class PO
if (get_ColumnIndex("IsSummary") >= 0) { if (get_ColumnIndex("IsSummary") >= 0) {
delete_Tree(MTree_Base.TREETYPE_CustomTable); delete_Tree(MTree_Base.TREETYPE_CustomTable);
} }
// Delete Cascade AD_Table_ID/Record_ID (Attachments, ..)
PO_Record.deleteCascade(AD_Table_ID, Record_ID, localTrxName);
//delete cascade only for single key column record
if (m_KeyColumns != null && m_KeyColumns.length == 1) { if (m_KeyColumns != null && m_KeyColumns.length == 1) {
//delete cascade only for single key column record
PO_Record.deleteModelCascade(p_info.getTableName(), Record_ID, localTrxName); PO_Record.deleteModelCascade(p_info.getTableName(), Record_ID, localTrxName);
// Delete Cascade AD_Table_ID/Record_ID (Attachments, ..)
PO_Record.deleteRecordIdCascade(AD_Table_ID, Record_ID, localTrxName);
// Set referencing Record_ID Null AD_Table_ID/Record_ID
PO_Record.setRecordIdNull(AD_Table_ID, Record_ID, localTrxName);
} }
// Set referencing Record_ID Null AD_Table_ID/Record_ID
PO_Record.setRecordIdNull(AD_Table_ID, Record_ID, localTrxName);
// The Delete Statement // The Delete Statement
String where = isLogSQLScript() ? get_WhereClause(true, get_ValueAsString(getUUIDColumnName())) : get_WhereClause(true); String where = isLogSQLScript() ? get_WhereClause(true, get_ValueAsString(getUUIDColumnName())) : get_WhereClause(true);
List<Object> optimisticLockingParams = new ArrayList<Object>(); List<Object> optimisticLockingParams = new ArrayList<Object>();

236
org.adempiere.base/src/org/compiere/model/PO_Record.java
View File

@ -16,9 +16,7 @@
*****************************************************************************/ *****************************************************************************/
package org.compiere.model; package org.compiere.model;
import java.sql.PreparedStatement; import java.math.BigDecimal;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
@ -28,6 +26,7 @@ import org.compiere.util.DB;
import org.compiere.util.DisplayType; import org.compiere.util.DisplayType;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.KeyNamePair; import org.compiere.util.KeyNamePair;
import org.compiere.util.Msg;
/** /**
* Maintain AD_Table_ID/Record_ID constraint * Maintain AD_Table_ID/Record_ID constraint
@ -38,7 +37,7 @@ import org.compiere.util.KeyNamePair;
public class PO_Record public class PO_Record
{ {
/* Cache for arrays of KeyNamePair<AD_Table_ID, TableName> for types of deletion: Cascade, Set Null, No Action */ /* Cache for arrays of KeyNamePair<AD_Table_ID, TableName> for types of deletion: Cascade, Set Null, No Action */
private static final CCache<String, KeyNamePair[]> s_po_record_tables_cache = new CCache<>(null, "PORecordTables", 3, 120, false, 3); private static final CCache<String, KeyNamePair[]> s_po_record_tables_cache = new CCache<>(null, "PORecordTables", 100, 120, false);
/** Parent Tables */ /** Parent Tables */
private static int[] s_parents = new int[]{ private static int[] s_parents = new int[]{
@ -64,28 +63,27 @@ public class PO_Record
* @param trxName transaction * @param trxName transaction
* @return false if could not be deleted * @return false if could not be deleted
*/ */
static boolean deleteCascade (int AD_Table_ID, int Record_ID, String trxName) static boolean deleteRecordIdCascade (int AD_Table_ID, int Record_ID, String trxName)
{ {
KeyNamePair[] cascades = getTablesWithRecordColumnFromCache(MColumn.FKCONSTRAINTTYPE_Cascade); KeyNamePair[] cascades = getTablesWithRecordIDColumn(MColumn.FKCONSTRAINTTYPE_ModelCascade, trxName);
// Table Loop // Table Loop
for (KeyNamePair table : cascades) for (KeyNamePair table : cascades)
{ {
// DELETE FROM table WHERE AD_Table_ID=#1 AND Record_ID=#2 // DELETE FROM table WHERE AD_Table_ID=#1 AND Record_ID=#2
if (table.getKey() != AD_Table_ID) List<PO> poList = new Query(Env.getCtx(), table.getName(), "AD_Table_ID=? AND Record_ID=?", trxName)
{ .setParameters(AD_Table_ID, Record_ID)
List<PO> poList = new Query(Env.getCtx(), table.getName(), "AD_Table_ID=? AND Record_ID=?", trxName) .list();
.setParameters(AD_Table_ID, Record_ID)
.list();
int count = 0; int count = 0;
for(PO po : poList) for(PO po : poList)
{ {
po.deleteEx(true); if (po.get_Table_ID() == AD_Table_ID && po.get_ID() == Record_ID)
count++; continue;
} po.deleteEx(true);
if (count > 0) count++;
if (log.isLoggable(Level.CONFIG)) log.config(table.getName() + " (" + AD_Table_ID + "/" + Record_ID + ") #" + count);
} }
if (count > 0)
if (log.isLoggable(Level.CONFIG)) log.config(table.getName() + " (" + AD_Table_ID + "/" + Record_ID + ") #" + count);
} }
// Parent Loop // Parent Loop
for (int i = 0; i < s_parents.length; i++) for (int i = 0; i < s_parents.length; i++)
@ -120,10 +118,39 @@ public class PO_Record
} // deleteCascade } // deleteCascade
//IDEMPIERE-2060 //IDEMPIERE-2060
/**
* @param tableName
* @param Record_ID
* @param trxName
*/
public static void deleteModelCascade(String tableName, int Record_ID, String trxName) { public static void deleteModelCascade(String tableName, int Record_ID, String trxName) {
//find dependent tables to delete cascade KeyNamePair[] tables = getTablesWithModelCascade(tableName, trxName);
for (KeyNamePair table : tables) {
int dependentTableId = table.getKey();
String dependentColumnName = table.getName();
String dependentWhere = dependentColumnName + "=?";
List<PO> poList = new Query(Env.getCtx(),
MTable.get(dependentTableId).getTableName(),
dependentWhere,
trxName).setParameters(Record_ID).list();
for (PO po : poList) {
po.deleteEx(true, trxName);
}
}
}
/**
* @param tableName
* @param trxName
* @return
*/
private static KeyNamePair[] getTablesWithModelCascade(String tableName, String trxName) {
StringBuilder key = new StringBuilder(MColumn.FKCONSTRAINTTYPE_ModelCascade).append("|").append(tableName);
KeyNamePair[] tables = s_po_record_tables_cache.get(key.toString());
if (tables != null)
return tables;
final String sql = "" final String sql = ""
+ "SELECT t.TableName, " + "SELECT t.AD_Table_ID, "
+ " c.ColumnName " + " c.ColumnName "
+ "FROM AD_Column c " + "FROM AD_Column c "
+ " JOIN AD_Table t ON c.AD_Table_ID = t.AD_Table_ID " + " JOIN AD_Table t ON c.AD_Table_ID = t.AD_Table_ID "
@ -137,22 +164,21 @@ public class PO_Record
+ " OR ( c.AD_Reference_ID IN ( " + DisplayType.Table + ", " + DisplayType.Search + " ) " + " OR ( c.AD_Reference_ID IN ( " + DisplayType.Table + ", " + DisplayType.Search + " ) "
+ " AND ( tr.TableName = ? OR ( tr.TableName IS NULL AND c.ColumnName = ? || '_ID' ) ) ) ) " + " AND ( tr.TableName = ? OR ( tr.TableName IS NULL AND c.ColumnName = ? || '_ID' ) ) ) ) "
+ " AND c.FKConstraintType = '" + MColumn.FKCONSTRAINTTYPE_ModelCascade + "' "; + " AND c.FKConstraintType = '" + MColumn.FKCONSTRAINTTYPE_ModelCascade + "' ";
List<List<Object>> dependents = DB.getSQLArrayObjectsEx(trxName, sql, tableName, tableName, tableName); List<List<Object>> dependents = DB.getSQLArrayObjectsEx(trxName, sql, tableName, tableName, tableName);
if (dependents != null) { if (dependents != null) {
for (List<Object> row : dependents) { tables = new KeyNamePair[dependents.size()];
String dependentTableName = (String) row.get(0); for (int i=0; i<dependents.size(); i++) {
List<Object> row = dependents.get(i);
int dependentTableId = ((BigDecimal)row.get(0)).intValue();
String dependentColumnName = (String) row.get(1); String dependentColumnName = (String) row.get(1);
String dependentWhere = dependentColumnName + "=?"; KeyNamePair vnp = new KeyNamePair(dependentTableId, dependentColumnName);
List<PO> poList = new Query(Env.getCtx(), tables[i] = vnp;
dependentTableName,
dependentWhere,
trxName).setParameters(Record_ID).list();
for (PO po : poList) {
po.deleteEx(true, trxName);
}
} }
} else {
tables = new KeyNamePair[0];
} }
s_po_record_tables_cache.put(key.toString(), tables);
return tables;
} }
/** /**
@ -162,19 +188,18 @@ public class PO_Record
* @param trxName * @param trxName
*/ */
public static void setRecordIdNull(int AD_Table_ID, int Record_ID, String trxName){ public static void setRecordIdNull(int AD_Table_ID, int Record_ID, String trxName){
KeyNamePair[] tables = getTablesWithRecordColumnFromCache(MColumn.FKCONSTRAINTTYPE_SetNull); KeyNamePair[] tables = getTablesWithRecordIDColumn(MColumn.FKCONSTRAINTTYPE_ModelSetNull, trxName);
// Table loop // Table loop
for (KeyNamePair table : tables) { for (KeyNamePair table : tables) {
if(table.getKey() == AD_Table_ID)
continue;
List<PO> poList = new Query(Env.getCtx(), table.getName(), " AD_Table_ID = ? AND Record_ID = ? ", trxName) List<PO> poList = new Query(Env.getCtx(), table.getName(), " AD_Table_ID = ? AND Record_ID = ? ", trxName)
.setParameters(AD_Table_ID, Record_ID) .setParameters(AD_Table_ID, Record_ID)
.list(); .list();
int count = 0; int count = 0;
for(PO po : poList) { for(PO po : poList) {
if(po.isColumnMandatory(po.get_ColumnIndex("Record_ID"))) if (po.get_Table_ID() == AD_Table_ID && po.get_ID() == Record_ID)
continue;
if (po.isColumnMandatory(po.get_ColumnIndex("Record_ID")))
po.set_Value("Record_ID", 0); po.set_Value("Record_ID", 0);
else else
po.set_Value("Record_ID", null); po.set_Value("Record_ID", null);
@ -196,139 +221,44 @@ public class PO_Record
*/ */
static String exists (int AD_Table_ID, int Record_ID, String trxName) static String exists (int AD_Table_ID, int Record_ID, String trxName)
{ {
KeyNamePair[] restricts = getTablesWithRecordColumnFromCache(MColumn.FKCONSTRAINTTYPE_NoAction); KeyNamePair[] restricts = getTablesWithRecordIDColumn(MColumn.FKCONSTRAINTTYPE_ModelNoAction_ForbidDeletion, trxName);
// Table Loop only // Table Loop only
for (int i = 0; i < restricts.length; i++) for (int i = 0; i < restricts.length; i++)
{ {
// SELECT COUNT(*) FROM table WHERE AD_Table_ID=#1 AND Record_ID=#2 // SELECT 1 FROM table WHERE AD_Table_ID=#1 AND Record_ID=#2 FETCH FIRST 1 ROWS ONLY
StringBuilder sql = new StringBuilder ("SELECT COUNT(*) FROM ") StringBuilder sqlb = new StringBuilder ("SELECT 1 FROM ")
.append(restricts[i].getName()) .append(restricts[i].getName())
.append(" WHERE AD_Table_ID=? AND Record_ID=?"); .append(" WHERE AD_Table_ID=? AND Record_ID=?");
int no = DB.getSQLValue(trxName, sql.toString(), AD_Table_ID, Record_ID); String sql = DB.getDatabase().addPagingSQL(sqlb.toString(), 1, 1);
if (no > 0) int no = DB.getSQLValueEx(trxName, sql.toString(), AD_Table_ID, Record_ID);
return restricts[i].getName(); if (no == 1)
return Msg.getMsg(Env.getCtx(), "DeleteErrorDependent") + " -> " + restricts[i].getName();
} }
return null; return null;
} // exists } // exists
/** /**
* Validate all tables for AD_Table/Record_ID relationships * Get array of tables which has a Record_ID column with the defined Constraint Type
*/
static void validate ()
{
String sql = "SELECT AD_Table_ID, TableName FROM AD_Table WHERE IsView='N' ORDER BY TableName";
PreparedStatement pstmt = null;
ResultSet rs = null;
try
{
pstmt = DB.prepareStatement (sql, null);
rs = pstmt.executeQuery ();
while (rs.next ())
{
validate (rs.getInt(1), rs.getString(2));
}
}
catch (Exception e)
{
log.log (Level.SEVERE, sql, e);
}
finally {
DB.close(rs, pstmt);
rs = null; pstmt = null;
}
} // validate
/**
* Validate all tables for AD_Table/Record_ID relationships
* @param AD_Table_ID table
*/
static void validate (int AD_Table_ID)
{
MTable table = new MTable(Env.getCtx(), AD_Table_ID, null);
if (table.isView())
log.warning("Ignored - View " + table.getTableName());
else
validate (table.getAD_Table_ID(), table.getTableName());
} // validate
/**
* Validate Table for Table/Record
* @param AD_Table_ID table
* @param TableName Name
*/
static private void validate (int AD_Table_ID, String TableName)
{
KeyNamePair[] cascades = getTablesWithRecordColumnFromCache(MColumn.FKCONSTRAINTTYPE_Cascade);
for (int i = 0; i < cascades.length; i++)
{
StringBuilder sql = new StringBuilder ("DELETE FROM ")
.append(cascades[i].getName())
.append(" WHERE AD_Table_ID=").append(AD_Table_ID)
.append(" AND Record_ID NOT IN (SELECT ")
.append(TableName).append("_ID FROM ").append(TableName).append(")");
int no = DB.executeUpdate(sql.toString(), null);
if (no > 0)
if (log.isLoggable(Level.CONFIG)) log.config(cascades[i].getName() + " (" + AD_Table_ID + "/" + TableName
+ ") Invalid #" + no);
}
} // validate
/**
* Get array of tables which has a Record_ID or Record_UU column with the defined Constraint Type from cache
* @param constraintType - FKConstraintType of AD_Column * @param constraintType - FKConstraintType of AD_Column
* @param trxName
* @return array of KeyNamePair<AD_Table_ID, TableName> * @return array of KeyNamePair<AD_Table_ID, TableName>
*/ */
static private KeyNamePair[] getTablesWithRecordColumnFromCache(String constraintType) { private static KeyNamePair[] getTablesWithRecordIDColumn(String constraintType, String trxName) {
KeyNamePair[] tables = s_po_record_tables_cache.get(constraintType); KeyNamePair[] tables = s_po_record_tables_cache.get(constraintType);
if(tables != null) if (tables != null)
return tables; return tables;
tables = getTablesWithRecordColumn(constraintType); List<MTable> listTables = new Query(Env.getCtx(), MTable.Table_Name, "c.AD_Reference_ID=? AND c.FKConstraintType=?", trxName)
.addJoinClause("JOIN AD_Column c ON (c.AD_Table_ID=AD_Table.AD_Table_ID)")
.setOnlyActiveRecords(true)
.setParameters(DisplayType.RecordID, constraintType)
.list();
tables = new KeyNamePair[listTables.size()];
for (int i=0; i<listTables.size(); i++) {
MTable table = listTables.get(i);
tables[i] = new KeyNamePair(table.getAD_Table_ID(), table.getTableName());
}
s_po_record_tables_cache.put(constraintType, tables); s_po_record_tables_cache.put(constraintType, tables);
return tables; return tables;
} }
/**
* Get array of tables which has a Record_ID or Record_UU column with the defined Constraint Type
* @param constraintType - FKConstraintType of AD_Column
* @return array of KeyNamePair<AD_Table_ID, TableName>
*/
static private KeyNamePair[] getTablesWithRecordColumn(String constraintType) {
ArrayList<KeyNamePair> tables = new ArrayList<KeyNamePair>();
String sql = " SELECT t.AD_Table_ID, TableName "
+ " FROM AD_Column c "
+ " JOIN AD_Table t ON (c.AD_Table_ID = t.AD_Table_ID) "
+ " WHERE c.ColumnName IN (?,?) AND c.FKConstraintType = ? ";
PreparedStatement pstmt = null;
ResultSet rs = null;
try
{
pstmt = DB.prepareStatement (sql, null);
int idx = 1;
pstmt.setString(idx++, "Record_ID");
pstmt.setString(idx++, "Record_UU");
pstmt.setString(idx++, constraintType);
rs = pstmt.executeQuery ();
while (rs.next ())
{
tables.add(new KeyNamePair(rs.getInt(1), rs.getString(2)));
}
}
catch (Exception e)
{
log.log (Level.SEVERE, sql, e);
}
finally {
DB.close(rs, pstmt);
rs = null; pstmt = null;
}
KeyNamePair[] tablesArray = new KeyNamePair[tables.size()];
for(int i=0; i<tables.size(); i++) {
tablesArray[i] = tables.get(i);
}
return tablesArray;
}
} // PO_Record } // PO_Record

14
org.adempiere.base/src/org/compiere/model/X_AD_Column.java
View File

@ -33,7 +33,7 @@ public class X_AD_Column extends PO implements I_AD_Column, I_Persistent
/** /**
* *
*/ */
private static final long serialVersionUID = 20230409L; private static final long serialVersionUID = 20230505L;
/** Standard Constructor */ /** Standard Constructor */
public X_AD_Column (Properties ctx, int AD_Column_ID, String trxName) public X_AD_Column (Properties ctx, int AD_Column_ID, String trxName)
@ -664,14 +664,18 @@ public class X_AD_Column extends PO implements I_AD_Column, I_Persistent
public static final int FKCONSTRAINTTYPE_AD_Reference_ID=200075; public static final int FKCONSTRAINTTYPE_AD_Reference_ID=200075;
/** Cascade = C */ /** Cascade = C */
public static final String FKCONSTRAINTTYPE_Cascade = "C"; public static final String FKCONSTRAINTTYPE_Cascade = "C";
/** Do Not Create = D */ /** Do Not Create - Ignore = D */
public static final String FKCONSTRAINTTYPE_DoNotCreate = "D"; public static final String FKCONSTRAINTTYPE_DoNotCreate_Ignore = "D";
/** Model Cascade = M */ /** Model Cascade = M */
public static final String FKCONSTRAINTTYPE_ModelCascade = "M"; public static final String FKCONSTRAINTTYPE_ModelCascade = "M";
/** No Action = N */ /** No Action - Forbid Deletion = N */
public static final String FKCONSTRAINTTYPE_NoAction = "N"; public static final String FKCONSTRAINTTYPE_NoAction_ForbidDeletion = "N";
/** Model No Action - Forbid Deletion = O */
public static final String FKCONSTRAINTTYPE_ModelNoAction_ForbidDeletion = "O";
/** Set Null = S */ /** Set Null = S */
public static final String FKCONSTRAINTTYPE_SetNull = "S"; public static final String FKCONSTRAINTTYPE_SetNull = "S";
/** Model Set Null = T */
public static final String FKCONSTRAINTTYPE_ModelSetNull = "T";
/** Set Constraint Type. /** Set Constraint Type.
@param FKConstraintType Constraint Type @param FKConstraintType Constraint Type
*/ */

8
org.adempiere.base/src/org/compiere/process/CreateForeignKey.java
View File

@ -222,7 +222,7 @@ public class CreateForeignKey extends SvrProcess {
else if (dbForeignKey.getDeleteRule() == DatabaseMetaData.importedKeySetNull) else if (dbForeignKey.getDeleteRule() == DatabaseMetaData.importedKeySetNull)
dbDeleteRule = MColumn.FKCONSTRAINTTYPE_SetNull; dbDeleteRule = MColumn.FKCONSTRAINTTYPE_SetNull;
else if (dbForeignKey.getDeleteRule() == DatabaseMetaData.importedKeyNoAction || dbForeignKey.getDeleteRule() == DatabaseMetaData.importedKeyRestrict) else if (dbForeignKey.getDeleteRule() == DatabaseMetaData.importedKeyNoAction || dbForeignKey.getDeleteRule() == DatabaseMetaData.importedKeyRestrict)
dbDeleteRule = MColumn.FKCONSTRAINTTYPE_NoAction; dbDeleteRule = MColumn.FKCONSTRAINTTYPE_NoAction_ForbidDeletion;
String fkConstraintType = column.getFKConstraintType(); String fkConstraintType = column.getFKConstraintType();
if (fkConstraintType == null) { if (fkConstraintType == null) {
fkConstraintType = dbDeleteRule; fkConstraintType = dbDeleteRule;
@ -232,9 +232,9 @@ public class CreateForeignKey extends SvrProcess {
|| "CreatedBy".equals(column.getColumnName()) || "CreatedBy".equals(column.getColumnName())
|| "UpdatedBy".equals(column.getColumnName()) || "UpdatedBy".equals(column.getColumnName())
) )
fkConstraintType = MColumn.FKCONSTRAINTTYPE_DoNotCreate; fkConstraintType = MColumn.FKCONSTRAINTTYPE_DoNotCreate_Ignore;
else else
fkConstraintType = MColumn.FKCONSTRAINTTYPE_NoAction; fkConstraintType = MColumn.FKCONSTRAINTTYPE_NoAction_ForbidDeletion;
} }
} }
@ -252,7 +252,7 @@ public class CreateForeignKey extends SvrProcess {
column.saveEx(); column.saveEx();
break; break;
} }
else if (fkConstraintType.equals(MColumn.FKCONSTRAINTTYPE_DoNotCreate)) else if (fkConstraintType.equals(MColumn.FKCONSTRAINTTYPE_DoNotCreate_Ignore))
{ {
addLog(column.getAD_Column_ID(), null, null, addLog(column.getAD_Column_ID(), null, null,
Msg.getMsg(getCtx(), "CreateForeignKeyProcessColumn") + column.getColumnName()+ " / " + Msg.getMsg(getCtx(), "CreateForeignKeyProcessColumn") + column.getColumnName()+ " / " +

2
org.adempiere.base/src/org/idempiere/process/MoveClient.java
View File

@ -621,7 +621,7 @@ public class MoveClient extends SvrProcess {
.append(" ON ( c.AD_Table_ID = t.AD_Table_ID ) ") .append(" ON ( c.AD_Table_ID = t.AD_Table_ID ) ")
.append("WHERE UPPER(t.TableName)=").append(DB.TO_STRING(tableName.toUpperCase())) .append("WHERE UPPER(t.TableName)=").append(DB.TO_STRING(tableName.toUpperCase()))
.append(" AND UPPER(c.ColumnName)=").append(DB.TO_STRING(columnName.toUpperCase())) .append(" AND UPPER(c.ColumnName)=").append(DB.TO_STRING(columnName.toUpperCase()))
.append(" AND ( c.FKConstraintType IS NULL OR c.FKConstraintType=").append(DB.TO_STRING(MColumn.FKCONSTRAINTTYPE_DoNotCreate)).append(")"); .append(" AND ( c.FKConstraintType IS NULL OR c.FKConstraintType=").append(DB.TO_STRING(MColumn.FKCONSTRAINTTYPE_DoNotCreate_Ignore)).append(")");
int cntFk = countInExternal(sqlVerifFKSB.toString()); int cntFk = countInExternal(sqlVerifFKSB.toString());
if (cntFk > 0) { if (cntFk > 0) {
statusUpdate("Validating orphans for " + table.getTableName() + "." + columnName); statusUpdate("Validating orphans for " + table.getTableName() + "." + columnName);

207
org.idempiere.test/src/org/idempiere/test/model/ModelForeignKeyTest.java Normal file
View File

@ -0,0 +1,207 @@
/***********************************************************************
* This file is part of iDempiere ERP Open Source *
* http://www.idempiere.org *
* *
* Copyright (C) Contributors *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
* as published by the Free Software Foundation; either version 2 *
* of the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the Free Software *
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, *
* MA 02110-1301, USA. *
* *
* Contributors: *
* - Carlos Ruiz - globalqss - bxservice *
**********************************************************************/
package org.idempiere.test.model;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Properties;
import org.adempiere.exceptions.AdempiereException;
import org.compiere.model.MColumn;
import org.compiere.model.MStyle;
import org.compiere.model.MStyleLine;
import org.compiere.model.MTest;
import org.compiere.model.PO;
import org.compiere.util.CacheMgt;
import org.compiere.util.Env;
import org.compiere.util.Trx;
import org.idempiere.test.AbstractTestCase;
import org.junit.jupiter.api.Test;
/**
*
* @author Carlos Ruiz - globalqss - bxservice
*
*/
public class ModelForeignKeyTest extends AbstractTestCase {
public ModelForeignKeyTest() {
}
@Test
public void testModelCascadeRecordId() {
Properties ctx = Env.getCtx();
String trxName = getTrxName();
// set model cascade on Test.Record_ID
MColumn col_test_record_id = new MColumn(ctx, MColumn.getColumn_ID(MTest.Table_Name, MTest.COLUMNNAME_Record_ID), trxName);
col_test_record_id.setFKConstraintType(MColumn.FKCONSTRAINTTYPE_ModelCascade);
try {
PO.setCrossTenantSafe();
col_test_record_id.saveEx();
} finally {
PO.clearCrossTenantSafe();
}
CacheMgt.get().reset();
MTest test1 = new MTest(ctx, 0, trxName);
test1.setName("Test 1");
test1.saveEx();
MTest test2 = new MTest(ctx, 0, trxName);
test2.setName("Test 2");
test2.saveEx();
test1.setAD_Table_ID(MTest.Table_ID);
test1.setRecord_ID(test2.getTest_ID());
test1.saveEx();
test2.deleteEx(true);
test1.load(trxName);
assertTrue(test1.get_ID() == 0);
}
@Test
public void testModelSetNullRecordId() {
Properties ctx = Env.getCtx();
String trxName = getTrxName();
// set model cascade on Test.Record_ID
MColumn col_test_record_id = new MColumn(ctx, MColumn.getColumn_ID(MTest.Table_Name, MTest.COLUMNNAME_Record_ID), trxName);
col_test_record_id.setFKConstraintType(MColumn.FKCONSTRAINTTYPE_ModelSetNull);
try {
PO.setCrossTenantSafe();
col_test_record_id.saveEx();
} finally {
PO.clearCrossTenantSafe();
}
CacheMgt.get().reset();
MTest test1 = new MTest(ctx, 0, trxName);
test1.setName("Test 1");
test1.saveEx();
MTest test2 = new MTest(ctx, 0, trxName);
test2.setName("Test 2");
test2.saveEx();
test1.setAD_Table_ID(MTest.Table_ID);
test1.setRecord_ID(test2.getTest_ID());
test1.saveEx();
test2.deleteEx(true);
test1.load(trxName);
assertTrue(test1.get_ID() > 0);
assertTrue(test1.getRecord_ID() == 0);
}
@Test
public void testModelNoActionRecordId() {
Properties ctx = Env.getCtx();
String trxName = getTrxName();
// set model cascade on Test.Record_ID
MColumn col_test_record_id = new MColumn(ctx, MColumn.getColumn_ID(MTest.Table_Name, MTest.COLUMNNAME_Record_ID), trxName);
col_test_record_id.setFKConstraintType(MColumn.FKCONSTRAINTTYPE_ModelNoAction_ForbidDeletion);
try {
PO.setCrossTenantSafe();
col_test_record_id.saveEx();
} finally {
PO.clearCrossTenantSafe();
}
CacheMgt.get().reset();
MTest test1 = new MTest(ctx, 0, trxName);
test1.setName("Test 1");
test1.saveEx();
MTest test2 = new MTest(ctx, 0, trxName);
test2.setName("Test 2");
test2.saveEx();
test1.setAD_Table_ID(MTest.Table_ID);
test1.setRecord_ID(test2.getTest_ID());
test1.saveEx();
assertThrows(AdempiereException.class, () -> {
test2.deleteEx(true);
});
}
@Test
public void testDBNoAction() {
Properties ctx = Env.getCtx();
String trxName = getTrxName();
// set model cascade on Test.Record_ID
CacheMgt.get().reset();
MColumn col_styleline_style = new MColumn(ctx, MColumn.getColumn_ID(MStyleLine.Table_Name, MStyleLine.COLUMNNAME_AD_Style_ID), trxName);
// this is the default already set in database
assertTrue(MColumn.FKCONSTRAINTTYPE_NoAction_ForbidDeletion.equals(col_styleline_style.getFKConstraintType()));
MStyle style = new MStyle(ctx, 0, trxName);
style.setName("Test");
style.saveEx();
MStyleLine styleLine = new MStyleLine(ctx, 0, trxName);
styleLine.setAD_Style_ID(style.getAD_Style_ID());
styleLine.setLine(10);
styleLine.setInlineStyle("Test");
styleLine.saveEx();
style.deleteEx(true);
assertThrows(
Exception.class,
() -> Trx.get(trxName, false).commit(true),
"Expected Trx.commit to throw Exception, but it didn't"
);
}
@Test
public void testModelNoAction() {
Properties ctx = Env.getCtx();
String trxName = getTrxName();
// set model cascade on Test.Record_ID
MColumn col_styleline_style = new MColumn(ctx, MColumn.getColumn_ID(MStyleLine.Table_Name, MStyleLine.COLUMNNAME_AD_Style_ID), trxName);
col_styleline_style.setFKConstraintType(MColumn.FKCONSTRAINTTYPE_ModelCascade);
try {
PO.setCrossTenantSafe();
col_styleline_style.saveEx();
} finally {
PO.clearCrossTenantSafe();
}
CacheMgt.get().reset();
MStyle style = new MStyle(ctx, 0, trxName);
style.setName("Test");
style.saveEx();
MStyleLine styleLine = new MStyleLine(ctx, 0, trxName);
styleLine.setAD_Style_ID(style.getAD_Style_ID());
styleLine.setLine(10);
styleLine.setInlineStyle("Test");
styleLine.saveEx();
style.deleteEx(true);
styleLine.load(trxName);
assertTrue(styleLine.get_ID() == 0);
}
}