Business intelligence made simple
Do not cache statements that modify data
Andrew Kaned45a2f2230a3
diff --git a/lib/blazer/adapters/base_adapter.rb b/lib/blazer/adapters/base_adapter.rbindex da882736..7d6553d0 100644--- a/lib/blazer/adapters/base_adapter.rb+++ b/lib/blazer/adapters/base_adapter.rb@@ -31,6 +31,10 @@ module Blazer# optionalend+ def cachable?(statement)+ true # optional+ end+protecteddef settingsdiff --git a/lib/blazer/adapters/sql_adapter.rb b/lib/blazer/adapters/sql_adapter.rbindex 0838aeeb..c12e6e26 100644--- a/lib/blazer/adapters/sql_adapter.rb+++ b/lib/blazer/adapters/sql_adapter.rb@@ -40,7 +40,7 @@ module Blazerenddef tables- result = data_source.run_statement(connection_model.send(:sanitize_sql_array, ["SELECT table_name FROM information_schema.tables WHERE table_schema IN (?) ORDER BY table_name", schemas]))+ result = data_source.run_statement(connection_model.send(:sanitize_sql_array, ["SELECT table_name FROM information_schema.tables WHERE table_schema IN (?) ORDER BY table_name", schemas]), refresh_cache: true)result.rows.map(&:first)end@@ -66,6 +66,10 @@ module Blazernilend+ def cachable?(statement)+ !%w[CREATE ALTER UPDATE INSERT DELETE].include?(statement.split.first.to_s.upcase)+ end+protecteddef postgresql?diff --git a/lib/blazer/data_source.rb b/lib/blazer/data_source.rbindex 2d1f5c4f..dd6be423 100644--- a/lib/blazer/data_source.rb+++ b/lib/blazer/data_source.rb@@ -164,7 +164,7 @@ module Blazercache_data = Marshal.dump([columns, rows, error, cache ? Time.now : nil]) rescue nilend- if cache && cache_data+ 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