[jboss-cvs] JBossAS SVN: r63343 - in branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/cmp/jdbc: metadata and 1 other directory.

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

Author: alex.loubyansky at jboss.com
Date: 2007-06-05 05:52:57 -0400 (Tue, 05 Jun 2007)
New Revision: 63343

Modified:
   branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/EJBQLToSQL92Compiler.java
   branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCEJBQLCompiler.java
   branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCTypeMappingMetaData.java
Log:
JBAS-4462

Modified: branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/EJBQLToSQL92Compiler.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/EJBQLToSQL92Compiler.java	2007-06-05 09:35:32 UTC (rev 63342)
+++ branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/EJBQLToSQL92Compiler.java	2007-06-05 09:52:57 UTC (rev 63343)
@@ -1135,7 +1135,7 @@
    public Object visit(ASTMod node, Object data)
    {
       StringBuffer buf = (StringBuffer) data;
-      JDBCFunctionMappingMetaData function = JDBCTypeMappingMetaData.MOD_FUNC;
+      JDBCFunctionMappingMetaData function = typeMapping.getFunctionMapping(JDBCTypeMappingMetaData.MOD);
       Object[] args = childrenToStringArr(2, node);
       function.getFunctionSql(args, buf);
       return data;

Modified: branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCEJBQLCompiler.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCEJBQLCompiler.java	2007-06-05 09:35:32 UTC (rev 63342)
+++ branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCEJBQLCompiler.java	2007-06-05 09:52:57 UTC (rev 63343)
@@ -1521,8 +1521,7 @@
    public Object visit(ASTMod node, Object data)
    {
       StringBuffer buf = (StringBuffer) data;
-      //JDBCFunctionMappingMetaData function = typeMapping.getFunctionMapping(JDBCTypeMappingMetaData.MOD);
-      JDBCFunctionMappingMetaData function = JDBCTypeMappingMetaData.MOD_FUNC;
+      JDBCFunctionMappingMetaData function = typeMapping.getFunctionMapping(JDBCTypeMappingMetaData.MOD);
       Object[] args = new Object[]{
          new NodeStringWrapper(node.jjtGetChild(0)),
          new NodeStringWrapper(node.jjtGetChild(1)),

Modified: branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCTypeMappingMetaData.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCTypeMappingMetaData.java	2007-06-05 09:35:32 UTC (rev 63342)
+++ branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCTypeMappingMetaData.java	2007-06-05 09:52:57 UTC (rev 63343)
@@ -58,13 +58,13 @@
    public static final String ABS = "abs";
    public static final String SQRT = "sqrt";
    public static final String COUNT = "count";
+   public static final String MOD = "mod";
 
    public static JDBCFunctionMappingMetaData COUNT_FUNC;
    public static JDBCFunctionMappingMetaData MAX_FUNC;
    public static JDBCFunctionMappingMetaData MIN_FUNC;
    public static JDBCFunctionMappingMetaData AVG_FUNC;
    public static JDBCFunctionMappingMetaData SUM_FUNC;
-   public static JDBCFunctionMappingMetaData MOD_FUNC;
 
    static
    {
@@ -75,7 +75,6 @@
          MIN_FUNC = new JDBCFunctionMappingMetaData("min", "min(?1 ?2)");
          AVG_FUNC = new JDBCFunctionMappingMetaData("avg", "avg(?1 ?2)");
          SUM_FUNC = new JDBCFunctionMappingMetaData("sum", "sum(?1 ?2)");
-         MOD_FUNC = new JDBCFunctionMappingMetaData("mod", "mod(?1, ?2)");
       }
       catch(DeploymentException e)
       {
@@ -414,7 +413,7 @@
       return mappings.values();
    }
 
-   private void addDefaultFunctionMapping()
+   private void addDefaultFunctionMapping() throws DeploymentException
    {
       JDBCFunctionMappingMetaData function;
 
@@ -494,5 +493,9 @@
          },
          new int[]{0});
       functionMappings.put(function.getFunctionName().toLowerCase(), function);
+
+      // mod
+      function = new JDBCFunctionMappingMetaData("mod", "mod(?1, ?2)");
+      functionMappings.put(function.getFunctionName().toLowerCase(), function);
    }
 }