[Proxool-cvs] proxool/src/java/org/logicalcobwebs/proxool AbstractProxyStatement.java,1.17,1.18

[<bil...@us...>]

Update of /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9327/src/java/org/logicalcobwebs/proxool

Modified Files:
	AbstractProxyStatement.java 
Log Message:
Fixed sql log: boolean and date now supported, and last parameter is included

Index: AbstractProxyStatement.java
===================================================================
RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/AbstractProxyStatement.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** AbstractProxyStatement.java	4 Nov 2003 13:54:02 -0000	1.17
--- AbstractProxyStatement.java	2 Jun 2004 20:04:54 -0000	1.18
***************
*** 11,18 ****
  import java.sql.SQLException;
  import java.sql.Statement;
! import java.util.Comparator;
! import java.util.Map;
! import java.util.StringTokenizer;
! import java.util.TreeMap;
  
  /**
--- 11,17 ----
  import java.sql.SQLException;
  import java.sql.Statement;
! import java.util.*;
! import java.text.DateFormat;
! import java.text.SimpleDateFormat;
  
  /**
***************
*** 29,32 ****
--- 28,33 ----
      private static final Log LOG = LogFactory.getLog(ProxyStatement.class);
  
+     private static final DateFormat DATE_FORMAT = new SimpleDateFormat("dd-MMM-yyyy.HH:mm:ss");
+ 
      private Statement statement;
  
***************
*** 152,155 ****
--- 153,160 ----
          } else if (value instanceof Number) {
              parameters.put(key, value);
+         } else if (value instanceof Boolean) {
+             parameters.put(key, ((Boolean) value).toString());
+         } else if (value instanceof Date) {
+             parameters.put(key, "'" + getDateAsString((Date) value) + "'");
          } else {
              String className = value.getClass().getName();
***************
*** 214,218 ****
                  sqlLog.append(st.nextToken());
              }
!             sqlLog.append("; ");
          }
          if (parameters != null) {
--- 219,239 ----
                  sqlLog.append(st.nextToken());
              }
!             if (sqlStatement.endsWith("?")) {
!                 if (parameterIndex > 0) {
!                     if (parameters != null) {
!                         final Object value = parameters.get(new Integer(parameterIndex));
!                         if (value != null) {
!                             sqlLog.append(value);
!                         } else {
!                             sqlLog.append("?");
!                         }
!                     } else {
!                             sqlLog.append("?");
!                     }
!                 }
!             }
!             if (sqlStatement != null && !sqlStatement.trim().endsWith(";")) {
!                 sqlLog.append("; ");
!             }
          }
          if (parameters != null) {
***************
*** 235,238 ****
--- 256,263 ----
          }
      }
+ 
+     protected static String getDateAsString(Date date) {
+         return DATE_FORMAT.format(date);
+     }
  }
  
***************
*** 241,244 ****
--- 266,272 ----
   Revision history:
   $Log$
+  Revision 1.18  2004/06/02 20:04:54  billhorsman
+  Fixed sql log: boolean and date now supported, and last parameter is included
+ 
   Revision 1.17  2003/11/04 13:54:02  billhorsman
   checkstyle