User: dsundstrom
Date: 02/03/03 12:02:28
Modified: src/main/org/jboss/ejb/plugins/cmp/jdbc
JDBCDeclaredSQLQuery.java
Log:
Added optional alias element to select in declared-sql for specifing the
exact alias that will be used for the main select table.
Revision Changes Path
1.5 +14 -3
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCDeclaredSQLQuery.java
Index: JDBCDeclaredSQLQuery.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCDeclaredSQLQuery.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JDBCDeclaredSQLQuery.java 22 Feb 2002 04:24:55 -0000 1.4
+++ JDBCDeclaredSQLQuery.java 3 Mar 2002 20:02:28 -0000 1.5
@@ -31,7 +31,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Justin Forder</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Michel de Groot</a>
* @author <a href="[EMAIL PROTECTED]">danch (Dan Christopherson</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class JDBCDeclaredSQLQuery extends JDBCAbstractQueryCommand {
@@ -130,6 +130,7 @@
sql.append("DISTINCT ");
}
+ String alias = metadata.getAlias();
String from = metadata.getFrom();
if(getSelectField() == null) {
@@ -141,7 +142,12 @@
loadFields.addAll(getSelectEntity().getPrimaryKeyFields());
loadFields.addAll(getPreloadFields());
- if(from != null && from.trim().length()>0) {
+ if(alias != null && alias.trim().length()>0) {
+ sql.append(SQLUtil.getColumnNamesClause(loadFields, alias));
+ sql.append(" FROM ");
+ sql.append(table).append(" ").append(alias);
+ sql.append(" ").append(from);
+ } else if(from != null && from.trim().length()>0) {
sql.append(SQLUtil.getColumnNamesClause(loadFields, table));
sql.append(" FROM ").append(table).append(" ").append(from);
} else {
@@ -153,7 +159,12 @@
// we are just selecting one field
JDBCCMPFieldBridge selectField = getSelectField();
String table = selectField.getMetaData().getEntity().getTableName();
- if(from != null && from.trim().length()>0) {
+ if(alias != null && alias.trim().length()>0) {
+ sql.append(SQLUtil.getColumnNamesClause(selectField, alias));
+ sql.append(" FROM ");
+ sql.append(table).append(" ").append(alias);
+ sql.append(" ").append(from);
+ } else if(from != null && from.trim().length()>0) {
sql.append(SQLUtil.getColumnNamesClause(selectField, table));
sql.append(" FROM ").append(table).append(" ").append(from);
} else {
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
