optic-rails 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0aa2f63c9f4f258d67ea8394f6cd7bade5bcdfa4bb8688b52797060224034e2d
-  data.tar.gz: 0211d9654d0bcde150cdaef99c44a69016a96ecf2f592c11b5c560b13a1b97a1
+  metadata.gz: a31dc5831c0497221df21911c8b1d3e19823e8757571fb543530d78649c1d836
+  data.tar.gz: 0d8d44c7978a12e9f5b0fc5da2bb6b1e7c1dfb8c9868bb66abb5814b78218c02
 SHA512:
-  metadata.gz: 1c211a4e662524ac0db1b2f858603de478d57b074a0959904f8a5142b5e56d12cc89d21aa653bf7509247132a2da5c803f34b6d51eacd122443203dc0739ae6d
-  data.tar.gz: 245695dd27b14e22afbdbd4aa5df1f08e0ee8f0635ccbe85aea7eacf98043958412414c48846001a13d4e22628c6c13b651232a198388eb6a2f84a2813b521c2
+  metadata.gz: b3a385d803cfd40bff67dddf437c69857fc08a0bee5ac9d71e096239ddd3c5f7ffc4a4d0d17482404bce939f930af1ff20af0f8bc44deb194bee74b527988394
+  data.tar.gz: b5b7c3c6a8c1c8fba53981cbd30144a9991350501784605e52e530e8b7e19419370371f854c38ea214c350b079e22745b3aabdf8db20c74741520bbf55193a5e

data/lib/optic/rails.rb

@@ -50,20 +50,26 @@ module Optic
                 pivot = pivot_name.constantize
                 join_path = instruction["join_path"]
                 joins = join_path.reverse.map(&:to_sym).inject { |acc, elt| { elt => acc } }
+
+                columns = [
+                  %Q|#{qualified_primary_key(pivot)} AS "primary_key"|,
+                  %Q|#{qualified_column(pivot, instruction["pivot_attribute_name"])} AS "pivot_attribute_name"|,
+                ]
+
                 join_select = entity
                               .joins(joins)
                               .group(qualified_primary_key(pivot))
-                              .select(qualified_primary_key(pivot), qualified_column(pivot, instruction["pivot_attribute_name"]), "COUNT(*)")
+                              .select(*columns, 'COUNT(*) AS "count"')
                               .to_sql
 
                 instance_select = pivot
-                                  .select(qualified_primary_key(pivot), qualified_column(pivot, instruction["pivot_attribute_name"]), "0 as count")
+                                  .select(*columns, '0 AS "count"')
                                   .to_sql
 
                 union_sql = <<~"SQL"
-                              SELECT "pivot_values"."id", "pivot_values"."name", MAX("pivot_values"."count") AS count
-                                FROM (#{join_select} UNION ALL #{instance_select}) AS pivot_values
-                                GROUP BY "pivot_values"."id", "pivot_values"."name"
+                              SELECT "pivot_values"."primary_key", "pivot_values"."pivot_attribute_name", MAX("pivot_values"."count") AS "count"
+                                FROM (#{join_select} UNION ALL #{instance_select}) AS "pivot_values"
+                                GROUP BY "pivot_values"."primary_key", "pivot_values"."pivot_attribute_name"
                             SQL
               else
                 entity.select("COUNT(*)").to_sql
@@ -74,13 +80,6 @@ module Optic
         end
       end
 
-      def instances(pivot_name)
-        with_connection do |connection|
-          pivot = pivot_name.constantize
-          { instances: connection.execute(pivot.unscoped.select("*").to_sql).to_a }
-        end
-      end
-
       private
 
       # Try to be defensive with our DB connection:

data/lib/optic/rails/railtie.rb

@@ -69,8 +69,6 @@ module Optic
                     client.perform "schema", message: Optic::Rails.entities
                   when "request_metrics"
                     client.perform "metrics", message: Optic::Rails.metrics(message["instructions"])
-                  when "request_instances"
-                    client.perform "instances", message: Optic::Rails.instances(message["pivot"])
                   else
                     logger.warn "Optic agent got unknown command: #{command}"
                   end

data/lib/optic/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Optic
   module Rails
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: optic-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Anton Vaynshtok
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-27 00:00:00.000000000 Z
+date: 2018-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: action_cable_client