From 4f9182274b7f1bef5b3eceb71eca9876499ddf0f Mon Sep 17 00:00:00 2001
From: unknown <owenludong.lud@ALI-55658.hz.ali.com>
Date: Mon, 24 Jun 2013 19:58:32 +0800
Subject: [PATCH] Signed-off-by: owenludong <owenludong.lud@alibaba-inc.com>

---
 .../java/com/alibaba/druid/sql/SQLUtils.java  | 36 +++++++++++++++++++
 .../com/alibaba/druid/util/JdbcUtils.java     | 33 -----------------
 .../druid/bvt/utils/JdbcUtilsTest.java        | 11 +-----
 3 files changed, 37 insertions(+), 43 deletions(-)

diff --git a/src/main/java/com/alibaba/druid/sql/SQLUtils.java b/src/main/java/com/alibaba/druid/sql/SQLUtils.java
index f7413ba42c..23b2d81d4c 100644
--- a/src/main/java/com/alibaba/druid/sql/SQLUtils.java
+++ b/src/main/java/com/alibaba/druid/sql/SQLUtils.java
@@ -40,6 +40,9 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor;
 import com.alibaba.druid.support.logging.Log;
 import com.alibaba.druid.support.logging.LogFactory;
 import com.alibaba.druid.util.JdbcUtils;
+import com.alibaba.druid.util.JdbcConstants;
+import com.alibaba.druid.util.StringUtils;
+
 
 public class SQLUtils {
 
@@ -239,4 +242,37 @@ public class SQLUtils {
         }
         return stmtList;
     }
+	
+	 /**
+     * @author owenludong.lud
+     * @param  columnName
+     * @param  tableAlias 
+     * @param  pattern if pattern is null,it will be set {%Y-%m-%d %H:%i:%s} as mysql default value and set {yyyy-mm-dd hh24:mi:ss} as oracle default value
+     * @param  dbType  {@link JdbcConstants} if dbType is null ,it will be set the mysql as a default value
+     */
+    public static String buildToDate(String columnName,String tableAlias,String pattern,String dbType){    	
+     	StringBuilder sql = new StringBuilder();    	
+     	if(StringUtils.isEmpty(columnName))
+     		return "";  			
+     	if(StringUtils.isEmpty(dbType))    dbType = JdbcConstants.MYSQL;   
+     	String formatMethod = "";
+     	if(JdbcConstants.MYSQL.equalsIgnoreCase(dbType)){
+     		formatMethod = "STR_TO_DATE";
+     		if(StringUtils.isEmpty(pattern)) pattern = "%Y-%m-%d %H:%i:%s";
+     	}else if(JdbcConstants.ORACLE.equalsIgnoreCase(dbType)){
+     		formatMethod = "TO_DATE";
+     		if(StringUtils.isEmpty(pattern)) pattern = "yyyy-mm-dd hh24:mi:ss";
+     	}else{     		
+     		return "";
+     		//expand date's handle method for other database 
+     	}
+     	sql.append(formatMethod).append("(");        	
+ 		if(!StringUtils.isEmpty(tableAlias))
+ 			sql.append(tableAlias).append("."); 
+ 		sql.append(columnName).append(",");
+ 		sql.append("'");
+ 		sql.append(pattern);
+ 		sql.append("')");     	   	
+     	return sql.toString();
+     }
 }
diff --git a/src/main/java/com/alibaba/druid/util/JdbcUtils.java b/src/main/java/com/alibaba/druid/util/JdbcUtils.java
index 5bda08f6c3..8aa458ae1d 100644
--- a/src/main/java/com/alibaba/druid/util/JdbcUtils.java
+++ b/src/main/java/com/alibaba/druid/util/JdbcUtils.java
@@ -682,37 +682,4 @@ public final class JdbcUtils implements JdbcConstants {
 
         return sql.toString();
     }
-    
-    
-    /**
-     * @author owenludong.lud
-     * @param  columnName
-     * @param  tableAlias 
-     * @param  pattern if pattern is null,it will be set {%Y-%m-%d %H:%i:%s} as mysql default value and set {yyyy-mm-dd hh24:mi:ss} as oracle default value
-     * @param  dbType  {@link JdbcConstants} if dbType is null ,it will be set the mysql as a default value
-     */
-    public static String formatStrToDateColumn(String columnName,String tableAlias,String pattern,String dbType){    	
-     	StringBuilder sql = new StringBuilder();    	
-     	if(!StringUtils.isEmpty(columnName)){    		
-         	if(StringUtils.isEmpty(dbType))    dbType = JdbcConstants.MYSQL;   
-         	String formatMethod = "";
-         	if(MYSQL.equalsIgnoreCase(dbType)){
-         		formatMethod = "STR_TO_DATE";
-         		if(StringUtils.isEmpty(pattern)) pattern = "%Y-%m-%d %H:%i:%s";
-         	}else if(ORACLE.equalsIgnoreCase(dbType)){
-         		formatMethod = "TO_DATE";
-         		if(StringUtils.isEmpty(pattern)) pattern = "yyyy-mm-dd hh24:mi:ss";
-         	}else{
-         		//expand date's handle method for other database 
-         	}
-         	sql.append(formatMethod).append("(");        	
-     		if(!StringUtils.isEmpty(tableAlias))
-     			sql.append(tableAlias).append("."); 
-     		sql.append(columnName).append(",");
-     		sql.append("'");
-     		sql.append(pattern);
-     		sql.append("')");
-     	}    	
-     	return sql.toString();
-     }
 }
diff --git a/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest.java b/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest.java
index 0ce045afbe..eb8661b71c 100644
--- a/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest.java
@@ -23,7 +23,6 @@ import junit.framework.Assert;
 import junit.framework.TestCase;
 
 import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.druid.util.JdbcConstants;
 import com.alibaba.druid.util.JdbcUtils;
 
 public class JdbcUtilsTest extends TestCase {
@@ -79,13 +78,5 @@ public class JdbcUtilsTest extends TestCase {
             List<Map<String, Object>> list = JdbcUtils.executeQuery(dataSource, "select * from user");
             Assert.assertEquals(0, list.size());
         }
-    }
-    
-    public void test_formatColumnToDateType(){
-    	String colunExp = JdbcUtils.formatStrToDateColumn("gmt_create","oo","",JdbcConstants.ORACLE);
-		Assert.assertEquals("TO_DATE(oo.gmt_create,'yyyy-mm-dd hh24:mi:ss')", colunExp);
-		
-		String colunExp2 = JdbcUtils.formatStrToDateColumn("gmt_create","oo","",JdbcConstants.MYSQL);
-		Assert.assertEquals("STR_TO_DATE(oo.gmt_create,'%Y-%m-%d %H:%i:%s')", colunExp2);	
-    }
+    }   
 }