directiverecord 0.1.16 → 0.1.17

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmEyYjEwZjExYzg4OTE0ZjE2MTc5NjhmNTU4NzgyOGFhZGY5MzVhZA==
+    YmQwN2FkODM3MTk4NjFkOTFhYjViYjIxYjdlYzlhZmM0YmMzZTIwMg==
   data.tar.gz: !binary |-
-    ZjQxZDk5OGUyMWU2MjkyZTcyNTA5Yzc3OTFhOTY5OWU0ZDU3YjQyYw==
+    Y2RjZjMwNTUzODkxYjgwNWRmODAxNTZiZTlhZTIzZWMyZjNjNDc4Mg==
 SHA512:
   metadata.gz: !binary |-
-    MTgzNDFjMGJmNTY5ZTcxN2Q5ZjRmNDhlMTIwZDA2Y2RjMTI0YTRjN2YzMmI0
-    Yjk0NjM5Zjc2ZmNhMmEwNzY2YjkxOThlZjA1YzBmYzQ4YmI4NDI4NTg3YjBh
-    MmZhZDliY2Y3YzBjMDM2NTNjMjZlMTVkZWRkYzllNjU2MGQ1ZTM=
+    NmZiMmEwMTgxNThjZGVlZjA0NjFlYTE2OGZhZWU3ZGQyMjU4NjVjNGRkYTg1
+    MjlhNDNlYTFhMTNhMGI3MzI4YTRhZjZjYmJhNDk3M2U2NTExYjkzZGI2ZTU5
+    MzA3MjM5ZjQ3Yzk5YTcwZWFmZWI4MDIyZmI1MTY5YmQ0NWMyMzA=
   data.tar.gz: !binary |-
-    MWMwODE0ZjUxZTJiOGExMjhkODBjM2JlZjhkZjg0YWNkNmUzNTM2Mjc0YTYy
-    MDUxZWM1MmYzYWE1MDA5ZjA4NjYxMGUyNDhiNDZkYjA5YWEzNzcwMTBkZGJl
-    NGQxOTZhOWVkZmVhOGY5Y2E1NmVjOWMzODRlMTZjNzU4YTI1M2Q=
+    ZWYyYmY0OGI2YmQwZGZmNWIyMTEyNDA2ZDNiY2M1ZjAwN2M1ZjUyNGI5NWFh
+    MjgwMzA0Yjg4YTk1ZmE1ZDgxMjhmZWY5OGFiNjI1NmZmYzRiMTc4OWZiMjg0
+    ZDBkNzUxNWMwNmI4YzE0ODA3MmQ0NTAxZjBiMzE4M2E3MzQyMGE=

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = DirectiveRecord CHANGELOG
 
+== Version 0.1.17 (March 13, 2015)
+
+* Corrected normalize_subselect!
+
 == Version 0.1.16 (March 12, 2015)
 
 * Made ActiveRecord::Relation#count(:all) override more strict: only overrule behavior when having detected a possible path in the query options

data/VERSION

@@ -1 +1 @@
-0.1.16
+0.1.17

data/lib/directive_record/query/sql.rb

@@ -190,8 +190,11 @@ SQL
 
           if opts[:join] && !qry_options[:group_by].blank?
             joins = qry_options[:group_by].collect do |path|
-              qry_options[:select].unshift(column = path.gsub(/\.\w+$/, "_id").strip)
-              "#{query_alias}.#{column} = #{base_alias}.#{column}"
+              column = path.gsub(/\.\w+$/, "_id").strip
+              column.match(/(.*) AS (\w+)$/)
+              select_sql, select_alias = $1, $2
+              qry_options[:select].unshift(column)
+              "#{query_alias}.#{select_alias || column} = #{select_sql || "#{base_alias}.#{column}"}"
             end
             prefix = "LEFT JOIN\n   "
             postfix = " ON #{joins.join(" AND ")}"

data/lib/directive_record/version.rb

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