directiverecord 0.1.26 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc26fa9710b00e61650bf32c723af7b687a82b09
-  data.tar.gz: 81ad26f3c3e8d3724c3d811f0ce4716a48743b95
+  metadata.gz: cc70bdc6154246ffdce6e0d4814560fef801f3e3
+  data.tar.gz: 28798e0aac7a3130d121fac1d826182e73510340
 SHA512:
-  metadata.gz: 777881c9461b0e2596f1e355508cfe9e6b8306c3c7a0c2af94a0a87816a21074a38398426af5301477193087013404ec0261461b5c5fe319913ff724abab930c
-  data.tar.gz: ef1bdb1dce944f4927a1ad83c8706270d655006d48f5981b5d769a0c366aceb52ff2c821bffc5e8c954ffee8cbed5108b7707a0fe403a82e2c6c60b14aa33f5c
+  metadata.gz: d8d91f3ac15f35e23e9888a25d3a7519c9ccafe4bb5bc5ed2b0e5bd3d7df9778b98065d97e7a6b415b76465f953c30b0660ac8fd2ca94bcf21fccdee80b2452f
+  data.tar.gz: c15c5467150524258c277507ef046a0ddd533f4e7dcaf3f834c199adc9571f2a8940629bfc7841f558c379a04fcab9abc2826500b5a135a2d39657a912c2c780

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = DirectiveRecord CHANGELOG
 
+== Version 0.1.27 (July 9, 2015)
+
+* Including extra join conditions
+
 == Version 0.1.26 (June 9, 2015)
 
 * Fixed error when optimizing a query containing an ordered calculated column

data/VERSION

@@ -1 +1 @@
-0.1.26
+0.1.27

data/lib/directive_record/query/sql.rb

@@ -45,7 +45,7 @@ ON #{on}#{order}#{limit}#{offset}
 SQL
       end
 
-    private
+    protected
 
       def path_delimiter; end
 
@@ -327,7 +327,7 @@ SQL
       def parse_joins!(options)
         return if (paths = extract_paths(options)).empty?
 
-        regexp = /INNER JOIN `([^`]+)`( `[^`]+`)? ON `[^`]+`.`([^`]+)` = `[^`]+`.`([^`]+)`/
+        regexp = /INNER JOIN `([^`]+)`( `[^`]+`)? ON `[^`]+`.`([^`]+)` = `[^`]+`.`([^`]+)`( AND .*)?/
 
         options[:joins] = paths.collect do |path|
           joins, associations = [], []
@@ -340,7 +340,7 @@ SQL
 
             table_joins.each_with_index do |table_join, index|
               concerns_bridge_table_join = concerns_bridge_table && index == 0
-              join_table, possible_alias, join_table_column, table_column = table_join
+              join_table, possible_alias, join_table_column, table_column, conditions = table_join
 
               table_as = (klass == base) ? base_alias : quote_alias(associations.join(path_delimiter))
               join_table_as = quote_alias((associations + [association]).join(path_delimiter))
@@ -353,7 +353,12 @@ SQL
                 end
               end
 
-              joins.push "LEFT JOIN #{join_table} #{join_table_as} ON #{join_table_as}.#{join_table_column} = #{table_as}.#{table_column}"
+              if conditions
+                sql = self.class.new(klass.reflect_on_association(association).klass)
+                conditions = sql.prepend_base_alias(conditions).gsub(sql.base_alias, join_table_as)
+              end
+
+              joins.push "LEFT JOIN #{join_table} #{join_table_as} ON #{join_table_as}.#{join_table_column} = #{table_as}.#{table_column}#{conditions}"
             end
 
             associations << association

data/lib/directive_record/version.rb

@@ -1,7 +1,7 @@
 module DirectiveRecord
   MAJOR = 0
   MINOR = 1
-  TINY  = 26
+  TINY  = 27
 
   VERSION = [MAJOR, MINOR, TINY].join(".")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: directiverecord
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.1.27
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: A layer on top of ActiveRecord for using paths within queries without thinking