[Jboss-cvs] JBossAS SVN: r56162 - branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/cmp/jdbc

[jboss-cvs-commits at lists.jboss.org]

Author: alex.loubyansky at jboss.com
Date: 2006-08-22 18:02:10 -0400 (Tue, 22 Aug 2006)
New Revision: 56162

Modified:
   branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/EJBQLToSQL92Compiler.java
   branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCEJBQLCompiler.java
   branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/QueryParameter.java
Log:
JBAS-3541

Modified: branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/EJBQLToSQL92Compiler.java
===================================================================
--- branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/EJBQLToSQL92Compiler.java	2006-08-22 22:00:55 UTC (rev 56161)
+++ branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/EJBQLToSQL92Compiler.java	2006-08-22 22:02:10 UTC (rev 56162)
@@ -671,11 +671,7 @@
          ASTParameter param = (ASTParameter) child0;
          Class type = getParameterType(param.number);
 
-         QueryParameter queryParam = new QueryParameter(param.number - 1,
-            false, // isPrimaryKeyParameter
-            null, // field
-            null, // parameter
-            typeFactory.getJDBCTypeForJavaType(type));
+         QueryParameter queryParam = new QueryParameter(param.number - 1, typeFactory.getJDBCType(type));
          inputParameters.add(queryParam);
 
          sql.append("? IS ");
@@ -1219,11 +1215,7 @@
             "parameter node. Should have been handled at a higher level.");
       }
 
-      QueryParameter param = new QueryParameter(node.number - 1,
-         false, // isPrimaryKeyParameter
-         null, // field
-         null, // parameter
-         typeFactory.getJDBCTypeForJavaType(type));
+      QueryParameter param = new QueryParameter(node.number - 1, typeFactory.getJDBCType(type));
       inputParameters.add(param);
       buf.append('?');
 

Modified: branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCEJBQLCompiler.java
===================================================================
--- branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCEJBQLCompiler.java	2006-08-22 22:00:55 UTC (rev 56161)
+++ branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCEJBQLCompiler.java	2006-08-22 22:02:10 UTC (rev 56162)
@@ -1133,11 +1133,7 @@
          ASTParameter param = (ASTParameter) child0;
          Class type = getParameterType(param.number);
 
-         QueryParameter queryParam = new QueryParameter(param.number - 1,
-            false, // isPrimaryKeyParameter
-            null, // field
-            null, // parameter
-            typeFactory.getJDBCTypeForJavaType(type));
+         QueryParameter queryParam = new QueryParameter(param.number - 1, typeFactory.getJDBCType(type));
          inputParameters.add(queryParam);
 
          buf.append("? IS ");
@@ -1677,11 +1673,7 @@
             "parameter node. Should have been handled at a higher level.");
       }
 
-      QueryParameter param = new QueryParameter(node.number - 1,
-         false, // isPrimaryKeyParameter
-         null, // field
-         null, // parameter
-         typeFactory.getJDBCTypeForJavaType(type));
+      QueryParameter param = new QueryParameter(node.number - 1, typeFactory.getJDBCType(type));
       inputParameters.add(param);
       buf.append('?');
       return buf;

Modified: branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/QueryParameter.java
===================================================================
--- branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/QueryParameter.java	2006-08-22 22:00:55 UTC (rev 56161)
+++ branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/QueryParameter.java	2006-08-22 22:02:10 UTC (rev 56162)
@@ -62,13 +62,7 @@
       }
       else
       {
-         QueryParameter param = new QueryParameter(
-            argNum,
-            false,
-            null,
-            null,
-            type.getJDBCTypes()[0]);
-         param.type = type;
+         QueryParameter param = new QueryParameter(argNum, type);
          parameters = Collections.singletonList(param);
       }
       return parameters;
@@ -155,7 +149,7 @@
    private final boolean isPrimaryKeyParameter;
    private JDBCFieldBridge field;
    private JDBCTypeComplexProperty property;
-   private final String parameterString;
+   private String parameterString;
 
    private int jdbcType;
    private JDBCType type;
@@ -259,6 +253,15 @@
       }
    }
 
+   public QueryParameter(int argNum, JDBCType type)
+   {
+      this.argNum = argNum;
+      this.type = type;
+      this.jdbcType = type.getJDBCTypes()[0];
+      this.isPrimaryKeyParameter = false;
+      initToString();
+   }
+
    public QueryParameter(
       int argNum,
       boolean isPrimaryKeyParameter,
@@ -273,6 +276,11 @@
       this.property = property;
       this.jdbcType = jdbcType;
 
+      initToString();
+   }
+
+   private void initToString()
+   {
       StringBuffer parameterBuf = new StringBuffer();
       parameterBuf.append(argNum);
       if(field != null)