hstore_accessor 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adf6ed0370312b664c3fa65a0b95662a039e3360
-  data.tar.gz: 49ade9c932fa9a56860522a19479c21ae8cb1b0b
+  metadata.gz: 5a802c392aa44501909aca2592be40d690f047ae
+  data.tar.gz: 3a6c54bc24ba9d4202fe8d17331f9958a66fb752
 SHA512:
-  metadata.gz: 69e70ea61aeb26354ec2386aa12f38a32f480b62a6c70953a0dffc338f9bd0d4eb1d164926723a342b0b432868086169f8f681739db54e1105e42ed30b653908
-  data.tar.gz: 27e43ef6addfd779c2f3515899654ea53a181f96f2e993224a0db2de11cefa30ae0354d288a9d1cecdd7c1fe1461cdf8d80c96735c2b0a78c8e696324b892389
+  metadata.gz: 6e29122e812fa3097e773f8e6a81116d7b9809975406ba91d6b6c5a2dcda399678db3cce6d3ec6e75cfb3acd0479ff9ab71f03ed9fd61825e0cb19afc3e5fe6b
+  data.tar.gz: 8b6cc7c1d1bf7bcdcfd52c7f158b283782f8a722c1607538c5c0d40645ae2af7f230bd5d745d1427ffb28703dbf81bf53407a3f3b405cf113a65fecc5d1b9795

data/.rubocop.yml

@@ -23,6 +23,8 @@ Style/AlignParameters:
   Enabled: false
 Style/ClassAndModuleChildren:
   Enabled: false
+Style/ClassVars:
+  Enabled: false
 Style/Documentation:
   Enabled: false
 Style/FileName:

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 = "1.0.1"
+  VERSION = "1.0.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" },
@@ -9,6 +10,7 @@ FIELDS = {
   popular: :boolean,
   build_timestamp: :datetime,
   released_at: :date,
+  likes: :integer,
   miles: :decimal
 }
 
@@ -16,9 +18,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
@@ -145,10 +153,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, 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, 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, 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, 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
@@ -40,4 +42,8 @@ def create_database
     t.datetime :datetime_type
     t.decimal :decimal_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: 1.0.1
+  version: 1.0.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