flounder 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7f0215b9a32d26575d6a27982baf1e3557df937
-  data.tar.gz: b0b7cb0356ea83e8af672a0f91b025f567891d03
+  metadata.gz: 0f322c0fdd9247c24a821bce8f602d025f961d19
+  data.tar.gz: d27d58604c817b088add6384ebd9022e38d3d650
 SHA512:
-  metadata.gz: ff873c40c360913978fd6d9138b704e8362c26e577a15f042c062f2be74731e63ab0d06ec49931892b1a98f729eab67823b8e23da8cf2fd41f09841ccaa9fa01
-  data.tar.gz: 4ab1e4048e43d99ce94ea224e026e4e6bd9b36ca591d600df5777f9bcf4666ddcc47eaa93afcb44fc5a74751e98790ec1be3f68e440dc3c43ba0747926efdbe8
+  metadata.gz: 338d6f3a5a574b442375846b94af3c17b7104aeae5519fea3b7b2d8c4d7a2e167841021b78ad68117a90840bc056e348f1168487f82dac21f622afdfb4704b01
+  data.tar.gz: e0a72ca40089dcd6221589c2c989d7ea9a6dfac60d809e165e1265328694b7a803974f95ce3c697da961d1546454bf119bf7b77c94705650763746bf47ca0890

data/HISTORY

@@ -7,4 +7,7 @@
  + `domain.transaction do |conn| ... end`
 
  0.9.1
- + `search_path` argument for `Flounder.connect`.
+ + `search_path` argument for `Flounder.connect`.
+
+ 0.9.2
+ + bind variables on INSERT/UPDATE.

data/flounder.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name     = "flounder"
-  s.version  = '0.9.1'
+  s.version  = '0.9.2'
   s.summary  = "Flounder is a way to write SQL simply in Ruby. It deals with everything BUT object relational mapping. "
   s.email    = "kaspar.schiess@technologyastronauts.ch"
   s.homepage = "https://bitbucket.org/technologyastronauts/oss_flounder"

data/lib/flounder/postgres_utils.rb

@@ -16,13 +16,15 @@ module Flounder
 
     def typecast type_oid, value
       return nil unless value
+      
+      # assert: value is not nil
       case type_oid
         when OID_TIMESTAMP
-          value && DateTime.parse(value)
+          DateTime.parse(value)
         when OID_DATE
-          value && Date.parse(value)
+          Date.parse(value)
         when OID_TIME
-          value && Time.parse(value)
+          Time.parse(value)
         when OID_INTEGER, OID_SMALLINT
           value.to_i
         when OID_FLOAT

data/lib/flounder/query/base.rb

@@ -110,6 +110,14 @@ module Flounder::Query
       end
     end
 
+    # Adds a binding
+    #
+    def add_binding value
+      bind_values << value
+      # is 1-based - hence the postop
+      Arel::Nodes::SqlLiteral.new("$#{bind_values.size}")    
+    end
+
     # Called on each key/value pair of a
     #  * condition
     #  * join
@@ -153,5 +161,20 @@ module Flounder::Query
       end
     end
 
+    # Called on each key/value pair of an update clause, this returns a 
+    # hash that can be passed to Arel #update. 
+    #
+    def transform_tuple_for_set field, value
+      placeholder = add_binding(value)
+
+      case field
+        when Symbol, String
+          [entity[field.to_sym].arel_field, placeholder]
+        when Flounder::Field
+          [field.arel_field, placeholder]
+      else
+        fail "Could not transform condition part. (#{field.inspect}, #{value.inspect})"
+      end
+    end
   end
 end

data/lib/flounder/query/insert.rb

@@ -1,4 +1,4 @@
-
+ 
 require_relative 'base'
 require_relative 'returning'
 
@@ -18,24 +18,9 @@ module Flounder::Query
     def row fields
       manager.insert(
         fields.map { |k, v| 
-          transform_values(k, v) })
+          transform_tuple_for_set(k, v) })
     end
 
     include Returning
-  private
-  
-    # Called on each key/value pair of an insert clause, this returns a 
-    # hash that can be passed to Arel #insert. 
-    #
-    def transform_values field, value
-      case field
-        when Symbol, String
-          [entity[field.to_sym].arel_field, value]
-        when Flounder::Field
-          [field.arel_field, value]
-      else
-        fail "Could not transform value. (#{field.inspect}, #{value.inspect})"
-      end
-    end
   end # class
 end # module Flounder

data/lib/flounder/query/update.rb

@@ -17,29 +17,10 @@ module Flounder::Query
     def set fields
       manager.set(
         fields.map { |k, v| 
-          transform_attributes(k, v) })
+          transform_tuple_for_set(k, v) })
     end
 
     include Returning
 
-  private
-
-    # Called on each key/value pair of an update clause, this returns a 
-    # hash that can be passed to Arel #update. 
-    #
-    def transform_attributes field, value
-      if value.kind_of? Flounder::Field
-        value = value.arel_field
-      end
-
-      case field
-        when Symbol, String
-          [entity[field.to_sym].arel_field, value]
-        when Flounder::Field
-          [field.arel_field, value]
-      else
-        fail "Could not transform condition part. (#{field.inspect}, #{value.inspect})"
-      end
-    end
   end # class
 end # module Flounder

data/qed/inserts.md

@@ -3,7 +3,7 @@ An insert creates a state from which SQL can be extracted.
 ~~~ruby
   sql = users.insert(:name => 'Mr. Insert SQL').to_sql
 
-  sql.assert == "INSERT INTO \"users\" (\"name\") VALUES ('Mr. Insert SQL') RETURNING *"
+  sql.assert == "INSERT INTO \"users\" (\"name\") VALUES ($1) RETURNING *"
 ~~~
 
 Using returning will return the inserted object.

data/qed/updates.md

@@ -5,10 +5,10 @@ An update creates a state from which SQL can be extracted.
   
   sql = posts.update(:title => 'Update SQL').where(:id => post.id).to_sql
 
-  sql.assert == 'UPDATE "posts" SET "title" = \'Update SQL\' WHERE "posts"."id" = 1 RETURNING *'
+  sql.assert == 'UPDATE "posts" SET "title" = $1 WHERE "posts"."id" = 1 RETURNING *'
 ~~~
 
-Flounder fields are ok.
+Flounder fields can be used to identify the values to be set. 
 
 ~~~ruby
   post = posts.first
@@ -17,10 +17,10 @@ Flounder fields are ok.
     update(posts[:title] => 'Update Flounder SQL').
     where(:id => post.id).to_sql
 
-  sql.assert == 'UPDATE "posts" SET "title" = \'Update Flounder SQL\' WHERE "posts"."id" = 1 RETURNING *'
+  sql.assert == 'UPDATE "posts" SET "title" = $1 WHERE "posts"."id" = 1 RETURNING *'
 ~~~
 
-It can update a single field.
+Using `where`, you can limit the records that are updated. 
 
 ~~~ruby
   post_id = posts.first.id
@@ -31,26 +31,20 @@ It can update a single field.
   post.title.assert == 'Update Field'
 ~~~
 
-Flounder fields are ok here too.
-
-~~~ruby
-  post = posts.first
-  
-  post = posts.
-    update(posts[:title] => 'Update Flounder Field').
-    where(:id => post.id).kick.first
-
-  post.title.assert == 'Update Flounder Field'
-~~~
-
 An update can take multiple fields.
 
 ~~~ruby
-  post = posts.first
+  post_id = 1
   
-  sql = posts.update(:title => 'Update SQL', :text => 'Update Multiple Fields Text').where(:id => post.id).to_sql
+  statement = posts.update(
+      title: 'Update SQL', 
+      text: 'Update Multiple Fields Text', 
+      approver_id: nil).
+    where(:id => post_id)
 
-  sql.assert == 'UPDATE "posts" SET "title" = \'Update SQL\', "text" = \'Update Multiple Fields Text\' WHERE "posts"."id" = 1 RETURNING *'
+  statement.to_sql.assert == %Q(UPDATE "posts" SET "title" = $1, "text" = $2, "approver_id" = $3 WHERE "posts"."id" = 1 RETURNING *)
+
+  statement.kick
 ~~~
 
 Updating a single row is possible.
@@ -70,4 +64,4 @@ Updating multiple rows is possible.
   updated = users.update(:name => 'Update Multiple Rows').where(:name.not_eq => nil).kick
 
   updated.map(&:name).assert == ['Update Multiple Rows']*6
-~~~
+~~~

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flounder
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Kaspar Schiess
@@ -90,6 +90,7 @@ files:
 - HISTORY
 - LICENSE
 - README
+- flounder-0.9.1.gem
 - flounder.gemspec
 - lib/flounder.rb
 - lib/flounder/connection.rb