IDEMPIERE-6062 Wrong query when importing translations / IDEMPIERE-5567 (#2259)
This commit is contained in:
parent
64e35fd5f9
commit
7b210dbfbb
|
@ -20,9 +20,11 @@ import java.sql.Timestamp;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
|
||||||
import org.adempiere.exceptions.AdempiereException;
|
import org.adempiere.exceptions.AdempiereException;
|
||||||
|
import org.compiere.model.MTable;
|
||||||
import org.compiere.model.PO;
|
import org.compiere.model.PO;
|
||||||
import org.compiere.util.CLogger;
|
import org.compiere.util.CLogger;
|
||||||
import org.compiere.util.DB;
|
import org.compiere.util.DB;
|
||||||
|
import org.compiere.util.Env;
|
||||||
import org.compiere.util.Language;
|
import org.compiere.util.Language;
|
||||||
import org.xml.sax.Attributes;
|
import org.xml.sax.Attributes;
|
||||||
import org.xml.sax.SAXException;
|
import org.xml.sax.SAXException;
|
||||||
|
@ -172,7 +174,15 @@ public class TranslationHandler extends DefaultHandler
|
||||||
// Where section
|
// Where section
|
||||||
m_sql.append(" WHERE ");
|
m_sql.append(" WHERE ");
|
||||||
if (m_curUUID != null) {
|
if (m_curUUID != null) {
|
||||||
|
MTable table = MTable.get(Env.getCtx(), m_TableName);
|
||||||
|
if (table.isIDKeyTable()) {
|
||||||
|
StringBuilder sql = new StringBuilder("SELECT ").append(m_TableName).append("_ID").append(" FROM ").append(m_TableName)
|
||||||
|
.append(" WHERE ").append(m_TableName).append("_UU =?");
|
||||||
|
int ID = DB.getSQLValueEx(null, sql.toString(), m_curUUID);
|
||||||
|
m_sql.append(m_TableName).append("_ID=").append(ID);
|
||||||
|
} else {
|
||||||
m_sql.append(PO.getUUIDColumnName(m_TableName)).append("=").append(DB.TO_STRING(m_curUUID));
|
m_sql.append(PO.getUUIDColumnName(m_TableName)).append("=").append(DB.TO_STRING(m_curUUID));
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
m_sql.append(m_TableName).append("_ID=").append(m_curID);
|
m_sql.append(m_TableName).append("_ID=").append(m_curID);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue