surus 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 673c1aa25cdc864726ef75d05c0b4c744e19ce46
-  data.tar.gz: dc9cce4603873ce8bd1dc82d1f1c4327c9781693
+  metadata.gz: a3aff7e0e8b000df98229acb0c68f228f94ca85d
+  data.tar.gz: dec38237d5576383026aae08b756084686c0584b
 SHA512:
-  metadata.gz: b15ea86cc152a4394d8053fee9f480978586cf257eb7f3f4904d071a780a3904ef5fd4bab84ab951d72ef4bb4d8304a40d9b999c29cbe9fad7d8c086d7806702
-  data.tar.gz: 071aa66602f6d19db575cff2033f22341d9e51256d545a1fd6e22c3dda72d3095c2e8eb237ce742e419b4f1c37e045e15e8cef42d9335e0b371f8c7fcd76f796
+  metadata.gz: e6ffb1bbac2326e6a07ab64340d94414c68f7b34fd921b2570091a02b83638092d26381590617b8b156a108a84f5256e1c938d64c516b0b8c640c03905a41251
+  data.tar.gz: a38ecc94ac49448b5039f8aac1c18f665575fa912ad3a44224ac4cefc7e209adac1fb70498d4a6a8952a013fe4f4eb88aaa81d1857c4085e9873a3ecf6504e1b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.6.2 (November 19, 2015)
+
+* Prefix column name with table names in query conditions (Michał Krzyżanowski)
+
 # 0.6.1 (July 18, 2015)
 
 * Fix all_json and prepared statements (mathieumahe)

data/lib/generators/surus/hstore/templates/install_hstore.rb

@@ -3,7 +3,7 @@ class InstallHstore < ActiveRecord::Migration
     version = ActiveRecord::Base.connection.send(:postgresql_version)
     # check for newer versions
     if version >= 90100
-      sql = "CREATE EXTENSION hstore"
+      sql = "CREATE EXTENSION IF NOT EXISTS hstore"
     # use the hstore.sql file on the system, if found
     elsif(path = hstore_sql_path)
       sql = File.read(path)
@@ -29,7 +29,7 @@ private
   rescue Errno::ENOENT # if `pg_config` fails
     nil
   end
-  
+
   def default_sql
     hstore_sql = <<-HSTORE_SQL
 /* $PostgreSQL: pgsql/contrib/hstore/hstore.sql.in,v 1.11 2009/06/11 18:30:03 tgl Exp $ */
@@ -299,6 +299,6 @@ AS
 	FUNCTION        4       gin_consistent_hstore(internal, int2, internal, int4, internal, internal),
 STORAGE         text;
 HSTORE_SQL
-    
+
   end
 end

data/lib/surus/array/scope.rb

@@ -8,7 +8,7 @@ module Surus
       #   User.array_has(:permissions, "manage_users", "manage_roles")
       #   User.array_has(:permissions, ["manage_users", "manage_roles"])
       def array_has(column, *values)
-        where("#{connection.quote_column_name(column)} @> ARRAY[?]#{array_cast(column)}", values.flatten)
+        where("#{connection.quote_table_name(table_name)}.#{connection.quote_column_name(column)} @> ARRAY[?]#{array_cast(column)}", values.flatten)
       end
 
       # Adds where condition that requires column to contain any values
@@ -18,7 +18,7 @@ module Surus
       #   User.array_has_any(:permissions, "manage_users", "manage_roles")
       #   User.array_has_any(:permissions, ["manage_users", "manage_roles"])
       def array_has_any(column, *values)
-        where("#{connection.quote_column_name(column)} && ARRAY[?]#{array_cast(column)}", values.flatten)
+        where("#{connection.quote_table_name(table_name)}.#{connection.quote_column_name(column)} && ARRAY[?]#{array_cast(column)}", values.flatten)
       end
 
       private

data/lib/surus/hstore/scope.rb

@@ -6,33 +6,33 @@ module Surus
       # Example:
       #   User.hstore_has_pairs(:properties, "favorite_color" => "green")
       def hstore_has_pairs(column, hash)
-        where("#{connection.quote_column_name(column)} @> ?", Serializer.new.dump(hash))
+        where("#{connection.quote_table_name(table_name)}.#{connection.quote_column_name(column)} @> ?", Serializer.new.dump(hash))
       end
-      
+
       # Adds a where condition that requires column to contain key
       #
       # Example:
       #   User.hstore_has_key(:properties, "favorite_color")
       def hstore_has_key(column, key)
-        where("#{connection.quote_column_name(column)} ? :key", :key => key)    
+        where("#{connection.quote_table_name(table_name)}.#{connection.quote_column_name(column)} ? :key", :key => key)
       end
-      
+
       # Adds a where condition that requires column to contain all keys.
       #
       # Example:
       #    User.hstore_has_all_keys(:properties, "favorite_color", "favorite_song")
       #    User.hstore_has_all_keys(:properties, ["favorite_color", "favorite_song"])
       def hstore_has_all_keys(column, *keys)
-        where("#{connection.quote_column_name(column)} ?& ARRAY[:keys]", :keys => keys.flatten)
+        where("#{connection.quote_table_name(table_name)}.#{connection.quote_column_name(column)} ?& ARRAY[:keys]", :keys => keys.flatten)
       end
-      
+
       # Adds a where condition that requires column to contain any keys.
       #
       # Example:
       #    User.hstore_has_any_keys(:properties, "favorite_color", "favorite_song")
       #    User.hstore_has_any_keys(:properties, ["favorite_color", "favorite_song"])
       def hstore_has_any_keys(column, *keys)
-        where("#{connection.quote_column_name(column)} ?| ARRAY[:keys]", :keys => keys.flatten)
+        where("#{connection.quote_table_name(table_name)}.#{connection.quote_column_name(column)} ?| ARRAY[:keys]", :keys => keys.flatten)
       end
     end
   end

data/lib/surus/version.rb

@@ -1,3 +1,3 @@
 module Surus
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: surus
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Jack Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-18 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -243,8 +243,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ''
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: PostgreSQL Acceleration for ActiveRecord
-test_files: []
+test_files:
+- spec/array/scope_spec.rb
+- spec/database.yml
+- spec/database.yml.travis
+- spec/database_structure.sql
+- spec/factories.rb
+- spec/hstore/scope_spec.rb
+- spec/hstore/serializer_spec.rb
+- spec/json/json_spec.rb
+- spec/spec_helper.rb
+- spec/synchronous_commit/connection_spec.rb
+- spec/synchronous_commit/model_spec.rb