flounder 0.11.2 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e079992becc4bd6e98eca9e16ae711fe4deb8a95
-  data.tar.gz: b1a2bea366240854948b9267ba3f96b5eeaefbc1
+  metadata.gz: f4ac07a24ace10c1749674bf6267e9a72340dbb6
+  data.tar.gz: 727e4e6fd344cf1af92787e82ffd18c505fe5956
 SHA512:
-  metadata.gz: 1b5068f9033c63dc84be648f1d484d0a21b90750d3e271a08ed6874df0ec28f2eef4242b5dba6bb5ffe65aaea1926df9c6b6f6257859b28df861db8efc2413cf
-  data.tar.gz: 18fc4a0a6cb0ab7c164735ccf344039d7169a66fc026719918ca14d4562b14714256586673d4470877bab78f4f38c74b0827dd4ac55779da63744a591dc43427
+  metadata.gz: e9397d1aaef91195b6506305ba65738cebb2936cc3e1c507b5650ac3b8da2abc1ad5f221d8c36240a631621f1f1ca4d3c8b7a6261d1fc961b3f2d4200a6ce355
+  data.tar.gz: f48c8f2963b7ac31f16dd9e8a52d282221d39670ed12f72ac16c22e55a2d38fec7aa57523c3eaea51deb827a1ac6335fc7d24b7666033874414c2e92064f9e3f

data/flounder.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name     = "flounder"
-  s.version  = '0.11.2'
+  s.version  = '0.11.3'
   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"
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'pg', '~> 0.17'
   s.add_runtime_dependency 'hashie', '~> 3', '>= 3.2'
   s.add_runtime_dependency 'connection_pool', '~> 2'
-  s.add_runtime_dependency 'pg-hstore', '~> 1.2.0'
+  s.add_runtime_dependency 'pg-hstore', '~> 1.2', '>= 1.2.0'
   
   s.files         = Dir['**/*']
   s.test_files    = Dir['qed/**/*']

data/lib/flounder/postgres_utils.rb

@@ -14,7 +14,6 @@ module Flounder
     OID_TIMESTAMP = 1114
     OID_DATE = 1082
     OID_TIME = 1083
-    OID_HSTORE = 133538
 
     def typecast type_oid, value
       return nil unless value
@@ -35,13 +34,20 @@ module Flounder
           value == 't'
         when OID_TEXT
           value.to_s
-        when OID_HSTORE
+        when oid_hstore
           PgHstore.load(value)
       else
         value
       end
     end
 
+    def oid_hstore
+      @oid_hstore ||= begin 
+        result = exec("SELECT oid FROM pg_type WHERE typname='hstore'")
+        result.first.values.first.to_i
+      end
+    end
+
     def type_oid_to_sym oid
       case oid
         when OID_TIMESTAMP
@@ -58,7 +64,7 @@ module Flounder
           :string
         when OID_BOOLEAN
           :boolean
-        when OID_HSTORE
+        when oid_hstore
           :hash
       else
         nil

data/lib/flounder/query/base.rb

@@ -1,4 +1,5 @@
 
+require 'pg_hstore'
 require 'benchmark'
 
 module Flounder::Query
@@ -210,6 +211,10 @@ module Flounder::Query
     # hash that can be passed to Arel #update. 
     #
     def transform_tuple_for_set field, value
+      if value.kind_of? Hash
+        value = PgHstore.dump(value, true)
+      end
+
       placeholder = add_binding(value)
 
       case field

data/qed/flounder.sql

@@ -1,10 +1,13 @@
 -- Database fixture for these tests. Please import into a database that 
 -- should also be called 'flounder'.
 
+CREATE EXTENSION IF NOT EXISTS hstore; 
+
 DROP TABLE IF EXISTS "users" CASCADE;
 CREATE TABLE "users" (
   "id" serial PRIMARY KEY,
-  "name" varchar(40) NOT NULL
+  "name" varchar(40) NOT NULL, 
+  "attributes" hstore NULL
 );
 
 BEGIN;

data/qed/inserts.md

@@ -40,10 +40,15 @@ Flounder fields can be used as keys.
   results.first.name.assert == 'Mr. Flounder Field'
 ~~~
 
-TODO It does not yet support multi-row inserts.
+## Special Types
+
+### HSTORE
+
+Flounder supports fields in hstore format through the `pg-hstore` gem.
 
 ~~~ruby
-  # users.insert({ :name => 'Mr. First Row'}, { :name => 'Mr. Second Row' }).returning
-  # OR
-  # users.insert(:name => 'Mr. First Row').insert(:name => 'Mr. Second Row').returning
+  row = users.insert(name: 'HStore User', attributes: {foo: 'bar'}).kick.first
+
+  row = users.where(id: row.id).first
+  row.attributes.assert == {'foo' => 'bar'}
 ~~~

data/qed/selects.md

@@ -27,7 +27,7 @@ If we want to see all records, we use the `all` kicker, which has some synonyms.
 
 ~~~ruby
   users = domain[:users].all
-  users.size.assert == 6
+  users.size.assert == 7
   users.assert.kind_of? Array
 
   domain[:users].map(&:id).assert == users.map(&:id)

data/qed/updates.md

@@ -63,5 +63,5 @@ Updating multiple rows is possible.
 ~~~ruby
   updated = users.update(:name => 'Update Multiple Rows').where(:name.not_eq => nil).kick
 
-  updated.map(&:name).assert == ['Update Multiple Rows']*6
+  updated.map(&:name).assert == ['Update Multiple Rows']*7
 ~~~

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flounder
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
 platform: ruby
 authors:
 - Kaspar Schiess
@@ -84,6 +84,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
@@ -91,6 +94,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
 description: "    Flounder is the missing piece between the database and your Ruby