svn commit: r156225 - in incubator/beehive/trunk/netui/src: tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupport.java util/org/apache/beehive/netui/util/iterator/ResultSetIterator.java

[ekoneil]

Author: ekoneil
Date: Fri Mar  4 19:32:31 2005
New Revision: 156225

URL: http://svn.apache.org/viewcvs?view=rev&rev=156225
Log:
Couple of bug fixes:

- cleanup the SQLSupport API.  I messed up the fragment and non-fragment method 
signatures.
- fixup final off-by-one class in ResultSetIterator.  Note to self -- coding in 
TSSJS sessions can be fatal to code that doesn't have tests.  I'm leaving the 
bug open until I've got ResultSet tests done.

BB: self
DRT: NetUI pass


Modified:
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupport.java
    
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ResultSetIterator.java

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupport.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupport.java?view=diff&r1=156224&r2=156225
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupport.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupport.java
 Fri Mar  4 19:32:31 2005
@@ -127,7 +127,6 @@
             return EMPTY_STRING;
 
         StringBuilder sql = new StringBuilder();
-        sql.append("ORDER BY ");
         internalCreateOrderByFragment(sql, sorts);
         return sql.toString();
     }
@@ -137,25 +136,26 @@
             return EMPTY_STRING;
 
         StringBuilder sql = new StringBuilder(64);
+        sql.append("ORDER BY ");
         internalCreateOrderByFragment(sql, sorts);
         return sql.toString();
     }
 
-    public String createWhereClause(List<Filter> filters) {
+    public String createWhereFragment(List<Filter> filters) {
         if(filters == null || filters.size() == 0)
             return EMPTY_STRING;
 
-        StringBuilder sql = new StringBuilder();
-        sql.append("WHERE ");
+        StringBuilder sql = new StringBuilder(64);
         internalCreateWhereFragment(sql, filters);
         return sql.toString();
     }
 
-    public String createWhereFragment(List<Filter> filters) {
+    public String createWhereClause(List<Filter> filters) {
         if(filters == null || filters.size() == 0)
             return EMPTY_STRING;
 
-        StringBuilder sql = new StringBuilder(64);
+        StringBuilder sql = new StringBuilder();
+        sql.append("WHERE ");
         internalCreateWhereFragment(sql, filters);
         return sql.toString();
     }

Modified: 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ResultSetIterator.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ResultSetIterator.java?view=diff&r1=156224&r2=156225
==============================================================================
--- 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ResultSetIterator.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/iterator/ResultSetIterator.java
 Fri Mar  4 19:32:31 2005
@@ -96,7 +96,7 @@
             assert hasNext : "Ran off the end of a ResultSet";
             SortedMap map = new TreeMap(String.CASE_INSENSITIVE_ORDER);
             for(int i = 0; i < _columnNames.length; i++) {
-                Object value = _rs.getObject(i);
+                Object value = _rs.getObject(i+1);
                 if(_rs.wasNull())
                     value = null;
                 map.put(_columnNames[i], value);