optic-rails 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c86b9eac93434bd8297c433d5f10c4c1827e4905cf4c7d6e62fe5f4c3ee6fec
-  data.tar.gz: 2c15c7a1cb011386bc64f632af5b49b571289773195f44dedc3fced6d78ea65c
+  metadata.gz: f9410ea4eb57b65685d90e10085ae84f5e40607ed9f1a1016c147c1c3c231efe
+  data.tar.gz: adc15f1add9ac36ccdf2ca8be14a369ab2ba6475072e2298c963d52ddd597d97
 SHA512:
-  metadata.gz: 1c35b4031d5c8c6ca5aa4e1e10d7955c5db635d29208bcfe7e69042cd3586bb9e65b2382935525c209ee9262dce93538d71ebcd31dc98ac1ab3a0805f6b06f34
-  data.tar.gz: 01432f5d8f521e78d12c60e2e4e686cbf95b6c4995f1fb5366d9293236527affbd6c117020dda37df3c806e977a49106c9bf6973b1acfeb0dfc4c7ab34ef8ebd
+  metadata.gz: 732f7902ece59b40ec446b17615836b490ba2e94bea9f72ff0b75439274e878f32d85fd057d6854077314256141aa6b8e57dd485cc5c61f72732704097a3b31a
+  data.tar.gz: a53b1d9fb359101ae9a51eb90a0e32c292440a19b951aae377c17a328b591e03f84df378fc15589fdb98c6f6acbd705dd5654d47176d40736059552093c2f063

data/lib/optic/rails.rb

@@ -52,30 +52,30 @@ module Optic
                 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"|,
+                  %Q|#{qualified_primary_key(connection, pivot)} AS primary_key|,
+                  %Q|#{qualified_entity_column(connection, pivot, instruction["pivot_attribute_name"])} AS pivot_attribute_name|,
                 ]
 
                 join_select = entity
                               .joins(joins)
-                              .group(qualified_primary_key(pivot))
-                              .select(*columns, 'COUNT(*) AS "count"')
+                              .group(qualified_primary_key(connection, pivot))
+                              .select(*columns, 'COUNT(*) AS count')
                               .to_sql
 
                 instance_select = pivot
-                                  .select(*columns, '0 AS "count"')
+                                  .select(*columns, '0 AS count')
                                   .to_sql
 
                 union_sql = <<~"SQL"
-                              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"
+                              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
+                entity.select('COUNT(*) as count').to_sql
               end
 
-            { metric_configuration_id: instruction["metric_configuration_id"], result: connection.execute(query).to_a }
+            { metric_configuration_id: instruction["metric_configuration_id"], result: connection.exec_query(query).to_a }
           end
         end
       end
@@ -89,8 +89,12 @@ module Optic
       def with_connection
         ActiveRecord::Base.connection_pool.with_connection do |connection|
           connection.transaction do
-            connection.execute "SET TRANSACTION READ ONLY"
-            connection.execute "SET LOCAL statement_timeout = 100"
+            if connection.adapter_name == "PostgreSQL"
+              connection.execute "SET TRANSACTION READ ONLY"
+              connection.execute "SET LOCAL statement_timeout = 100"
+              # TODO support equivalent options for other adapters (such as mysql)
+            end
+
             yield connection
           end
         end
@@ -100,12 +104,16 @@ module Optic
         entity_name.constantize.unscoped
       end
 
-      def qualified_column(entity, attribute)
-        %Q|"#{entity.table_name}"."#{attribute}"|
+      def qualified_primary_key(connection, entity)
+        qualified_entity_column(connection, entity, entity.primary_key)
+      end
+
+      def qualified_entity_column(connection, entity, attribute)
+        qualified_table_column(connection, entity.table_name, attribute)
       end
 
-      def qualified_primary_key(entity)
-        qualified_column(entity, entity.primary_key)
+      def qualified_table_column(connection, table_name, column_name)
+        connection.quote_table_name(table_name) + "." + connection.quote_column_name(column_name)
       end
 
       def active_record_klasses

data/lib/optic/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Optic
   module Rails
-    VERSION = "1.3.1"
+    VERSION = "1.3.2"
   end
 end

metadata

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