has_dynamic_columns 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 654ea8aee466792c91ae8278022ad10ff034c072
-  data.tar.gz: 7f5f8b41a767bd2fc12ab09b4d5c3e8df57e5e96
+  metadata.gz: 9ca96bb424702503964607990ceaf8bd1f1d295d
+  data.tar.gz: a58a689b2bd09f47717d03f46eb159642c9ed585
 SHA512:
-  metadata.gz: 76a5cf1aa4b44b2ba1e6a02b40150ef23222015d3c812e3cb3061b44ceda271f5ebe9296cb2d5f19d44c1ee7ed064c0c90beacefa56903d256b2217969f19c69
-  data.tar.gz: f2adf795d3b55a202237b5edbfb8f780ceb79d2011d19bb9916c16dc8a0edb389c2fc01d31d35e7c924523267900038e4a3c3aee2160b8626c69c6cdfb1fc9f3
+  metadata.gz: d28daa53d39118043b48317fa1528a858f4879700314f1409c3c85be2e5d75da596d68c6ff82c0c215b7ef98754861f8c35707a6398addefa35a458f856007d4
+  data.tar.gz: 809f23544abba7769655652fe364e58a1d697133ffebf721a813b8301526b4edb624121f25e9d4f91f634413f42f0d34a7b84d8f2e00981a1cb873b55d45a13b

data/README.md

@@ -35,6 +35,7 @@ running the following command:
     rails generate has_dynamic_columns:active_record
 	rails generate has_dynamic_columns:upgrade_0_3_0_active_record
 	rails generate has_dynamic_columns:upgrade_0_3_4_active_record
+	rails generate has_dynamic_columns:upgrade_0_3_5_active_record
     rake db:migrate
 
 Usage

data/lib/has_dynamic_columns/active_record/query_methods.rb

@@ -38,13 +38,15 @@ module HasDynamicColumns
 							rel.expr.name = :value
 						# We can work with this
 						else
-							col_name = rel.left.name
-							dynamic_type = rel.left.relation.engine.to_s
+							if rel.left.relation.respond_to?(:engine)
+								col_name = rel.left.name
+								dynamic_type = rel.left.relation.engine.to_s
 
-							res = dynamic_column_build_arel_joins(col_name, dynamic_type, scope, index+1, joins) # modify the where to use the aliased table
+								res = dynamic_column_build_arel_joins(col_name, dynamic_type, scope, index+1, joins) # modify the where to use the aliased table
 
-							rel.left.relation = res[:table]
-							rel.left.name = res[:column] || :value # value is the data storage column searchable on dynamic_column_data table
+								rel.left.relation = res[:table]
+								rel.left.name = res[:column] || :value # value is the data storage column searchable on dynamic_column_data table
+							end
 						end
 					end
 
@@ -154,17 +156,14 @@ module HasDynamicColumns
 
 					# Builds all the joins required for the dynamic columns in the where/order clauses
 					def build_dynamic_column_joins
-						joins = {}
+						joins = self.joins_dynamic_columns
 
 						self.where_dynamic_columns_values.each_with_index { |dynamic_scope, index_outer|
 							dynamic_scope[:where].each_with_index { |rel, index_inner|
 								# Process each where
 								dynamic_column_process_arel_nodes(rel, dynamic_scope[:scope], (index_outer*1000)+(index_inner*10000), joins)
 
-								# Warning
-								# Must cast rel to a string - I've encountered ***strange*** situations where this will change the 'col_name' to value in the where clause
-								# specifically, the test 'case should restrict if scope specified' will fail
-								self.where_values += [rel.to_sql]
+								self.where_values += [rel]
 							}
 						}
 						self.order_dynamic_columns_values.each_with_index { |dynamic_scope, index_outer|

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

@@ -3,7 +3,13 @@ module HasDynamicColumns
 		module Relation
 			def self.included(base)
 				base.class_eval do
-					attr_accessor :where_dynamic_columns_values, :order_dynamic_columns_values
+					attr_accessor :where_dynamic_columns_values, :order_dynamic_columns_values, :joins_dynamic_columns
+
+					# Collect all previously built join clauses
+					def joins_dynamic_columns
+						@joins_dynamic_columns = @joins_dynamic_columns || {}
+						@joins_dynamic_columns
+					end
 
 					# Collect all where clauses
 					def where_dynamic_columns_values

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

@@ -5,6 +5,12 @@ module HasDynamicColumns
 		module Relation
 			def self.included(base)
 				base.class_eval do
+					# Collect all where clauses
+					def joins_dynamic_columns
+						@values[:joins_dynamic_columns] = @values[:joins_dynamic_columns] || {}
+						@values[:joins_dynamic_columns]
+					end
+
 					# Collect all where clauses
 					def where_dynamic_columns_values
 						@values[:where_dynamic_columns_values] || []

data/lib/has_dynamic_columns/version.rb

@@ -1,3 +1,3 @@
 module HasDynamicColumns
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_dynamic_columns
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Butch Marshall