svn commit: r762154 - in /ibatis/trunk/java/ibatis-3: ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/ ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ ibatis-3-core/src/main/java/org/apache/ibatis/parser/

[cbegin]

Author: cbegin
Date: Sun Apr  5 20:40:31 2009
New Revision: 762154

URL: http://svn.apache.org/viewvc?rev=762154&view=rev
Log:
added parameterobject reference to boundsql

Modified:
    
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/DynamicSqlSource.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/SimpleSqlSource.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/BoundSql.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/MappedStatement.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/StaticSqlSource.java

Modified: 
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/DynamicSqlSource.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/DynamicSqlSource.java?rev=762154&r1=762153&r2=762154&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/DynamicSqlSource.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/DynamicSqlSource.java
 Sun Apr  5 20:40:31 2009
@@ -27,7 +27,7 @@
   }
 
   public BoundSql getBoundSql(Object parameterObject) {
-    return new BoundSql(getSql(parameterObject), 
getParameterMappings(parameterObject));
+    return new BoundSql(getSql(parameterObject), 
getParameterMappings(parameterObject), parameterObject);
   }
 
   private List<ParameterMapping> getParameterMappings(Object parameterObject) {

Modified: 
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/SimpleSqlSource.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/SimpleSqlSource.java?rev=762154&r1=762153&r2=762154&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/SimpleSqlSource.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/SimpleSqlSource.java
 Sun Apr  5 20:40:31 2009
@@ -31,7 +31,7 @@
   }
 
   public BoundSql getBoundSql(Object parameterObject) {
-    return new BoundSql(getSql(parameterObject), 
getParameterMappings(parameterObject));
+    return new BoundSql(getSql(parameterObject), parameterMappings, 
parameterObject);
   }
 
   private String getSql(Object parameterObject) {
@@ -41,10 +41,6 @@
     return new StaticSql(sql).getSql(parameterObject);
   }
 
-  private List<ParameterMapping> getParameterMappings(Object parameterObject) {
-    return parameterMappings;
-  }
-
   private void parseNodes(NodeletContext node) {
     StringBuilder sqlBuffer = new StringBuilder(sql);
     NodeList children = node.getNode().getChildNodes();

Modified: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/BoundSql.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/BoundSql.java?rev=762154&r1=762153&r2=762154&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/BoundSql.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/BoundSql.java
 Sun Apr  5 20:40:31 2009
@@ -6,10 +6,12 @@
 
   private String sql;
   private List<ParameterMapping> parameterMappings;
+  private Object parameterObject;
 
-  public BoundSql(String sql, List<ParameterMapping> parameterMappings) {
+  public BoundSql(String sql, List<ParameterMapping> parameterMappings, Object 
parameterObject) {
     this.sql = sql;
     this.parameterMappings = parameterMappings;
+    this.parameterObject = parameterObject;
   }
 
   public String getSql() {
@@ -20,4 +22,8 @@
     return parameterMappings;
   }
 
+  public Object getParameterObject() {
+    return parameterObject;
+  }
+
 }

Modified: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/MappedStatement.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/MappedStatement.java?rev=762154&r1=762153&r2=762154&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/MappedStatement.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/MappedStatement.java
 Sun Apr  5 20:40:31 2009
@@ -158,7 +158,7 @@
     BoundSql boundSql = sqlSource.getBoundSql(parameterObject);
     List<ParameterMapping> parameterMappings = boundSql.getParameterMappings();
     if (parameterMappings == null || parameterMappings.size() <= 0) {
-      boundSql = new BoundSql(boundSql.getSql(), 
parameterMap.getParameterMappings());
+      boundSql = new BoundSql(boundSql.getSql(), 
parameterMap.getParameterMappings(), parameterObject);
     }
     return boundSql;
   }

Modified: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/StaticSqlSource.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/StaticSqlSource.java?rev=762154&r1=762153&r2=762154&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/StaticSqlSource.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/StaticSqlSource.java
 Sun Apr  5 20:40:31 2009
@@ -8,19 +8,20 @@
 
 public class StaticSqlSource implements SqlSource {
 
-
-  private BoundSql boundSql;
+  private String sql;
+  private List<ParameterMapping> parameterMappings;
 
   public StaticSqlSource(String sql) {
-    this.boundSql = new BoundSql(sql, null);
+    this(sql, null);
   }
 
   public StaticSqlSource(String sql, List<ParameterMapping> parameterMappings) 
{
-    this.boundSql = new BoundSql(sql, parameterMappings);
+    this.sql = sql;
+    this.parameterMappings = parameterMappings;
   }
 
   public BoundSql getBoundSql(Object parameterObject) {
-    return boundSql;
+    return new BoundSql(sql, parameterMappings, parameterObject);
   }
 
 }