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

IDEMPIERE-5229 After migrate helper (FHCA-4070) (#2031) 

- Improve validation of views
This commit is contained in:
Carlos Ruiz 2023-09-30 05:44:25 +02:00 committed by GitHub
parent cb6c8b636d
commit c994581aef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 154 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
migration/iD10/oracle/202309271721_IDEMPIERE-5229.sql Normal file
View File

@ -0,0 +1,21 @@
-- IDEMPIERE-5229 After migrate helper (FHCA-4070)
SELECT register_migration_script('202309271721_IDEMPIERE-5229.sql') FROM dual;
SET SQLBLANKLINES ON
SET DEFINE OFF
-- Sep 27, 2023, 5:21:22 PM CEST
UPDATE AD_Message SET MsgText='Column View does not exist in database.
The view column {0} was created on {1,date,long} by {2}',Updated=TO_TIMESTAMP('2023-09-27 17:21:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200818
;
-- Sep 27, 2023, 5:22:53 PM CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('E','View does not exist in database.
The view {0} was created on {1,date,long} by {2}',0,0,'Y',TO_TIMESTAMP('2023-09-27 17:22:52','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2023-09-27 17:22:52','YYYY-MM-DD HH24:MI:SS'),100,200836,'VM_ViewNotInDB','D','27048f83-7f7d-491d-b424-47c29a19aa66')
;
-- Sep 27, 2023, 6:27:17 PM CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('E','Column View does not exist in dictionary.
The view column {0} exists in database but is not defined in dictionary',0,0,'Y',TO_TIMESTAMP('2023-09-27 18:27:17','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2023-09-27 18:27:17','YYYY-MM-DD HH24:MI:SS'),100,200837,'VM_ViewColumnNotInDict','D','ba575690-245d-4615-bf7e-e2bbe3cd4917')
;

18
migration/iD10/postgresql/202309271721_IDEMPIERE-5229.sql Normal file
View File

@ -0,0 +1,18 @@
-- IDEMPIERE-5229 After migrate helper (FHCA-4070)
SELECT register_migration_script('202309271721_IDEMPIERE-5229.sql') FROM dual;
-- Sep 27, 2023, 5:21:22 PM CEST
UPDATE AD_Message SET MsgText='Column View does not exist in database.
The view column {0} was created on {1,date,long} by {2}',Updated=TO_TIMESTAMP('2023-09-27 17:21:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200818
;
-- Sep 27, 2023, 5:22:53 PM CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('E','View does not exist in database.
The view {0} was created on {1,date,long} by {2}',0,0,'Y',TO_TIMESTAMP('2023-09-27 17:22:52','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2023-09-27 17:22:52','YYYY-MM-DD HH24:MI:SS'),100,200836,'VM_ViewNotInDB','D','27048f83-7f7d-491d-b424-47c29a19aa66')
;
-- Sep 27, 2023, 6:27:17 PM CEST
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('E','Column View does not exist in dictionary.
The view column {0} exists in database but is not defined in dictionary',0,0,'Y',TO_TIMESTAMP('2023-09-27 18:27:17','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2023-09-27 18:27:17','YYYY-MM-DD HH24:MI:SS'),100,200837,'VM_ViewColumnNotInDict','D','ba575690-245d-4615-bf7e-e2bbe3cd4917')
;

155
org.adempiere.base/src/org/idempiere/process/VerifyMigration.java
View File

@ -32,7 +32,11 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import org.adempiere.exceptions.DBException;
@ -87,14 +91,14 @@ public class VerifyMigration extends SvrProcess {
verifyCustomizationsInChangeLog();
verifyCustomViewColumns();
verifyViewColumns();
addLog(getAD_PInstance_ID(), null, null, Msg.getElement(getCtx(), MPInstance.COLUMNNAME_AD_PInstance_ID) + " " + getAD_PInstance_ID(), MPInstance.Table_ID, getAD_PInstance_ID());
return "@Inserted@ " + m_cnt;
}
/**
* @return number of records inserted in AD_VerifyMigration
* Verify if the customizations registered in change log were modified with migration scripts
*/
private void verifyCustomizationsInChangeLog() {
StringBuilder sql = new StringBuilder();
@ -180,60 +184,58 @@ public class VerifyMigration extends SvrProcess {
}
/**
* @return number of records inserted in AD_VerifyMigration
* Verify if views and columns exist in database
* @throws SQLException
*/
private void verifyCustomViewColumns() throws SQLException {
// custom view columns
List<MViewColumn> viewColumns = new Query(getCtx(), MViewColumn.Table_Name, "EntityType!='D'", get_TrxName())
private void verifyViewColumns() throws SQLException {
List<MTable> tables = new Query(getCtx(), MTable.Table_Name, "IsView='Y'", get_TrxName())
.setOnlyActiveRecords(true)
.list();
for (MTable table : tables) {
// Find columns in Dictionary
MViewComponent component = new Query(getCtx(), MViewComponent.Table_Name, "AD_Table_ID=?", get_TrxName())
.setOnlyActiveRecords(true)
.list();
for (MViewColumn viewColumn : viewColumns) {
MViewComponent viewComponent = new MViewComponent(getCtx(), viewColumn.getAD_ViewComponent_ID(), get_TrxName());
MTable table = MTable.get(viewComponent.getAD_Table_ID());
// Find Column in Database
.setParameters(table.getAD_Table_ID())
.setOrderBy(MViewComponent.COLUMNNAME_SeqNo)
.first();
if (component == null) {
log.warning("View not defined in dictionary " + table.getTableName());
continue;
}
List<String> listDict = new ArrayList<String>();
Map<String, MViewColumn> mapDict = new HashMap<String, MViewColumn>();
for (MViewColumn vcol : component.getColumns(true)) {
String columnName = vcol.getColumnName();
if (columnName.startsWith("\"") && columnName.endsWith("\""))
columnName = columnName.substring(1, columnName.length()-1);
listDict.add(columnName.toUpperCase());
mapDict.put(columnName.toUpperCase(), vcol);
}
if (listDict.size() == 0) { // ignore, view not defined in dictionary
log.warning("View not defined in dictionary " + table.getTableName());
continue;
}
// Find columns in Database
Connection conn = null;
ResultSet rs = null;
List<String> listDB = new ArrayList<String>();
try {
conn = DB.getConnection();
DatabaseMetaData md = conn.getMetaData();
String catalog = DB.getDatabase().getCatalog();
String schema = DB.getDatabase().getSchema();
String tableName = table.getTableName();
if (md.storesUpperCaseIdentifiers()) {
if (md.storesUpperCaseIdentifiers())
tableName = tableName.toUpperCase();
} else if (md.storesLowerCaseIdentifiers()) {
else if (md.storesLowerCaseIdentifiers())
tableName = tableName.toLowerCase();
}
rs = md.getColumns(catalog, schema, tableName, null);
boolean found = false;
while (rs.next()) {
String columnName = rs.getString ("COLUMN_NAME");
if (!columnName.equalsIgnoreCase(viewColumn.getColumnName()))
continue;
found = true;
}
if (!found) {
if (! MVerifyMigration.isIgnored(-1, MViewColumn.Table_ID, -1, viewColumn.getAD_ViewColumn_ID(), get_TrxName())) {
String tabcol = table.getTableName() + "." + viewColumn.getColumnName();
MUser user = MUser.get(viewColumn.getCreatedBy());
String msg = Msg.getMsg(getCtx(), "VM_CustomViewColumnNotInDB",
// Column View does not exist in database. The custom view column {0} was created on {1,date,long} by {2}
new Object[] {
tabcol,
viewColumn.getCreated(),
user.getName()
});
addVerifyMigration(
MViewColumn.Table_ID,
-1,
viewColumn.getAD_ViewColumn_ID(),
-1,
msg,
null,
null,
MVerifyMigration.PRIORITYRULE_High);
}
listDB.add(columnName.toUpperCase());
}
} finally {
DB.close(rs);
@ -244,6 +246,79 @@ public class VerifyMigration extends SvrProcess {
} catch (Exception e) {}
}
}
if (listDB.size() == 0) { // view not in database
if (! MVerifyMigration.isIgnored(-1, MTable.Table_ID, -1, table.getAD_Table_ID(), get_TrxName())) {
MUser user = MUser.get(table.getCreatedBy());
String msg = Msg.getMsg(getCtx(), "VM_ViewNotInDB",
// View does not exist in database. The view {0} was created on {1,date,long} by {2}
new Object[] {
table.getTableName(),
table.getCreated(),
user.getName()
});
addVerifyMigration(
MTable.Table_ID,
-1,
table.getAD_Table_ID(),
-1,
msg,
null,
null,
MVerifyMigration.PRIORITYRULE_High);
}
continue;
}
Collections.sort(listDB);
Collections.sort(listDict);
List<String> inDictNotDB = new ArrayList<>(listDict);
inDictNotDB.removeAll(listDB);
for (String colDictNotDB : inDictNotDB) {
MViewColumn viewColumn = mapDict.get(colDictNotDB);
if (! MVerifyMigration.isIgnored(-1, MViewColumn.Table_ID, -1, viewColumn.getAD_ViewColumn_ID(), get_TrxName())) {
String tabcol = table.getTableName() + "." + viewColumn.getColumnName();
MUser user = MUser.get(viewColumn.getCreatedBy());
String msg = Msg.getMsg(getCtx(), "VM_CustomViewColumnNotInDB",
// Column View does not exist in database. The custom view column {0} was created on {1,date,long} by {2}
new Object[] {
tabcol,
viewColumn.getCreated(),
user.getName()
});
addVerifyMigration(
MViewColumn.Table_ID,
-1,
viewColumn.getAD_ViewColumn_ID(),
-1,
msg,
null,
null,
MVerifyMigration.PRIORITYRULE_High);
}
}
List<String> inDBNotInDict = new ArrayList<>(listDB);
inDBNotInDict.removeAll(listDict);
for (String colDBNotInDict : inDBNotInDict) {
// At this moment this cannot be ignored
String tabcol = table.getTableName() + "." + colDBNotInDict;
String msg = Msg.getMsg(getCtx(), "VM_ViewColumnNotInDict",
// Column View does not exist in dictionary. The view column {0} exists in database but is not defined in dictionary
new Object[] {
tabcol
});
addVerifyMigration(
MViewColumn.Table_ID,
-1,
-1,
-1,
msg,
null,
null,
MVerifyMigration.PRIORITYRULE_High);
}
}
}