Business intelligence made simple
Lazy load adapter instance
Andrewde03cbaf156a
diff --git a/lib/blazer/data_source.rb b/lib/blazer/data_source.rbindex 93b577c8..ec04b87f 100644--- a/lib/blazer/data_source.rb+++ b/lib/blazer/data_source.rb@@ -4,24 +4,13 @@ module Blazerclass DataSourceextend Forwardable- attr_reader :id, :settings, :adapter, :adapter_instance+ attr_reader :id, :settingsdef_delegators :adapter_instance, :schema, :tables, :preview_statement, :reconnect, :cost, :explain, :canceldef initialize(id, settings)@id = id@settings = settings-- unless settings["url"] || Rails.env.development? || ["bigquery", "athena"].include?(settings["adapter"])- raise Blazer::Error, "Empty url for data source: #{id}"- end-- @adapter_instance =- if Blazer.adapters[adapter]- Blazer.adapters[adapter].new(self)- else- raise Blazer::Error, "Unknown adapter"- endenddef adapter@@ -154,9 +143,23 @@ module Blazerprotected+ def adapter_instance+ @adapter_instance ||= begin+ unless settings["url"] || Rails.env.development? || ["bigquery", "athena"].include?(settings["adapter"])+ raise Blazer::Error, "Empty url for data source: #{id}"+ end++ unless Blazer.adapters[adapter]+ raise Blazer::Error, "Unknown adapter"+ end++ Blazer.adapters[adapter].new(self)+ end+ end+def run_statement_helper(statement, comment, run_id)start_time = Time.now- columns, rows, error = @adapter_instance.run_statement(statement, comment)+ columns, rows, error = adapter_instance.run_statement(statement, comment)duration = Time.now - start_timecache_data = nil@@ -165,7 +168,7 @@ module Blazercache_data = Marshal.dump([columns, rows, error, cache ? Time.now : nil]) rescue nilend- if cache && cache_data && @adapter_instance.cachable?(statement)+ if cache && cache_data && adapter_instance.cachable?(statement)Blazer.cache.write(statement_cache_key(statement), cache_data, expires_in: cache_expires_in.to_f * 60)end