Business intelligence made simple
Added transform_statement option to replace groupdate_hack
Andrew Kaneeca5b7c814e3
diff --git a/app/controllers/blazer/queries_controller.rb b/app/controllers/blazer/queries_controller.rbindex 684ec25a..6f3a392e 100644--- a/app/controllers/blazer/queries_controller.rb+++ b/app/controllers/blazer/queries_controller.rb@@ -42,7 +42,7 @@ module Blazerendend- data_source.groupdate_hack(@statement)+ Blazer.transform_statement.call(data_source, @statement) if Blazer.transform_statementenddef edit@@ -59,7 +59,7 @@ module Blazerdata_source = params[:data_source]data_source = @query.data_source if @query && @query.data_source@data_source = Blazer.data_sources[data_source]- @data_source.groupdate_hack(@statement)+ Blazer.transform_statement.call(@data_source, @statement) if Blazer.transform_statement# auditif Blazer.auditdiff --git a/lib/blazer.rb b/lib/blazer.rbindex 6b65200b..e95f1fd5 100644--- a/lib/blazer.rb+++ b/lib/blazer.rb@@ -14,6 +14,7 @@ module Blazerattr_accessor :user_methodattr_accessor :from_emailattr_accessor :cache+ attr_accessor :transform_statementendself.audit = trueself.user_name = :namediff --git a/lib/blazer/data_source.rb b/lib/blazer/data_source.rbindex 8835dda2..bd541f95 100644--- a/lib/blazer/data_source.rb+++ b/lib/blazer/data_source.rb@@ -117,20 +117,6 @@ module Blazerconnection_model.connection.adapter_name == "Redshift"end- def groupdate_hack(statement)- if redshift? && Blazer.settings["groupdate_hack"]- original_statement = statement.dup- %w[day week month].each do |period|- statement.gsub!(/g#{period}\(([^,\)]+), ?([^\)]+)\)/, "TRUNC(DATE_TRUNC('#{period}', CONVERT_TIMEZONE(\\2, \\1)))")- statement.gsub!(/g#{period}\(([^\)]*_at[^\)]*)\)/, "TRUNC(DATE_TRUNC('#{period}', CONVERT_TIMEZONE('America/Los_Angeles', \\1)))")- statement.gsub!(/g#{period}\(([^\)]+)\)/, "TRUNC(DATE_TRUNC('#{period}', \\1))")- end- if statement != original_statement- statement << "\n/* modified for Redshift */"- end- end- end-protecteddef in_transaction