condition 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0873720de10377eb9430e59c174227923848a9f
-  data.tar.gz: f3c850d201e4136536c2be145b1bf1b349287092
+  metadata.gz: 4efc0bb2d9b80f86950bd7ebe239e260bd97ee43
+  data.tar.gz: 73de7c70c3b57b69b0fad5a5e12a2415c285ac91
 SHA512:
-  metadata.gz: 75ebd5305230b36772686de80db2560407b9093cdef8c4b65f48670a94d7004aa991d9d153d8bae1b4f369293498d3764c24a25fea3cedb5b5fc28c6312c851f
-  data.tar.gz: 6d298975bf3d9645e0802b6af2cac8fa9c2be0c7819ac5458c989eb146a63dcb5ad5bca2c33fd9ecac5e64c885bde4915e45dae7321c1d5635186a77785ad0a1
+  metadata.gz: e26a2d334a4baa197679ac86c11e98fe1c23cb9501ea955d33553abdaccc1e83fff3bfc7ae2f4ab9acf91b5b8d664e3411a3fbad6475436f20b61c9cb8570049
+  data.tar.gz: c5e7b8edda09eb46c5788124cc240da3857c1adc039b83b5c0bacc10e2132772cb2bacc7d703686c4ab44da999d6b536ecfa56d3c5e4f581c2e53c064c7ce9e2

data/README.md

@@ -30,6 +30,9 @@ TODO: Write usage instructions here
 
 ## Changes
 
+2014-01-15 0.0.25
+support schema name in pre condition
+
 2014-01-08 0.0.24
 add now() and now(diff seconds)
 

data/lib/condition/storage/db.rb

@@ -17,12 +17,25 @@ module Condition
 
       def insert(param_item, default)
         default_item = default.item(param_item.name) if default
-        ds = @db[param_item.name.to_sym].prepare(
-          :insert, 
-          :insert_with_name, 
-          default_item ? default_item.params.merge(param_item.params) : param_item.params)
+        prms = default_item ? default_item.params.merge(param_item.params) : param_item.params
+        i1 = ''
+        i2 = ''
+        prms.each_pair do |k, v|
+          if i1 != ''
+            i1 = i1 + ', '
+            i2 = i2 + ', '
+          end
+          i1 = i1 + k.to_s
+          i2 = i2 + '?'
+        end
+        sql = "INSERT INTO #{param_item.name.to_s} (#{i1}) VALUES (#{i2})"
         param_item.values.each do |it|
-          ds.call(default_item ? default_item.value.merge(it) : it)
+          prms = default_item ? default_item.value.merge(it) : it
+          ary = [sql]
+          prms.each_pair do |k, v|
+            ary << v
+          end
+          @db.fetch(*ary).insert
         end
       end
 
@@ -33,4 +46,4 @@ module Condition
       end
     end
   end
-end
+end

data/lib/condition/version.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
 
 module Condition
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 end

data/spec/condition_spec.rb

@@ -5,6 +5,9 @@ describe Condition do
     DB << "DROP TABLE IF EXISTS t_test"
     DB << "CREATE TABLE t_user(user_id BIGINT, user_name TEXT, login_ts TIMESTAMPTZ NOT NULL)"
     DB << "CREATE TABLE t_test(id BIGINT, name TEXT, flag BOOLEAN, ts TIMESTAMPTZ, iary BIGINT[], tary TEXT[], test_name TEXT NOT NULL)"
+    DB << "CREATE SCHEMA IF NOT EXISTS history"
+    DB << "DROP TABLE IF EXISTS history.t_user"
+    DB << "CREATE TABLE history.t_user(user_id BIGINT, user_name TEXT, login_ts TIMESTAMPTZ NOT NULL)"
 
     converter = Condition::Reader::ConvertSheet.new(REDIS)
     converter.convert_dir(FILES, with_dir_name: false)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: condition
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - aoyagikouhei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler