brj 2005/11/02 13:23:33
Modified: src/java/org/apache/ojb/broker/accesslayer/sql Tag:
OJB_1_0_RELEASE SqlQueryStatement.java
Log:
fix for ojb-72: indirection table should be added only once
Revision Changes Path
No revision
No revision
1.75.2.13 +9 -4
db-ojb/src/java/org/apache/ojb/broker/accesslayer/sql/SqlQueryStatement.java
Index: SqlQueryStatement.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/sql/SqlQueryStatement.java,v
retrieving revision 1.75.2.12
retrieving revision 1.75.2.13
diff -u -r1.75.2.12 -r1.75.2.13
--- SqlQueryStatement.java 28 Oct 2005 19:48:06 -0000 1.75.2.12
+++ SqlQueryStatement.java 2 Nov 2005 21:23:32 -0000 1.75.2.13
@@ -1500,16 +1500,21 @@
stmtFromPos = buf.length(); // store position of join (by: Terry
Dexter)
}
- if (!(joinSyntax == SQL92_NOPAREN_JOIN_SYNTAX && alias != getRoot()))
+ if (alias == getRoot())
{
buf.append(alias.getTableAndAlias());
+ // BRJ: also add indirection table to FROM-clause for MtoNQuery
if (getQuery() instanceof MtoNQuery)
{
MtoNQuery mnQuery = (MtoNQuery)m_query;
- buf.append(",");
+ buf.append(", ");
buf.append(getTableAliasForPath(mnQuery.getIndirectionTable()).getTableAndAlias());
- }
+ }
+ }
+ else if (joinSyntax != SQL92_NOPAREN_JOIN_SYNTAX)
+ {
+ buf.append(alias.getTableAndAlias());
}
if (!alias.hasJoins())
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
