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

IDEMPIERE-3862 ORACLE - Update datatype NVARCHAR2 and CHAR(>1) to VARCHAR2 

Fix Column Encryption broken in oracle - it was changing the column to
NVARCHAR - modified to preserve the type, and fixed an error when
encrypting columns from AD_Client
This commit is contained in:
Carlos Ruiz 2020-03-13 13:37:45 +01:00
parent 8737d8a9ea
commit a1a0aad125
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
org.adempiere.base.process/src/org/compiere/process/ColumnEncryption.java
View File

@ -26,10 +26,12 @@
package org.compiere.process; package org.compiere.process;
import java.sql.Connection; import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.util.logging.Level; import java.util.logging.Level;
import org.compiere.db.AdempiereDatabase;
import org.compiere.model.MColumn; import org.compiere.model.MColumn;
import org.compiere.model.MTable; import org.compiere.model.MTable;
import org.compiere.util.AdempiereUserError; import org.compiere.util.AdempiereUserError;
@ -308,7 +310,7 @@ public class ColumnEncryption extends SvrProcess {
StringBuilder selectSql = new StringBuilder(); StringBuilder selectSql = new StringBuilder();
selectSql.append("SELECT ").append(idColumnName).append(",").append(columnName).append(",AD_Client_ID"); selectSql.append("SELECT ").append(idColumnName).append(",").append(columnName).append(",AD_Client_ID");
selectSql.append(" FROM ").append(tableName); selectSql.append(" FROM ").append(tableName);
selectSql.append(" ORDER BY ").append(idColumnName); selectSql.append(" ORDER BY 1");
StringBuilder updateSql = new StringBuilder(); StringBuilder updateSql = new StringBuilder();
updateSql.append("UPDATE ").append(tableName); updateSql.append("UPDATE ").append(tableName);
@ -464,11 +466,29 @@ public class ColumnEncryption extends SvrProcess {
// Select SQL // Select SQL
String selectSql = "SELECT FieldLength FROM AD_Column WHERE AD_Column_ID=?"; String selectSql = "SELECT FieldLength FROM AD_Column WHERE AD_Column_ID=?";
String dataType = "NVARCHAR2";
if (DB.isOracle()) {
Connection conn = Trx.get(get_TrxName(), false).getConnection();
AdempiereDatabase db = DB.getDatabase();
DatabaseMetaData md = conn.getMetaData();
String catalog = db.getCatalog();
String schema = db.getSchema();
ResultSet rs = null;
try {
rs = md.getColumns(catalog, schema, tableName.toUpperCase(), columnName.toUpperCase());
if (rs.next()) {
dataType = rs.getString ("TYPE_NAME");
}
} finally {
DB.close(rs);
}
}
// Alter SQL // Alter SQL
StringBuilder alterSql = new StringBuilder(); StringBuilder alterSql = new StringBuilder();
alterSql.append("ALTER TABLE ").append(tableName); alterSql.append("ALTER TABLE ").append(tableName);
alterSql.append(" MODIFY ").append(columnName); alterSql.append(" MODIFY ").append(columnName);
alterSql.append(" NVARCHAR2("); alterSql.append(" ").append(dataType).append("(");
alterSql.append(length).append(") "); alterSql.append(length).append(") ");
// Update SQL // Update SQL