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

bug fix [ 1651801 ] GenerateModel: duplicate "getKeyNamePair" methods

This commit is contained in:
teo_sarca 2007-02-04 17:43:55 +00:00
parent 2c78a75af5
commit a4e7b53309
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dbPort/src/org/compiere/util/GenerateModel.java
View File

@ -35,6 +35,7 @@ import org.compiere.*;
* globalqss - Filter by table (LIKE) * globalqss - Filter by table (LIKE)
* *
* globalqss - integrate Teo Sarca hint [ 1617928 ] Ineficient use of Boolean ctor for gen. model * globalqss - integrate Teo Sarca hint [ 1617928 ] Ineficient use of Boolean ctor for gen. model
* teo_sarca - bug fix [ 1651801 ] GenerateModel: duplicate "getKeyNamePair" methods
*/ */
public class GenerateModel public class GenerateModel
{ {
@ -233,7 +234,8 @@ public class GenerateModel
String sql = "SELECT c.ColumnName, c.IsUpdateable, c.IsMandatory," // 1..3 String sql = "SELECT c.ColumnName, c.IsUpdateable, c.IsMandatory," // 1..3
+ " c.AD_Reference_ID, c.AD_Reference_Value_ID, DefaultValue, SeqNo, " // 4..7 + " c.AD_Reference_ID, c.AD_Reference_Value_ID, DefaultValue, SeqNo, " // 4..7
+ " c.FieldLength, c.ValueMin, c.ValueMax, c.VFormat, c.Callout, " // 8..12 + " c.FieldLength, c.ValueMin, c.ValueMax, c.VFormat, c.Callout, " // 8..12
+ " c.Name, c.Description, c.ColumnSQL, c.IsEncrypted " + " c.Name, c.Description, c.ColumnSQL, c.IsEncrypted, " // 13..16
+ " c.IsIdentifier " // 17
+ "FROM AD_Column c " + "FROM AD_Column c "
+ "WHERE c.AD_Table_ID=?" + "WHERE c.AD_Table_ID=?"
+ " AND c.IsActive='Y'" + " AND c.IsActive='Y'"
@ -243,6 +245,7 @@ public class GenerateModel
+ " AND c.ColumnName NOT LIKE 'Created%'" + " AND c.ColumnName NOT LIKE 'Created%'"
+ " AND c.ColumnName NOT LIKE 'Updated%' " + " AND c.ColumnName NOT LIKE 'Updated%' "
+ "ORDER BY c.ColumnName"; + "ORDER BY c.ColumnName";
boolean isKeyNamePairCreated = false; // true if the method "getKeyNamePair" is already generated
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
try try
{ {
@ -275,8 +278,10 @@ public class GenerateModel
defaultValue, ValueMin, ValueMax, VFormat, defaultValue, ValueMin, ValueMax, VFormat,
Callout, Name, Description, virtualColumn, IsEncrypted)); Callout, Name, Description, virtualColumn, IsEncrypted));
// //
if (seqNo == 1) if (!isKeyNamePairCreated && seqNo == 1 && "Y".equals(rs.getString("IsIdentifier"))) {
sb.append(createKeyNamePair(columnName, displayType)); sb.append(createKeyNamePair(columnName, displayType));
isKeyNamePairCreated = true;
}
} }
rs.close(); rs.close();
pstmt.close(); pstmt.close();