add nowinterceptor

diff --git a/src/jp/co/sourceforge/dbutsuite/datawriter/DatabaseDataWriter.groovy b/src/jp/co/sourceforge/dbutsuite/datawriter/DatabaseDataWriter.groovy
index 3b74ce0..3814918 100644 (file)
--- a/src/jp/co/sourceforge/dbutsuite/datawriter/DatabaseDataWriter.groovy
+++ b/src/jp/co/sourceforge/dbutsuite/datawriter/DatabaseDataWriter.groovy
@@ -6,7 +6,7 @@ import java.util.Properties
 import jp.co.sourceforge.dbutsuite.model.DataType\r
 import javax.sound.sampled.DataLine\rimport jp.co.sourceforge.dbutsuite.model.DataObjectLineItem\r\r
 abstract class DatabaseDataWriter extends AbstractDataWriter{\r
-       def interceptors = null\r
+       def interceptors = []\r
        def properties\r
        \r
        static final JDBC_DRIVER_CLASS = "DRIVER_CLASS"\r
@@ -45,33 +45,8 @@ abstract class DatabaseDataWriter extends AbstractDataWriter{
                }\r
        }\r
        \r
-       def createInsertSql(DataObject dataObject, DataObjectLineItem lineItem) {\r
-               def sql = "INSERT INTO $dataObject.name ("\r
-               dataObject.fieldNames.each {\r
-                       sql += "$it,"\r
-               }\r
-               sql = chopComma(sql)\r
-               sql += " ) VALUES ( "\r
-               lineItem.items.each { \r
-                       if (it.type.equals(DataType.String))\r
-                       {\r
-                               sql += "'$it.value',"\r
-                       }\r
-                       else if (it.type.equals(DataType.Date))\r
-                       {\r
-                               sql += "PARSEDATETIME('$it.value', 'yyyy/MM/dd HH:mm:ss.SSS'),"\r
-                       }\r
-                       else\r
-                       {\r
-                               sql += "$it.value,"\r
-                       }\r
-               }\r
-               sql = chopComma(sql)\r
-               sql += " )"\r
-\r
-               return sql\r
-       }\r
-       \r
+       abstract String createInsertSql(DataObject dataObject, DataObjectLineItem lineItem);\r
+               \r
        def chopComma(string)\r
        {\r
                return string[0..-2]\r

diff --git a/src/jp/co/sourceforge/dbutsuite/datawriter/H2DatabaseWriter.groovy b/src/jp/co/sourceforge/dbutsuite/datawriter/H2DatabaseWriter.groovy
index d1f09be..06138df 100644 (file)
--- a/src/jp/co/sourceforge/dbutsuite/datawriter/H2DatabaseWriter.groovy
+++ b/src/jp/co/sourceforge/dbutsuite/datawriter/H2DatabaseWriter.groovy
@@ -1,7 +1,7 @@
 package jp.co.sourceforge.dbutsuite.datawriter\r
 \r
 import jp.co.sourceforge.dbutsuite.model.DataObject\r
-import java.sql.Connection\rimport jp.co.sourceforge.dbutsuite.model.DataObjectLineItem\r\rclass H2DatabaseWriter extends DatabaseDataWriter {\r
+import java.sql.Connection\rimport jp.co.sourceforge.dbutsuite.model.DataObjectLineItem\rimport jp.co.sourceforge.dbutsuite.model.DataType\r\rclass H2DatabaseWriter extends DatabaseDataWriter {\r
        H2DatabaseWriter(Properties properties)\r
        {\r
                super(properties)\r
@@ -18,4 +18,33 @@ import java.sql.Connection\rimport jp.co.sourceforge.dbutsuite.model.DataObjectLi
                \r
                //todo connection close\r
        }\r
+       \r
+       def String createInsertSql(DataObject dataObject, DataObjectLineItem lineItem)\r
+       {\r
+               def sql = "INSERT INTO $dataObject.name ("\r
+               dataObject.fieldNames.each {\r
+                       sql += "$it,"\r
+               }\r
+               sql = chopComma(sql)\r
+               sql += " ) VALUES ( "\r
+               lineItem.items.each { \r
+                       if (it.type.equals(DataType.String))\r
+                       {\r
+                               sql += "'$it.value',"\r
+                       }\r
+                       else if (it.type.equals(DataType.Date))\r
+                       {\r
+                               sql += "PARSEDATETIME('$it.value', 'yyyy/MM/dd HH:mm:ss.SSS'),"\r
+                       }\r
+                       else\r
+                       {\r
+                               sql += "$it.value,"\r
+                       }\r
+               }\r
+               sql = chopComma(sql)\r
+               sql += " )"\r
+\r
+               return sql\r
+       }\r
+\r
 }\r

diff --git a/src/jp/co/sourceforge/dbutsuite/datawriter/interceptor/NowDateInterceptor.groovy b/src/jp/co/sourceforge/dbutsuite/datawriter/interceptor/NowDateInterceptor.groovy
new file mode 100644 (file)
index 0000000..86d5f5a
--- /dev/null
+++ b/src/jp/co/sourceforge/dbutsuite/datawriter/interceptor/NowDateInterceptor.groovy
@@ -0,0 +1,20 @@
+package jp.co.sourceforge.dbutsuite.datawriter.interceptor
+
+import jp.co.sourceforge.dbutsuite.model.DataObject
+import java.util.Date\rimport java.text.SimpleDateFormat\rimport java.text.SimpleDateFormat\rimport jp.co.sourceforge.dbutsuite.model.DataType\r\rclass NowDateInterceptor{
+       def execute(DataObject dataObject)
+       {
+               SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss.SSSSSS")
+               Date now = new Date();
+               
+               dataObject.lines.each { line ->
+                       line.items.each { item ->
+                               if ("[NOW]".equals(item.value))
+                               {                                       
+                                       item.value = format.format(now)
+                                       item.type = DataType.Date
+                               }
+                       }
+               }
+       }       
+}

diff --git a/test/jp/co/sourceforge/dbutsuite/datareader/ExcelDataReaderTest.groovy b/test/jp/co/sourceforge/dbutsuite/datareader/ExcelDataReaderTest.groovy
index 6f11c01..65134ba 100644 (file)
--- a/test/jp/co/sourceforge/dbutsuite/datareader/ExcelDataReaderTest.groovy
+++ b/test/jp/co/sourceforge/dbutsuite/datareader/ExcelDataReaderTest.groovy
@@ -4,7 +4,7 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Test\rimport org.junit.Assert\r
 import java.text.SimpleDateFormat\rimport jp.co.sourceforge.dbutsuite.model.DataType\rimport junit.framework.Assert
-import jp.co.sourceforge.dbutsuite.datawriter.DatabaseDataWriter\rimport jp.co.sourceforge.dbutsuite.datawriter.H2DatabaseWriter\r\rpublic class ExcelDataReaderTest {
+import jp.co.sourceforge.dbutsuite.datawriter.DatabaseDataWriter\rimport jp.co.sourceforge.dbutsuite.datawriter.H2DatabaseWriter\rimport jp.co.sourceforge.dbutsuite.datawriter.interceptor.NowDateInterceptor\r\rpublic class ExcelDataReaderTest {
        
        /**
         * @throws java.lang.Exception
@@ -44,11 +44,12 @@ import jp.co.sourceforge.dbutsuite.datawriter.DatabaseDataWriter\rimport jp.co.so
                
                Properties props = new Properties()
                props.put(DatabaseDataWriter.JDBC_DRIVER_CLASS, "org.h2.Driver")
-               props.put(DatabaseDataWriter.JDBC_URL, "jdbc:h2:tcp://localhost/C:\\cygwin\\home\\inaba\\h2_db/applicationpattern")
+               props.put(DatabaseDataWriter.JDBC_URL, "jdbc:h2:tcp://localhost/./testdb")
                props.put(DatabaseDataWriter.JDBC_USER, "sa")
                props.put(DatabaseDataWriter.JDBC_PASSWORD, "")
 
                def writer = new H2DatabaseWriter(props)
+               writer.interceptors << new NowDateInterceptor()
                dataobject.name = "TEMP"
                writer.writeExecute(dataobject)
        }

diff --git a/test/jp/co/sourceforge/dbutsuite/datareader/YamlDataReaderTest.groovy b/test/jp/co/sourceforge/dbutsuite/datareader/YamlDataReaderTest.groovy
index eddbfce..b8bbaf4 100644 (file)
--- a/test/jp/co/sourceforge/dbutsuite/datareader/YamlDataReaderTest.groovy
+++ b/test/jp/co/sourceforge/dbutsuite/datareader/YamlDataReaderTest.groovy
@@ -1,7 +1,7 @@
 package jp.co.sourceforge.dbutsuite.datareader
 
 import org.junit.Test
-import jp.co.sourceforge.dbutsuite.model.DataObject\rimport org.junit.Assert\rimport java.text.SimpleDateFormat\rimport jp.co.sourceforge.dbutsuite.model.DataType\rimport jp.co.sourceforge.dbutsuite.datawriter.H2DatabaseWriter\rimport java.util.Properties\rimport jp.co.sourceforge.dbutsuite.datawriter.DatabaseDataWriter\r\rpublic class YamlDataReaderTest{
+import jp.co.sourceforge.dbutsuite.model.DataObject\rimport org.junit.Assert\rimport java.text.SimpleDateFormat\rimport jp.co.sourceforge.dbutsuite.model.DataType\rimport jp.co.sourceforge.dbutsuite.datawriter.H2DatabaseWriter\rimport java.util.Properties\rimport jp.co.sourceforge.dbutsuite.datawriter.DatabaseDataWriter\rimport jp.co.sourceforge.dbutsuite.datawriter.interceptor.NowDateInterceptor\r\rpublic class YamlDataReaderTest{
        def assertDataObjectItem(item, type, value)
        {
                Assert.assertEquals(type, item.type)
@@ -17,21 +17,24 @@ import jp.co.sourceforge.dbutsuite.model.DataObject\rimport org.junit.Assert\rimpo
                {
                        Assert.assertEquals(["id", "name", "updateDate"][i], dataobject.fieldNames[i])
                }
+               /*
                assertDataObjectItem(dataobject.lines[0].items[0], DataType.Number, "1")
                assertDataObjectItem(dataobject.lines[0].items[1], DataType.String, "sample")
-               assertDataObjectItem(dataobject.lines[0].items[2], DataType.Date, "2009/12/07 23:11:27.123")
+               assertDataObjectItem(dataobject.lines[0].items[2], DataType.String, "2009/12/07 23:11:27.123")
                
                assertDataObjectItem(dataobject.lines[1].items[0], DataType.Number, "2")
                assertDataObjectItem(dataobject.lines[1].items[1], DataType.String, "山田 太郎")
-               assertDataObjectItem(dataobject.lines[1].items[2], DataType.Date, "2009/07/27 20:11:27.456")
+               assertDataObjectItem(dataobject.lines[1].items[2], DataType.String, "2009/07/27 20:11:27.456")
+               */
                
                Properties props = new Properties()
                props.put(DatabaseDataWriter.JDBC_DRIVER_CLASS, "org.h2.Driver")
-               props.put(DatabaseDataWriter.JDBC_URL, "jdbc:h2:tcp://localhost/C:\\cygwin\\home\\inaba\\h2_db/applicationpattern")
+               props.put(DatabaseDataWriter.JDBC_URL, "jdbc:h2:tcp://localhost/./testdb")
                props.put(DatabaseDataWriter.JDBC_USER, "sa")
                props.put(DatabaseDataWriter.JDBC_PASSWORD, "")
 
                def writer = new H2DatabaseWriter(props)
+               writer.interceptors << new NowDateInterceptor()
                dataobject.name = "TEMP"
                writer.writeExecute(dataobject)
        }

diff --git a/test/testdata/sample.yaml b/test/testdata/sample.yaml
index 3fcf071..f5cdb3a 100644 (file)
--- a/test/testdata/sample.yaml
+++ b/test/testdata/sample.yaml
@@ -1,7 +1,7 @@
 -
  id:1
  name:sample
- updateDate:2009/12/07 23:11:27.123
+ updateDate:[NOW]
 -
  id:2
  name:山田 太郎