has_dynamic_columns 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aaf5c0ace61bd2b3a0f1a5b41307fccf18622755
-  data.tar.gz: 69966df3be6a085e55614cf12632173850810fd6
+  metadata.gz: 74028ad6d4dca1d298b275c0879f2a187f61d1b2
+  data.tar.gz: b61a64ab18943484ed06b9d8ca5a0337d89c52b0
 SHA512:
-  metadata.gz: 9d3d6c5c41464cadf77a77e0a8c1f4dd0c357039e266975b73e1a56d655dba3f89614bba2f50da462576d1d795ccf6523378ee62cb4c72aecb88bd325446c598
-  data.tar.gz: 4484e55679cc4c506af1b036bb3bace89e5179894c7c6cb1c3e6e577d32b4d9781119daafa413b1869b9638cf6f6beec9e8669be3ce0649f9afa7395dec247ae
+  metadata.gz: 0b2951e434458da40841c18c0393749b9b60e37950eb2439cb0a8e5fb15eefc0f6573a71ca5d691b6978047edf96b6a678af6213586ff15605046540bfd70391
+  data.tar.gz: 0386aa1168bf20c38ebe9869fee2054b0fd93528257972ade4362a49012f3df221abf666c4cbf0d90257df88aeca88e92fed775366178bfd10a72172be85ac0e

data/lib/has_dynamic_columns/active_record/query_methods.rb

@@ -187,6 +187,9 @@ module HasDynamicColumns
 					self.group_values += [Arel::Nodes::Group.new(table[:id])]
 				end
 
+				self.where_dynamic_columns_values_reset
+				self.order_dynamic_columns_values_reset
+
 				build_arel_without_dynamic_columns
 			end
 

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

@@ -20,6 +20,9 @@ module HasDynamicColumns
 						@where_dynamic_columns_values ||= []
 						@where_dynamic_columns_values << values
 					end
+					def where_dynamic_columns_values_reset
+						@where_dynamic_columns_values = []
+					end
 
 					# Collect all order clauses
 					def order_dynamic_columns_values
@@ -30,6 +33,9 @@ module HasDynamicColumns
 						@order_dynamic_columns_values ||= []
 						@order_dynamic_columns_values << values
 					end
+					def order_dynamic_columns_values_reset
+						@order_dynamic_columns_values = []
+					end
 				end
 
 				base.instance_eval do

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

@@ -20,6 +20,9 @@ module HasDynamicColumns
 						@values[:where_dynamic_columns_values] ||= []
 						@values[:where_dynamic_columns_values] << values
 					end
+					def where_dynamic_columns_values_reset
+						@values[:where_dynamic_columns_values] = []
+					end
 
 					# Collect all order clauses
 					def order_dynamic_columns_values
@@ -30,6 +33,9 @@ module HasDynamicColumns
 						@values[:order_dynamic_columns_values] ||= []
 						@values[:order_dynamic_columns_values] << values
 					end
+					def order_dynamic_columns_values_reset
+						@values[:order_dynamic_columns_values] = []
+					end
 				end
 
 				base.instance_eval do

data/lib/has_dynamic_columns/version.rb

@@ -1,3 +1,3 @@
 module HasDynamicColumns
-  VERSION = "0.3.9"
+	VERSION = "0.3.10"
 end

data/spec/has_dynamic_columns/active_record/query_methods_spec.rb

@@ -226,17 +226,33 @@ describe ::HasDynamicColumns::ActiveRecord::QueryMethods do
 			expect(result).to eq([["1", "George", "Marshall"], ["1", "Butch", "Casidy"], ["2", "Butch", "Marshall"]])
 		end
 
-		it 'should filter and order by the same column properly and not throw ambiguous column name errors' do
+		it 'should filter and order by the same column properly and not throw ambiguous column name errors', :focus => true do
+			customer = Customer.new(:account => account, :name => "1")
+			customer.fields = {
+				"first_name" => "Carlos",
+				"last_name" => "Marshall",
+				"email" => "butch.marshall@unittest.com",
+				"trusted" => false,
+				"last_contacted" => DateTime.parse("2012-01-01 01:01:01"),
+				"total_purchases" => 10,
+				"tags" => [
+					"a", "b", "c"
+				]
+			}
+			customer.save
+
 			result = Customer
 				.where
 					.has_dynamic_columns(
-						:first_name => "A"
+						:first_name => "Carlos"
 					)
 					.with_scope(account)
 				.order
 					.by_dynamic_columns(first_name: :desc)
 					.with_scope(account)
 			expect{ActiveRecord::Base.connection.select_all(result.to_sql)}.to_not raise_error
+
+			expect(result.all.length).to eq(1)
 		end
 
 		it 'should preserve order by multiple dynamic columns' do

metadata

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