hstore_accessor 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30975fed8d563ae146155f5dd5a4ebe4b0abb861
-  data.tar.gz: ba2bff2e3e25eee710c564b153bf61c05d07a44f
+  metadata.gz: 592e1d4cc9607136333c47a39aecafc5591c81b0
+  data.tar.gz: c5c93b8c441dfea93d0f61c030f58b0f4f1caf7c
 SHA512:
-  metadata.gz: ad3a0009ff1771d4feddb626e3eb4e4a737b3a0c2394e6b0fd5844f12e23aded98d9dd71c57f7dd96d6a3b00a7e93f6e4fd367f90bb744e2c02af2eea2bd679c
-  data.tar.gz: 5d09fc9d042e67a6e03bdbf377e8242b9e307a64ae66aaf0d4c48b395cb72d3f0511a6cf8f13ff2a82fb753926c65328b609916a1ccbb6792660060d936ab8a1
+  metadata.gz: c27f4b979405b4c6fbe1aa67de3a3ed0924460daaed0d5002bc5ea320171dc3c448aae24940f90a8a3fdb909e16d48422e7871ca450f017734953cc70b291f94
+  data.tar.gz: f46afee55e0b917c7e24cdb8a092594502efe177169ff5f06324c6b6ad74b570002be99aaf23a24d0af1a6bcdb86715acff10f83eca1a55b56ffb243e7cca52f

data/lib/hstore_accessor/macro.rb

@@ -115,8 +115,8 @@ module HstoreAccessor
             end
           end
 
-          query_field = "#{hstore_attribute} -> '#{store_key}'"
-          eq_query_field = "#{hstore_attribute} @> hstore('#{store_key}', ?)"
+          query_field = "#{table_name}.#{hstore_attribute} -> '#{store_key}'"
+          eq_query_field = "#{table_name}.#{hstore_attribute} @> hstore('#{store_key}', ?)"
 
           case data_type
           when :string

data/lib/hstore_accessor/version.rb

@@ -1,3 +1,3 @@
 module HstoreAccessor
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/spec/hstore_accessor_spec.rb

@@ -2,6 +2,7 @@ require "spec_helper"
 require "active_support/all"
 
 FIELDS = {
+  name: :string,
   color: :string,
   price: :integer,
   published: { data_type: :boolean, store_key: "p" },
@@ -11,6 +12,7 @@ FIELDS = {
   tags: :array,
   reviews: :hash,
   released_at: :date,
+  likes: :integer,
   miles: :decimal
 }
 
@@ -18,9 +20,15 @@ DATA_FIELDS = {
   color_data: :string
 }
 
+class ProductCategory < ActiveRecord::Base
+  hstore_accessor :options, name: :string, likes: :integer
+  has_many :products
+end
+
 class Product < ActiveRecord::Base
   hstore_accessor :options, FIELDS
   hstore_accessor :data, DATA_FIELDS
+  belongs_to :product_category
 end
 
 class SuperProduct < Product
@@ -147,10 +155,35 @@ describe HstoreAccessor do
   describe "scopes" do
     let!(:timestamp) { Time.now }
     let!(:datestamp) { Date.today }
-    let!(:product_a) { Product.create(color: "green", price: 10, weight: 10.1, tags: %w(tag1 tag2 tag3), popular: true, build_timestamp: (timestamp - 10.days), released_at: (datestamp - 8.days), miles: BigDecimal.new("10.113379001")) }
+    let!(:product_a) { Product.create(likes: 3, name: "widget", color: "green", price: 10, weight: 10.1, tags: %w(tag1 tag2 tag3), popular: true, build_timestamp: (timestamp - 10.days), released_at: (datestamp - 8.days), miles: BigDecimal.new("10.113379001")) }
     let!(:product_b) { Product.create(color: "orange", price: 20, weight: 20.2, tags: %w(tag2 tag3 tag4), popular: false, build_timestamp: (timestamp - 5.days), released_at: (datestamp - 4.days), miles: BigDecimal.new("20.213379001")) }
     let!(:product_c) { Product.create(color: "blue", price: 30, weight: 30.3, tags: %w(tag3 tag4 tag5), popular: true, build_timestamp: timestamp, released_at: datestamp, miles: BigDecimal.new("30.313379001")) }
 
+    context "ambiguous column names" do
+      let!(:product_category) { ProductCategory.create!(name: "widget", likes: 2) }
+
+      before do
+        product_category.products = Product.all
+        product_category.save!
+      end
+
+      context "eq query" do
+        let!(:query) { Product.all.joins(:product_category).merge(ProductCategory.with_name("widget")).with_name("widget") }
+
+        it "qualifies the table name to prevent ambiguous column name references" do
+          expect { query.to_a }.to_not raise_error
+        end
+      end
+
+      context "query" do
+        let!(:query) { Product.all.joins(:product_category).merge(ProductCategory.likes_lt(4)).likes_lt(4) }
+
+        it "qualifies the table name to prevent ambiguous column name references" do
+          expect { query.to_a }.to_not raise_error
+        end
+      end
+    end
+
     context "for string fields support" do
       it "equality" do
         expect(Product.with_color("orange").to_a).to eq [product_b]

data/spec/spec_helper.rb

@@ -26,6 +26,7 @@ def create_database
 
   ActiveRecord::Base.connection.execute("CREATE EXTENSION hstore;") rescue ActiveRecord::StatementInvalid
   ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS products;")
+  ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS product_categories;")
 
   ActiveRecord::Base.connection.create_table(:products) do |t|
     t.hstore :options
@@ -33,6 +34,7 @@ def create_database
 
     t.string :string_type
     t.integer :integer_type
+    t.integer :product_category_id
     t.boolean :boolean_type
     t.float :float_type
     t.time :time_type
@@ -42,4 +44,8 @@ def create_database
     t.decimal :decimal_type
     t.hstore :hash_type
   end
+
+  ActiveRecord::Base.connection.create_table(:product_categories) do |t|
+    t.hstore :options
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hstore_accessor
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Joe Hirn
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord