has_dynamic_columns 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f872c8cb5a681f06b58bd3e57477bc275a153c3c
-  data.tar.gz: c4d47b6fb08df2fd3bdd4d531988adc00c5312b0
+  metadata.gz: 2f728b40892f557858d9809deb92fe4f6c80e54a
+  data.tar.gz: f8c151d8a22042bfb7803be46dce5aefd06600a4
 SHA512:
-  metadata.gz: dd399b22a0be68a064d8e9f8e67bbc2558d290035c59fce659be6597d0406d928766d75f514b4c7b7cf67d0aa363abaa6af4c0ec79f85251195ef4bbbc8ca367
-  data.tar.gz: 7de3e24535b04a0b3a5abcbd40d573c6688164e954088f5e3f5878c46a2a2e5364a95b5792c19b78db9cb35564953dbabf3595f51d9c59605383fe93b99af191
+  metadata.gz: 7a73f110f7ea4dd8e4509e9cb62b53016976e4cdf98286511e5ccd8fa09fe939b1535e829ef561179fc46c87d36fc084c53abf2bdc1fa6cbba19c5aa4977e382
+  data.tar.gz: a186cb3ab5e69896847bb6e91a8f291435680547d1013fae4c76b189642f12714f0cd7c95cfacb893bf81d460d4fd871623733b98b1d1db8039cf695756b2ddf

data/lib/has_dynamic_columns/active_record/v3/query_methods.rb

@@ -226,7 +226,7 @@ module HasDynamicColumns
 				if opts == :chain
 					::ActiveRecord::QueryMethods::WhereChain.new(clone)
 				else
-					where_without_dynamic_columns(opts, rest)
+					where_without_dynamic_columns(opts, *rest)
 				end
 			end
 

data/lib/has_dynamic_columns/active_record/v4/query_methods.rb

@@ -202,7 +202,7 @@ module HasDynamicColumns
 					chain = ::ActiveRecord::QueryMethods::WhereChain.new(scope)
 					chain.send(:extend, WhereChainCompatibility)
 				else
-					where_without_dynamic_columns(opts, rest)
+					where_without_dynamic_columns(opts, *rest)
 				end
 			end
 

data/lib/has_dynamic_columns/version.rb

@@ -1,3 +1,3 @@
 module HasDynamicColumns
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/spec/has_dynamic_columns/active_record/query_methods_spec.rb

@@ -42,6 +42,7 @@ describe ::HasDynamicColumns::ActiveRecord::QueryMethods do
 		}
 		customer.save
 	end
+
 	context 'Customer' do
 		it 'should order by first_name' do
 			table = Customer.arel_table
@@ -249,4 +250,12 @@ describe ::HasDynamicColumns::ActiveRecord::QueryMethods do
 			expect(result).to eq([["1", 30, "Butch", "Casidy"], ["2", 30, "Butch", "Marshall"], ["1", 10, "George", "Marshall"]])
 		end
 	end
+
+	context 'ActiveRecord' do
+		it 'should not clobber where IN queries' do
+			sql = Account.where("id IN (?)", [1,2,3]).to_sql
+			expect(sql).to eq('SELECT "accounts".* FROM "accounts" WHERE (id IN (1,2,3))')
+		end
+	end
+
 end

data/spec/has_dynamic_columns/dynamic_columns_string_datum_spec.rb

@@ -1,7 +1,5 @@
 require 'spec_helper'
 
 describe HasDynamicColumns::DynamicColumnStringDatum do
-	it 'test' do
-		#puts FactoryGirl.create(:account_with_customer_dynamic_columns).inspect
-	end
+
 end

data/spec/spec_helper.rb

@@ -31,7 +31,7 @@ require "generators/has_dynamic_columns/templates/migration"
 require "generators/has_dynamic_columns/templates/migration_0.3.0"
 ActiveRecord::Schema.define do
 	AddHasDynamicColumns.up
-	AddHasDynamicColumnsDatastore.up
+	Upgrade030HasDynamicColumns.up
 
 	create_table :accounts, force: true do |t|
 		t.string :name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_dynamic_columns
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Butch Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord