User: dsundstrom
Date: 02/03/04 14:27:45
Modified: src/main/org/jboss/ejb/plugins/cmp/jdbc
JDBCAbstractQueryCommand.java QueryParameter.java
Log:
Cleaned up typeMapping handling.
Revision Changes Path
1.9 +6 -5
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCAbstractQueryCommand.java
Index: JDBCAbstractQueryCommand.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCAbstractQueryCommand.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JDBCAbstractQueryCommand.java 16 Feb 2002 10:37:54 -0000 1.8
+++ JDBCAbstractQueryCommand.java 4 Mar 2002 22:27:45 -0000 1.9
@@ -44,13 +44,14 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Joe Shevland</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Justin Forder</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public abstract class JDBCAbstractQueryCommand implements JDBCQueryCommand {
private JDBCStoreManager manager;
private JDBCQueryMetaData queryMetaData;
private Logger log;
+ private JDBCStoreManager selectManager;
private JDBCEntityBridge selectEntity;
private JDBCCMPFieldBridge selectField;
private List preloadFields = new ArrayList(0);
@@ -69,7 +70,7 @@
q.getMethod().getName());
queryMetaData = q;
- selectEntity = manager.getEntityBridge();
+ setSelectEntity(manager.getEntityBridge());
}
public Collection execute(
@@ -77,10 +78,8 @@
Object[] args,
EntityEnterpriseContext ctx) throws FinderException {
- JDBCStoreManager selectManager = null;
ReadAheadCache selectReadAheadCache = null;
if(selectEntity != null) {
- selectManager = selectEntity.getManager();
selectReadAheadCache = selectManager.getReadAheadCache();
}
@@ -209,6 +208,7 @@
protected void setSelectEntity(JDBCEntityBridge selectEntity) {
this.selectField = null;
this.selectEntity = selectEntity;
+ this.selectManager = selectEntity.getManager();
}
protected JDBCCMPFieldBridge getSelectField() {
@@ -218,6 +218,7 @@
protected void setSelectField(JDBCCMPFieldBridge selectField) {
this.selectEntity = null;
this.selectField = selectField;
+ this.selectManager = selectField.getManager();
}
protected List getPreloadFields() {
@@ -253,7 +254,7 @@
token = tokens.nextToken();
if(Character.isDigit(token.charAt(0))) {
QueryParameter parameter = new QueryParameter(
- manager,
+ selectManager,
queryMetaData.getMethod(),
token);
1.6 +1 -1
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/QueryParameter.java
Index: QueryParameter.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/QueryParameter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- QueryParameter.java 22 Feb 2002 04:24:55 -0000 1.5
+++ QueryParameter.java 4 Mar 2002 22:27:45 -0000 1.6
@@ -192,7 +192,7 @@
"a primay key field");
}
- // get the jdbc typ object
+ // get the jdbc type object
type = field.getJDBCType();
} else {
// get jdbc type from type manager
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
