appsignal 0.12.beta.6 → 0.12.beta.7

data/lib/appsignal/event_formatter/active_record/sql_formatter.rb

@@ -12,11 +12,10 @@ module Appsignal
         NUMERIC_DATA       = /\b\d+\b/.freeze
         SANITIZED_VALUE    = '\1?\2'.freeze
 
-        attr_reader :adapter_uses_double_quoted_table_names, :adapter_uses_prepared_statements
+        attr_reader :adapter_uses_double_quoted_table_names
 
         def initialize
           @connection_config = connection_config
-          @adapter_uses_prepared_statements = adapter_uses_prepared_statements?
           @adapter_uses_double_quoted_table_names = adapter_uses_double_quoted_table_names?
         rescue ::ActiveRecord::ConnectionNotEstablished
           Appsignal::EventFormatter.unregister('sql.active_record', self.class)
@@ -25,22 +24,18 @@ module Appsignal
 
         def format(payload)
           return nil if schema_query?(payload) || !payload[:sql]
-          if adapter_uses_prepared_statements
-            [payload[:name], payload[:sql]]
+          sql_string = payload[:sql].dup
+          if adapter_uses_double_quoted_table_names
+            sql_string.gsub!(SINGLE_QUOTE, SANITIZED_VALUE)
+            sql_string.gsub!(SINGLE_QUOTED_DATA, SANITIZED_VALUE)
           else
-            sql_string = payload[:sql].dup
-            if adapter_uses_double_quoted_table_names
-              sql_string.gsub!(SINGLE_QUOTE, SANITIZED_VALUE)
-              sql_string.gsub!(SINGLE_QUOTED_DATA, SANITIZED_VALUE)
-            else
-              sql_string.gsub!(SINGLE_QUOTE, SANITIZED_VALUE)
-              sql_string.gsub!(DOUBLE_QUOTE, SANITIZED_VALUE)
-              sql_string.gsub!(QUOTED_DATA, SANITIZED_VALUE)
-            end
-            sql_string.gsub!(IN_ARRAY, SANITIZED_VALUE)
-            sql_string.gsub!(NUMERIC_DATA, SANITIZED_VALUE)
-            [payload[:name], sql_string]
+            sql_string.gsub!(SINGLE_QUOTE, SANITIZED_VALUE)
+            sql_string.gsub!(DOUBLE_QUOTE, SANITIZED_VALUE)
+            sql_string.gsub!(QUOTED_DATA, SANITIZED_VALUE)
           end
+          sql_string.gsub!(IN_ARRAY, SANITIZED_VALUE)
+          sql_string.gsub!(NUMERIC_DATA, SANITIZED_VALUE)
+          [payload[:name], sql_string]
         end
 
         protected
@@ -62,12 +57,6 @@ module Appsignal
             adapter = @connection_config[:adapter]
             adapter =~ /postgres/ || adapter =~ /sqlite/
           end
-
-          def adapter_uses_prepared_statements?
-            return false unless adapter_uses_double_quoted_table_names?
-            return true if @connection_config[:prepared_statements].nil?
-            @connection_config[:prepared_statements]
-          end
       end
     end
   end

data/lib/appsignal/version.rb

@@ -1,4 +1,4 @@
 module Appsignal
-  VERSION       = '0.12.beta.6'
+  VERSION       = '0.12.beta.7'
   AGENT_VERSION = 'fc00f64'
 end

data/spec/lib/appsignal/event_formatter/active_record/sql_formatter_spec.rb

@@ -129,14 +129,6 @@ if rails_present?
         end
       end
 
-      context "skip sanitization for prepared statements" do
-        let(:connection_config) { {:adapter => 'postgresql'} }
-
-        let(:sql) { 'SELECT "table".* FROM "table" WHERE "id"=$1' }
-
-        it { should == ['Model load', 'SELECT "table".* FROM "table" WHERE "id"=$1'] }
-      end
-
       context "return nil for schema queries" do
         let(:name) { 'SCHEMA' }
         let(:sql) { 'SET client_min_messages TO 22' }
@@ -193,28 +185,6 @@ if rails_present?
 
           it { should be_true }
         end
-
-        describe "adapter_uses_prepared_statements" do
-          subject { formatter.adapter_uses_prepared_statements }
-
-          context "when using mysql" do
-            let(:connection_config) { {:adapter => 'mysql'} }
-
-            it { should be_false }
-          end
-
-          context "when using postgresql" do
-            let(:connection_config) { {:adapter => 'postgresql'} }
-
-            it { should be_true }
-          end
-
-          context "when using postgresql and prepared statements is disabled" do
-            let(:connection_config) { {:adapter => 'postgresql', :prepared_statements => false} }
-
-            it { should be_false }
-          end
-        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.12.beta.6
+  version: 0.12.beta.7
   prerelease: 5
 platform: ruby
 authors: