active_record_query_fixer 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65c48f74a79cfa27fcc9c02cf33eba5dde33ce47d86e395ecb354d6819ae8943
-  data.tar.gz: 5bbb57d47062a495de2b1c337551f7b82063ae569094ab5e0b538974b6c1b581
+  metadata.gz: 748952394d906b747d5be0d64efd08b2c45b37015f0d3ce928622b63770c1eb9
+  data.tar.gz: f9ac5f0a73434c61e06058fad5dbad01167238caba974876135e3f13514e594b
 SHA512:
-  metadata.gz: 0cc9451b46d0a9df30beb5c5135c733bd3df30fd0c6758c033764d74e52052b9644b7c1fc3eadfdfeb5a8c3d01acd31ecb4379882d17ae423761574da6fef3fd
-  data.tar.gz: 2a8d48a3d80ad51d45fe2a7ff501337200e41ea2665078dc8cc380ac585941778919a861d48e4db2a5d57181734ea4f51aa270692cbcfd7c22dbb9db228ef83f
+  metadata.gz: fe806b25d8a1176f108450ba2e0d86cd5ff3b7e4a612cee1415b054bb3ffd33661e068eb1b9ecc4ce18f38714d083afd0405e9d4910ddf55db34baa593730d59
+  data.tar.gz: 027b8b485cf08c9d62a2ddcbaa33acf05ae3338da4f24d5454cfa266ef8939f9f79a880f66069048807e9333f374f54f00de285ef7a8d28a1ddc8daf609cb136

data/lib/active_record_query_fixer/version.rb

@@ -1,3 +1,3 @@
 class ActiveRecordQueryFixer
-  VERSION = "0.0.7".freeze
+  VERSION = "0.0.8".freeze
 end

data/lib/active_record_query_fixer.rb

@@ -16,6 +16,34 @@ class ActiveRecordQueryFixer
     fix_reference_group if fix_reference_group?
     fix_order_group if fix_order_group?
     fix_order_select_distinct if fix_order_select_distinct?
+    fix_distinct_group_select if @query.values[:distinct] && @query.values[:group] && @query.values[:select]
+
+    self
+  end
+
+  def fix_distinct_group_select
+    require "dig_bang"
+    require "pg_query"
+
+    parsed_query = PgQuery.parse(@query.to_sql)
+    select_targets = parsed_query.tree.dig!(0, "RawStmt", "stmt", "SelectStmt", "targetList")
+
+    select_targets.each do |select_target|
+      fields = select_target.dig!("ResTarget", "val", "ColumnRef", "fields")
+      next if fields.length != 2
+
+      table = fields[0].dig("String", "str")
+      column = fields[1].dig("String", "str")
+
+      if column
+        # A table and a column has been selected - make sure to group by that
+        @query = @query.group("#{table}.#{column}")
+      elsif fields[1].key?("A_Star")
+        # A table and a star has been selected - assume the primary key is called "id" and group by that
+        @query = @query.group("#{table}.id")
+      end
+    end
+
     self
   end
 
@@ -38,6 +66,7 @@ class ActiveRecordQueryFixer
     end
 
     @query = @query.select("#{@query.table_name}.*") if changed
+
     self
   end
 
@@ -47,6 +76,8 @@ class ActiveRecordQueryFixer
     @query.values[:references].each do |reference|
       @query = @query.group("#{reference}.id")
     end
+
+    self
   end
 
 private

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: active_record_query_fixer
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-17 00:00:00.000000000 Z
-dependencies: []
+date: 2019-10-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: dig_bang
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg_query
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A library for automatically added `.select` on a column used for `.distinct`
   or automatically adding `.group` for a column used for order.
 email:
@@ -44,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A library for automatically added `.select` on a column used for `.distinct`