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

Qualified column names in ORDER BY. Thank's to Felix.

This commit is contained in:
trifonnt 2009-09-24 15:13:28 +00:00
parent 9c243122b6
commit f9e57a6412
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/src/org/compiere/model/MAdvertisement.java
View File

@ -155,7 +155,7 @@ public class MAdvertisement extends X_W_Advertisement
if (m_SalesRep_ID == 0) if (m_SalesRep_ID == 0)
m_SalesRep_ID = DB.getSQLValue(null, m_SalesRep_ID = DB.getSQLValue(null,
"SELECT AD_User_ID FROM AD_User " "SELECT AD_User_ID FROM AD_User "
+ "WHERE C_BPartner_ID=? AND IsActive='Y' ORDER BY 1", getC_BPartner_ID()); + "WHERE C_BPartner_ID=? AND IsActive='Y' ORDER BY AD_User_ID", getC_BPartner_ID());
} }
return m_SalesRep_ID; return m_SalesRep_ID;
} // getSalesRep_ID } // getSalesRep_ID

4
base/src/org/compiere/model/MLanguage.java
View File

@ -330,7 +330,7 @@ public class MLanguage extends X_AD_Language
*/ */
public int maintain (boolean add) public int maintain (boolean add)
{ {
String sql = "SELECT TableName FROM AD_Table WHERE TableName LIKE '%_Trl' ORDER BY 1"; String sql = "SELECT TableName FROM AD_Table WHERE TableName LIKE '%_Trl' ORDER BY TableName";
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
int retNo = 0; int retNo = 0;
@ -384,7 +384,7 @@ public class MLanguage extends X_AD_Language
+ " INNER JOIN AD_Table t ON (c.AD_Table_ID=t.AD_Table_ID) " + " INNER JOIN AD_Table t ON (c.AD_Table_ID=t.AD_Table_ID) "
+ "WHERE t.TableName=?" + "WHERE t.TableName=?"
+ " AND c.IsTranslated='Y' AND c.IsActive='Y' " + " AND c.IsTranslated='Y' AND c.IsActive='Y' "
+ "ORDER BY 1"; + "ORDER BY c.ColumnName";
ArrayList<String> columns = new ArrayList<String>(5); ArrayList<String> columns = new ArrayList<String>(5);
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;

4
base/src/org/compiere/model/MRoleTest.java
View File

@ -72,11 +72,11 @@ public class MRoleTest extends TestCase
// add test code here // add test code here
String sql = m_role.addAccessSQL( String sql = m_role.addAccessSQL(
"SELECT r.a,r.b,r.c FROM AD_Role r WHERE EXISTS " "SELECT r.a,r.b,r.c FROM AD_Role r WHERE EXISTS "
+ "(SELECT AD_Column c WHERE c.a=c.b) ORDER BY 1", + "(SELECT AD_Column c WHERE c.a=c.b) ORDER BY r.a",
"r", "r",
MRole.SQL_FULLYQUALIFIED, MRole.SQL_RO); MRole.SQL_FULLYQUALIFIED, MRole.SQL_RO);
System.out.println(sql); System.out.println(sql);
assertEquals(sql, "SELECT r.a,r.b,r.c FROM AD_Role r WHERE EXISTS (SELECT AD_Column c WHERE c.a=c.b) AND r.AD_Client_ID=0 AND r.AD_Org_ID=0 ORDER BY 1"); assertEquals(sql, "SELECT r.a,r.b,r.c FROM AD_Role r WHERE EXISTS (SELECT AD_Column c WHERE c.a=c.b) AND r.AD_Client_ID=0 AND r.AD_Org_ID=0 ORDER BY r.a");
} }

2
base/src/org/compiere/model/PO.java
View File

@ -3233,7 +3233,7 @@ public abstract class PO
s_acctColumns = new ArrayList<String>(); s_acctColumns = new ArrayList<String>();
String sql = "SELECT c.ColumnName " String sql = "SELECT c.ColumnName "
+ "FROM AD_Column c INNER JOIN AD_Table t ON (c.AD_Table_ID=t.AD_Table_ID) " + "FROM AD_Column c INNER JOIN AD_Table t ON (c.AD_Table_ID=t.AD_Table_ID) "
+ "WHERE t.TableName=? AND c.IsActive='Y' AND c.AD_Reference_ID=25 ORDER BY 1"; + "WHERE t.TableName=? AND c.IsActive='Y' AND c.AD_Reference_ID=25 ORDER BY c.ColumnName";
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
try try

2
base/src/org/compiere/model/PO_Record.java
View File

@ -177,7 +177,7 @@ public class PO_Record
*/ */
static void validate () static void validate ()
{ {
String sql = "SELECT AD_Table_ID, TableName FROM AD_Table WHERE IsView='N' ORDER BY 2"; String sql = "SELECT AD_Table_ID, TableName FROM AD_Table WHERE IsView='N' ORDER BY TableName";
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
try try

2
base/src/org/compiere/print/PrintFormatUtil.java
View File

@ -108,7 +108,7 @@ public class PrintFormatUtil
+ " AND pfi.AD_Column_ID=c.AD_Column_ID" + " AND pfi.AD_Column_ID=c.AD_Column_ID"
+ " AND pfi.AD_PrintFormat_ID=?)" // 1 + " AND pfi.AD_PrintFormat_ID=?)" // 1
+ " AND c.AD_Table_ID=? " // 2 + " AND c.AD_Table_ID=? " // 2
+ "ORDER BY 1"; + "ORDER BY c.AD_Column_ID";
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
int counter = 0; int counter = 0;

6
client/src/org/compiere/install/TranslationDialog.java
View File

@ -136,7 +136,7 @@ public class TranslationDialog extends CPanel
String sql = "SELECT Name, AD_Client_ID " String sql = "SELECT Name, AD_Client_ID "
+ "FROM AD_Client " + "FROM AD_Client "
+ "WHERE IsActive='Y' " + "WHERE IsActive='Y' "
+ "ORDER BY 2"; + "ORDER BY AD_Client_ID";
try try
{ {
PreparedStatement pstmt = DB.prepareStatement(sql, null); PreparedStatement pstmt = DB.prepareStatement(sql, null);
@ -158,7 +158,7 @@ public class TranslationDialog extends CPanel
sql = "SELECT Name, AD_Language " sql = "SELECT Name, AD_Language "
+ "FROM AD_Language " + "FROM AD_Language "
+ "WHERE IsActive='Y' AND (IsSystemLanguage='Y' OR IsBaseLanguage='Y')" + "WHERE IsActive='Y' AND (IsSystemLanguage='Y' OR IsBaseLanguage='Y')"
+ "ORDER BY 1"; + "ORDER BY Name";
try try
{ {
PreparedStatement pstmt = DB.prepareStatement(sql, null); PreparedStatement pstmt = DB.prepareStatement(sql, null);
@ -181,7 +181,7 @@ public class TranslationDialog extends CPanel
sql = "SELECT Name, TableName " sql = "SELECT Name, TableName "
+ "FROM AD_Table " + "FROM AD_Table "
+ "WHERE TableName LIKE '%_Trl' AND TableName<>'AD_Column_Trl' " + "WHERE TableName LIKE '%_Trl' AND TableName<>'AD_Column_Trl' "
+ "ORDER BY 1"; + "ORDER BY Name";
try try
{ {
PreparedStatement pstmt = DB.prepareStatement(sql, null); PreparedStatement pstmt = DB.prepareStatement(sql, null);