Business intelligence made simple
Fixed BLAZER_DATABASE_URL required error - closes #62
Andrew Kane030a0bf58137
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex a05708d7..43609d66 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -1,3 +1,7 @@+## 1.3.6++- Fixed `BLAZER_DATABASE_URL required` error+## 1.3.5- Fixed error with checksdiff --git a/app/controllers/blazer/base_controller.rb b/app/controllers/blazer/base_controller.rbindex 3a910bc3..4391e07d 100644--- a/app/controllers/blazer/base_controller.rb+++ b/app/controllers/blazer/base_controller.rb@@ -15,14 +15,8 @@ module Blazerlayout "blazer/application"- before_action :ensure_database_url-private- def ensure_database_url- render text: "BLAZER_DATABASE_URL required" if !ENV["BLAZER_DATABASE_URL"] && !Rails.env.development?- end-def process_vars(statement, data_source)(@bind_vars ||= []).concat(extract_vars(statement)).uniq!@bind_vars.each do |var|diff --git a/lib/blazer.rb b/lib/blazer.rbindex 80bb412f..8d707902 100644--- a/lib/blazer.rb+++ b/lib/blazer.rb@@ -6,7 +6,8 @@ require "blazer/data_source"require "blazer/engine"module Blazer- class TimeoutNotSupported < StandardError; end+ class Error < StandardError; end+ class TimeoutNotSupported < Error; endclass << selfattr_accessor :auditdiff --git a/lib/blazer/data_source.rb b/lib/blazer/data_source.rbindex 12b1d407..9ce2ae9f 100644--- a/lib/blazer/data_source.rb+++ b/lib/blazer/data_source.rb@@ -7,6 +7,11 @@ module Blazerdef initialize(id, settings)@id = id@settings = settings++ unless settings["url"] || Rails.env.development?+ raise Blazer::Error, "Empty url"+ end+@connection_model =Class.new(Blazer::Connection) dodef self.name