adhoq 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47ea5ea847453ee2fd5a5fbd5e8c8d09e579998f
-  data.tar.gz: 40fe3bee5c8f7e289c52d5ef02e42cbce70f854e
+  metadata.gz: 55ebbfcb4634de6d7ff7b565a620aea07cdb739c
+  data.tar.gz: 4a46756086ac03ff5f8564797fff26522fb0f4a2
 SHA512:
-  metadata.gz: 4e61736b80b3946ea4ade7f4014641dc96362ee7a945d1bd24074a5edfd0c7ef9e21646c5afe24f6f5f0731d7d19c2db35130f04e41ada1fdcee8a1a88f3b472
-  data.tar.gz: 3d7131fee5b46181dec95018313b3284e99dac5ac029d864cef5eb87970d7337b57e7c46ca954f66c412402c5ce56a93a9627ad3fcdefe9ee10a3f44d88a988f
+  metadata.gz: 19c49904e45e9eedf169134bc6564448e0974af82a61862bc8fffc33c3bd1a921cb976acf7c962e34b963b38ec99ad06f21b0d0c07ec6dd3bed30856901cec1c
+  data.tar.gz: cae892aac89db0af6e29568fac5aac68c2adab131315fa87fdf38dd8a002e9397c8b85dd2864f4b09c0fb745799597d0a313c0c56e3e6288662d94977b6508b7

data/app/models/adhoq/execution.rb

@@ -10,7 +10,9 @@ module Adhoq
     def generate_report!
       build_report.generate!
       update_attributes(status: :success)
-    rescue
+    rescue => e
+      Rails.logger.error(e)
+      self.report = nil
       update_attributes(status: :failure)
     end
 

data/app/views/adhoq/current_tables/index.html.slim

@@ -14,7 +14,8 @@ ul.list-unstyled.tables
       table.table.table-striped.table-hover.table-bordered
         caption
           span.name= ar_class.table_name
-          small.count #{ar_class.unscoped.count} rows
+          - unless Adhoq.config.hide_rows_count
+            small.count #{ar_class.unscoped.count} rows
         thead
           tr
             th.col-sm-1.pk PK

data/app/views/adhoq/queries/_query.html.slim

@@ -43,6 +43,6 @@ section.query
           th.status=     human(Adhoq::Execution, :status)
           th.report
       tbody
-        - query.executions.recent_first.each do |exec|
+        - query.executions.recent_first.preload(:report).each do |exec|
           - next if exec.report.try(:on_the_fly?)
           = render 'execution', query: query, exec: exec

data/lib/adhoq/configuration.rb

@@ -18,6 +18,7 @@ module Adhoq
 
     config_accessor :database_connection
     config_accessor :hidden_model_names
+    config_accessor :hide_rows_count
 
     config_accessor :async_execution
     config_accessor :job_queue_name

data/lib/adhoq/executor/connection_wrapper.rb

@@ -1,29 +1,33 @@
 module Adhoq
   class Executor
     class ConnectionWrapper
-      attr_reader :connection
-
       def initialize
-        @connection = Adhoq.config.callablize(:database_connection).call
       end
 
       def select(query)
-        with_sandbox do
+        with_sandbox do |connection|
           connection.exec_query(query)
         end
       end
 
       def explain(query)
-        with_sandbox do
+        with_sandbox do |connection|
           connection.explain(query)
         end
       end
 
+      def with_connection
+        connection = Adhoq.config.callablize(:database_connection).call
+        yield(connection)
+      end
+
       def with_sandbox
         result = nil
-        connection.transaction do
-          result = yield
-          raise ActiveRecord::Rollback
+        with_connection do |connection|
+          connection.transaction do
+            result = yield(connection)
+            raise ActiveRecord::Rollback
+          end
         end
         result
       end

data/lib/adhoq/global_variable.rb

@@ -28,6 +28,7 @@ module Adhoq
         when :local_file then Adhoq::Storage::LocalFile
         when :s3         then Adhoq::Storage::S3
         when :on_the_fly then Adhoq::Storage::OnTheFly
+        when :cache      then Adhoq::Storage::Cache
         else
           raise NotImplementedError
         end

data/lib/adhoq/storage.rb

@@ -4,6 +4,7 @@ module Adhoq
     autoload 'LocalFile',  'adhoq/storage/local_file'
     autoload 'S3',         'adhoq/storage/s3'
     autoload 'OnTheFly',   'adhoq/storage/on_the_fly'
+    autoload 'Cache',      'adhoq/storage/cache'
 
     def with_new_identifier(suffix = nil, seed = Time.now)
       dirname, fname_seed = ['%Y-%m-%d', '%H%M%S.%L'].map {|f| seed.strftime(f) }

data/lib/adhoq/storage/cache.rb

@@ -0,0 +1,27 @@
+module Adhoq
+  module Storage
+    class Cache
+      attr_reader :identifier
+
+      def initialize(cache, prefix = "", expire = 300)
+        @cache = cache
+        @identifier = @prefix = prefix
+        @expire = expire
+      end
+
+      def store(suffix = nil, seed = Time.now, &block)
+        Adhoq::Storage.with_new_identifier(suffix, seed) do |identifier|
+          @cache.write(@prefix + identifier, yield.read, expires_in: @expire)
+        end
+      end
+
+      def direct_download?
+        false
+      end
+
+      def get(identifier)
+        @cache.read(@prefix + identifier)
+      end
+    end
+  end
+end

data/lib/adhoq/version.rb

@@ -1,3 +1,3 @@
 module Adhoq
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/models/adhoq/execution_spec.rb

@@ -21,5 +21,23 @@ module Adhoq
       # Accessable only once
       expect(execution.report.data).to be_nil
     end
+
+    describe '#generate_report!' do
+      subject { -> { execution.generate_report! } }
+
+      let(:execution) { Execution.new(query: query, raw_sql: query.query, report_format: 'csv') }
+
+      context 'when execute query successfully' do
+        let(:query) { create(:adhoq_query, query: 'SELECT name, description FROM adhoq_queries') }
+
+        it { is_expected.to change { execution.status.to_s }.to('success') }
+      end
+
+      context 'when execute query failed' do
+        let(:query) { create(:adhoq_query, query: 'INVALID SQL') }
+
+        it { is_expected.to change { execution.status.to_s }.to('failure') }
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adhoq
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Kyosuke MOROHASHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-08 00:00:00.000000000 Z
+date: 2018-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -456,6 +456,7 @@ files:
 - lib/adhoq/reporter/xlsx.rb
 - lib/adhoq/result.rb
 - lib/adhoq/storage.rb
+- lib/adhoq/storage/cache.rb
 - lib/adhoq/storage/fog_storage.rb
 - lib/adhoq/storage/local_file.rb
 - lib/adhoq/storage/on_the_fly.rb
@@ -497,23 +498,23 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2.2
 signing_key: 
 specification_version: 4
 summary: DB management console in the wild.
 test_files:
-- spec/adhoq/executor/connection_wrapper_spec.rb
-- spec/adhoq/executor_spec.rb
-- spec/adhoq/global_variable_spec.rb
-- spec/adhoq/reporter/csv_spec.rb
 - spec/adhoq/reporter/json_spec.rb
+- spec/adhoq/reporter/csv_spec.rb
 - spec/adhoq/reporter/xlsx_spec.rb
 - spec/adhoq/storage_spec.rb
+- spec/adhoq/executor_spec.rb
+- spec/adhoq/executor/connection_wrapper_spec.rb
+- spec/adhoq/global_variable_spec.rb
 - spec/factories/adhoq_queries.rb
+- spec/models/adhoq/report_spec.rb
 - spec/models/adhoq/execution_spec.rb
 - spec/models/adhoq/query_spec.rb
-- spec/models/adhoq/report_spec.rb
-- spec/support/activejob_helper.rb
 - spec/support/feature_spec_helper.rb
+- spec/support/activejob_helper.rb
 - spec/support/have_values_in_xlsx_sheet_matcher.rb
 - spec/spec_helper.rb