directiverecord 0.1.21 → 0.1.22

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmYzMWQ2NTkwOWRkMWJhNTRhNDVjM2U5ODYzNTgwY2ZhZWU4YzkyMQ==
+    MGRkZjA3NjA3YzdmY2IzZTkwODg3ZTcyNzczZDVkYmE4MzRlZjk4MA==
   data.tar.gz: !binary |-
-    Mzg2NmQzNmJjYmI0Y2ZhOGY1ODM1YTBhMmE3NjUzNjU5ZjBmZWU4Mw==
+    MGM1NjBkMDM2ZjRiMThiYTQ5NzAxNzIyN2NhM2IwM2QxZTY2OTlkOA==
 SHA512:
   metadata.gz: !binary |-
-    MGRjNjBmNmQ5ZTJkNTVmMjUxMDk3MDM4ZTdlYWQ3MTY0YmY4OGI0Mzk3Y2Ix
-    MmZmY2MyYTI1ZTc0Mjc4MmQ2YjA3NWZhNmRiNTFlOGU2ZDk0NDk5NDJmYjA1
-    NmY5YmQwYTczNWM3MGY2MTI2ZTg4MzBiYTk4MDZmNDQ4NGVlZWY=
+    OTNiYTViM2I0YjU5MjAyOWI1ZGFmYjU2MDMwMDhjMjRkYzcyYWVhNGJhNGE2
+    NTk2ZDkyYmE5YmExNDFmNGMwMWM0M2Q0OWZkMGU2MTQzZDQ3ZmNiNDdlZjQ4
+    NTc1NDRkNDFjNGRlZjA0NWM2MjUyYjU4YTM5N2UxMGYxYTkxNzg=
   data.tar.gz: !binary |-
-    NDRjNjg0NmJhZjhkYmY0OTZmOTg1YjA3MjQ1YmQ5MDAzY2E0OTQ1OGZlYjRl
-    NzQzMDQ0MGVmNTRiNDE0NzIwNGRkYjUwMzljYjA4YTFkOWEyNjAxMWIyODhk
-    Mzc5YWY0MjBiMmVhYzVhNzMzMGVkMWMyYTVhY2JlZmJmMjk2MzI=
+    NGZjNTFmMTg3ZmFkN2Q0ZjE4MjY2OWMxYmMzNzVkMzk5YjA3NGFkYjdjMzAw
+    ZjdmYjgyOTMxY2UxMTMxNDJkZjM2MGVkMDJiMzA4ZGViNTJhZGIxNjNlNGQz
+    NDljNWEwZDllYzU3MjNkNWM3NWMxODJkYjZhZjBhZjc5MTNmMjM=

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = DirectiveRecord CHANGELOG
 
+== Version 0.1.22 (April 8, 2015)
+
+* Corrected deriving qry_options from habtm associations
+
 == Version 0.1.21 (April 3, 2015)
 
 * Storing original sql alias of a calculated column when numerizing aliases

data/VERSION

@@ -1 +1 @@
-0.1.21
+0.1.22

data/lib/directive_record/relation.rb

@@ -27,7 +27,14 @@ module DirectiveRecord
     def sql_aliases_to_paths(arg)
       visit_sql(arg).gsub(/(`([^`]+)`\.`([^`]+)`)/) do
         sql_alias, column = $2, $3
+
         path = sql_alias_to_path sql_alias
+        reflection = klass.reflections[sql_alias_to_association(sql_alias, klass).to_sym]
+
+        if reflection && (reflection.macro == :has_and_belongs_to_many) && (reflection.join_table == sql_alias) && (reflection.association_foreign_key == column)
+          column = "id"
+        end
+
         path.empty? ? column : "#{path}.#{column}"
       end
     end

data/lib/directive_record/version.rb

@@ -1,7 +1,7 @@
 module DirectiveRecord
   MAJOR = 0
   MINOR = 1
-  TINY  = 21
+  TINY  = 22
 
   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.21
+  version: 0.1.22
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord