DataNucleus

Revision: 4299
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4299&view=rev
Author:   andy_jefferson
Date:     2008-12-16 10:21:10 +0000 (Tue, 16 Dec 2008)

Log Message:
-----------
[NUCCORE-98] fix toString() for filter component

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java	2008-12-16 10:10:04 UTC (rev 4298)
+++ platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java	2008-12-16 10:21:10 UTC (rev 4299)
@@ -285,7 +285,7 @@
             }
             str.append("]\n");
         }
-        if (exprFrom != null)
+        if (exprFilter != null)
         {
             str.append(" [filter:").append(exprFilter).append("]\n");
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4302
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4302&view=rev
Author:   andy_jefferson
Date:     2008-12-16 13:53:48 +0000 (Tue, 16 Dec 2008)

Log Message:
-----------
[NUCCORE-98] add accessor for subquery aliases

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java	2008-12-16 10:33:25 UTC (rev 4301)
+++ platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java	2008-12-16 13:53:48 UTC (rev 4302)
@@ -112,6 +112,26 @@
     }
 
     /**
+     * Accessor for the aliases for any subqueries in this compilation.
+     * @return The subquery aliases (if any)
+     */
+    public String[] getSubqueryAliases()
+    {
+        if (subqueryCompilations == null || subqueryCompilations.isEmpty())
+        {
+            return null;
+        }
+        String[] aliases = new String[subqueryCompilations.size()];
+        Iterator<String> iter = subqueryCompilations.keySet().iterator();
+        int i = 0;
+        while (iter.hasNext())
+        {
+            aliases[i++] = iter.next();
+        }
+        return aliases;
+    }
+
+    /**
      * Accessor for the candidate class.
      * @return Candidate class
      */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4311
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=4311&view=rev
Author:   andy_jefferson
Date:     2008-12-17 13:53:42 +0000 (Wed, 17 Dec 2008)

Log Message:
-----------
Remove TODO returning the type of each result component

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java	2008-12-17 12:01:44 UTC (rev 4310)
+++ platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java	2008-12-17 13:53:42 UTC (rev 4311)
@@ -139,6 +139,12 @@
         return aliases;
     }
 
+    /**
+     * Accessor for whether this query will return a single row.
+     * This is true if all result selects are aggregates, or the user has set "unique" on the
+     * query.
+     * @return
+     */
     public boolean returnsSingleRow()
     {
         return returnsSingleRow;
@@ -156,13 +162,14 @@
             Class[] results = new Class[exprResult.length];
             for (int i=0;i<exprResult.length;i++)
             {
-                // TODO Really want the type of the object not the type of the expression
-                results[i] = exprResult[i].getClass();
+                Symbol colSym = exprResult[i].getSymbol();
+                results[i] = colSym.getValueType();
             }
             return results;
         }
         else
         {
+            // Each row must be an instance of the candidate
             return new Class[] {candidateClass};
         }
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5751
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=5751&view=rev
Author:   andy_jefferson
Date:     2009-03-25 14:42:01 +0000 (Wed, 25 Mar 2009)

Log Message:
-----------
spelling

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java	2009-03-25 13:49:32 UTC (rev 5750)
+++ platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java	2009-03-25 14:42:01 UTC (rev 5751)
@@ -297,7 +297,7 @@
     /**
      * Clone method to return a copy of this SymbolTable.
      * Useful when we are caching queries and don't want to use the symbol table
-     * that was cached sine may be used by another query.
+     * that was cached since may be used by another query.
      * @return The clone
      */
     public Object clone()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5792
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=5792&view=rev
Author:   andy_jefferson
Date:     2009-03-26 13:42:19 +0000 (Thu, 26 Mar 2009)

Log Message:
-----------
Add SymbolTable to toString() output

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java	2009-03-26 11:36:16 UTC (rev 5791)
+++ platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java	2009-03-26 13:42:19 UTC (rev 5792)
@@ -316,6 +316,26 @@
             }
             str.append("]\n");
         }
+        str.append(" [Symbols:\n");
+        Iterator<String> symIter = symtbl.getSymbolNames().iterator();
+        while (symIter.hasNext())
+        {
+            String symName = symIter.next();
+            Symbol sym = symtbl.getSymbol(symName);
+            if (sym.getValueType() != null)
+            {
+                str.append(symName + " type=" + sym.getValueType().getName());
+            }
+            else
+            {
+                str.append(symName + " type=unknown");
+            }
+            if (symIter.hasNext())
+            {
+                str.append(", ");
+            }
+        }
+        str.append("]");
         return str.toString();
     }
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5793
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=5793&view=rev
Author:   andy_jefferson
Date:     2009-03-26 13:58:43 +0000 (Thu, 26 Mar 2009)

Log Message:
-----------
formatting

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java	2009-03-26 13:42:19 UTC (rev 5792)
+++ platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java	2009-03-26 13:58:43 UTC (rev 5793)
@@ -316,7 +316,8 @@
             }
             str.append("]\n");
         }
-        str.append(" [Symbols:\n");
+
+        str.append(" [Symbols: ");
         Iterator<String> symIter = symtbl.getSymbolNames().iterator();
         while (symIter.hasNext())
         {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6252
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=6252&view=rev
Author:   andy_jefferson
Date:     2009-05-01 06:52:54 +0000 (Fri, 01 May 2009)

Log Message:
-----------
Include subquery info in compilation toString()

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java	2009-04-30 14:59:31 UTC (rev 6251)
+++ platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java	2009-05-01 06:52:54 UTC (rev 6252)
@@ -350,6 +350,18 @@
             }
         }
         str.append("]");
+
+        if (subqueryCompilations != null)
+        {
+            str.append("\n");
+            Iterator subqIter = subqueryCompilations.entrySet().iterator();
+            while (subqIter.hasNext())
+            {
+                Map.Entry<String, QueryCompilation> entry = (Map.Entry)subqIter.next();
+                str.append(" [Subquery: " + entry.getKey() + "\n").append(entry.getValue()).append("]\n");
+            }
+        }
+
         return str.toString();
     }
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6253
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=6253&view=rev
Author:   andy_jefferson
Date:     2009-05-01 07:02:01 +0000 (Fri, 01 May 2009)

Log Message:
-----------
Add indenting to compilation debug

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java	2009-05-01 06:52:54 UTC (rev 6252)
+++ platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java	2009-05-01 07:02:01 UTC (rev 6253)
@@ -268,10 +268,17 @@
 
     public String toString()
     {
-        StringBuilder str = new StringBuilder("QueryCompilation:");
+        StringBuilder str = new StringBuilder("QueryCompilation:\n");
+        str.append(debugString("  "));
+        return str.toString();
+    }
+
+    public String debugString(String indent)
+    {
+        StringBuilder str = new StringBuilder();
         if (exprResult != null)
         {
-            str.append(" [result:");
+            str.append(indent).append("[result:");
             for (int i=0;i<exprResult.length;i++)
             {
                 if (i > 0)
@@ -284,7 +291,7 @@
         }
         if (exprFrom != null)
         {
-            str.append(" [from:");
+            str.append(indent).append("[from:");
             for (int i=0;i<exprFrom.length;i++)
             {
                 if (i > 0)
@@ -297,11 +304,11 @@
         }
         if (exprFilter != null)
         {
-            str.append(" [filter:").append(exprFilter).append("]\n");
+            str.append(indent).append("[filter:").append(exprFilter).append("]\n");
         }
         if (exprGrouping != null)
         {
-            str.append(" [grouping:");
+            str.append(indent).append("[grouping:");
             for (int i=0;i<exprGrouping.length;i++)
             {
                 if (i > 0)
@@ -314,11 +321,11 @@
         }
         if (exprHaving != null)
         {
-            str.append(" [having:").append(exprHaving).append("]\n");
+            str.append(indent).append("[having:").append(exprHaving).append("]\n");
         }
         if (exprOrdering != null)
         {
-            str.append(" [ordering:");
+            str.append(indent).append("[ordering:");
             for (int i=0;i<exprOrdering.length;i++)
             {
                 if (i > 0)
@@ -330,7 +337,7 @@
             str.append("]\n");
         }
 
-        str.append(" [Symbols: ");
+        str.append(indent).append("[symbols: ");
         Iterator<String> symIter = symtbl.getSymbolNames().iterator();
         while (symIter.hasNext())
         {
@@ -358,7 +365,12 @@
             while (subqIter.hasNext())
             {
                 Map.Entry<String, QueryCompilation> entry = (Map.Entry)subqIter.next();
-                str.append(" [Subquery: " + entry.getKey() + "\n").append(entry.getValue()).append("]\n");
+                str.append(indent).append("[subquery: " + entry.getKey() + "\n");
+                str.append(entry.getValue().debugString(indent + "  ")).append("]");
+                if (subqIter.hasNext())
+                {
+                    str.append("\n");
+                }
             }
         }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6259
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=6259&view=rev
Author:   andy_jefferson
Date:     2009-05-01 09:59:10 +0000 (Fri, 01 May 2009)

Log Message:
-----------
Add method to find a ParameterExpression at a particular position in the query

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java	2009-05-01 09:56:38 UTC (rev 6258)
+++ platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java	2009-05-01 09:59:10 UTC (rev 6259)
@@ -22,7 +22,9 @@
 import java.util.Map;
 
 import org.datanucleus.ObjectManagerFactoryImpl;
+import org.datanucleus.query.QueryUtils;
 import org.datanucleus.query.expression.Expression;
+import org.datanucleus.query.expression.ParameterExpression;
 import org.datanucleus.query.symbol.Symbol;
 import org.datanucleus.query.symbol.SymbolTable;
 import org.datanucleus.util.Localiser;
@@ -266,6 +268,62 @@
         return exprOrdering;
     }
 
+    public ParameterExpression getParameterExpressionForPosition(int pos)
+    {
+        ParameterExpression paramExpr = null;
+        if (exprResult != null)
+        {
+            for (int i=0;i<exprResult.length;i++)
+            {
+                paramExpr = QueryUtils.getParameterExpressionForPosition(exprResult[i], pos);
+                if (paramExpr != null)
+                {
+                    return paramExpr;
+                }
+            }
+        }
+        if (exprFilter != null)
+        {
+            paramExpr = QueryUtils.getParameterExpressionForPosition(exprFilter, pos);
+            if (paramExpr != null)
+            {
+                return paramExpr;
+            }
+        }
+        if (exprGrouping != null)
+        {
+            for (int i=0;i<exprGrouping.length;i++)
+            {
+                paramExpr = QueryUtils.getParameterExpressionForPosition(exprGrouping[i], pos);
+                if (paramExpr != null)
+                {
+                    return paramExpr;
+                }
+            }
+        }
+        if (exprHaving != null)
+        {
+            paramExpr = QueryUtils.getParameterExpressionForPosition(exprHaving, pos);
+            if (paramExpr != null)
+            {
+                return paramExpr;
+            }
+        }
+        if (exprOrdering != null)
+        {
+            for (int i=0;i<exprOrdering.length;i++)
+            {
+                paramExpr = QueryUtils.getParameterExpressionForPosition(exprOrdering[i], pos);
+                if (paramExpr != null)
+                {
+                    return paramExpr;
+                }
+            }
+        }
+
+        return null;
+    }
+
     public String toString()
     {
         StringBuilder str = new StringBuilder("QueryCompilation:\n");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6353
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=6353&view=rev
Author:   andy_jefferson
Date:     2009-05-08 10:04:29 +0000 (Fri, 08 May 2009)

Log Message:
-----------
javadoc

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java	2009-05-08 09:29:07 UTC (rev 6352)
+++ platform/core/trunk/src/java/org/datanucleus/query/compiler/QueryCompilation.java	2009-05-08 10:04:29 UTC (rev 6353)
@@ -31,9 +31,11 @@
 
 /**
  * Representation of the components of a compiled java "string-based" query.
- * Assumes that the query has the form
+ * Assumes that the query has the following forms
  * <pre>
  * SELECT {result} FROM {from} WHERE {filter} GROUP BY {grouping} HAVING {having} ORDER BY {order}
+ * UPDATE {from} SET {update} WHERE {filter}
+ * DELETE FROM {from} WHERE {filter}
  * </pre>
  */
 public class QueryCompilation


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.