scout_apm 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0494dfededbaa29426c0b087bb80e97f865ed237
-  data.tar.gz: dcbbf372d00781f4aa349d4a343650558599fb3c
+  metadata.gz: ca18811f4b9adad075737c7321340025345f1c14
+  data.tar.gz: ca2873e587e8d70fc1a3bffe564b59cde10b0f85
 SHA512:
-  metadata.gz: 11b61029f1561d2ed7806224f219e8c177cc38f9cce5165a1f91eed25786f50edfae50545ab77c974b92c71386a614ed4f4f2658ee2d190f356aedf6ab0d7bac
-  data.tar.gz: 1c4ff4b60d1c27ec6f4df40435fa0f96feb60c18e633e6be1cbfb6c90d09e480e954d4a2c39935ea02373d939dfdd20aeccf31c582c0321ce8114a208d4fb77b
+  metadata.gz: 7a4e009a252a824a6e22bde107ad671e6c017767ad6d96960ecdf056e0ccef3761e6d8d9abe984ec533246c8f34ccba71cc53ce4f7e3012dc2fb2b7173104578
+  data.tar.gz: d45a047c05341ef7da71c1b38a370d78f3e854a54b27ecac7a1bd33a37fd88bb4b30bd1c7d7fd2f897999a1b85e06d2e62437204d115152bd84470f7a36e9497

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 1.5.5
+
+* Handle backslash escaped quotes inside mysql strings.
+
 # 1.5.4
 
 * Fix issue where error counts were being misreported

data/lib/scout_apm/utils/sql_sanitizer_regex.rb

@@ -13,8 +13,8 @@ module ScoutApm
 
       MYSQL_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
       MYSQL_REMOVE_INTEGERS = /(?<!LIMIT )\b\d+\b/.freeze
-      MYSQL_REMOVE_SINGLE_QUOTE_STRINGS = /'(?:[^']|'')*'/.freeze
-      MYSQL_REMOVE_DOUBLE_QUOTE_STRINGS = /"(?:[^"]|"")*"/.freeze
+      MYSQL_REMOVE_SINGLE_QUOTE_STRINGS = %r{'(?:\\'|[^']|'')*'}.freeze
+      MYSQL_REMOVE_DOUBLE_QUOTE_STRINGS = %r{"(?:\\"|[^"]|"")*"}.freeze
       MYSQL_IN_CLAUSE = /IN\s+\(\?[^\)]*\)/.freeze
 
       SQLITE_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze

data/lib/scout_apm/utils/sql_sanitizer_regex_1_8_7.rb

@@ -13,8 +13,8 @@ module ScoutApm
 
       MYSQL_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze
       MYSQL_REMOVE_INTEGERS = /\b\d+\b/.freeze
-      MYSQL_REMOVE_SINGLE_QUOTE_STRINGS = /'(?:[^']|'')*'/.freeze
-      MYSQL_REMOVE_DOUBLE_QUOTE_STRINGS = /"(?:[^"]|"")*"/.freeze
+      MYSQL_REMOVE_SINGLE_QUOTE_STRINGS = /'(?:\\'|[^']|'')*'/.freeze
+      MYSQL_REMOVE_DOUBLE_QUOTE_STRINGS = /"(?:\\"|[^"]|"")*"/.freeze
       MYSQL_IN_CLAUSE = /IN\s+\(\?[^\)]*\)/.freeze
 
       SQLITE_VAR_INTERPOLATION = %r|\[\[.*\]\]\s*$|.freeze

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "1.5.4"
+  VERSION = "1.5.5"
 end
 

data/test/unit/sql_sanitizer_test.rb

@@ -85,6 +85,12 @@ module ScoutApm
         assert_equal %q|SELECT `blogs`.* FROM `blogs` WHERE (title = ?)|, ss.to_s
       end
 
+      def test_mysql_quotes
+        sql = %q|INSERT INTO `users` VALUES ('foo', 'b\'ar')|
+        ss = SqlSanitizer.new(sql).tap{ |it| it.database_engine = :mysql }
+        assert_equal %q|INSERT INTO `users` VALUES (?, ?)|, ss.to_s
+      end
+
       def test_scrubs_invalid_encoding
         sql = "SELECT `blogs`.* FROM `blogs` WHERE (title = 'a\255c')".force_encoding('UTF-8')
         assert_equal false, sql.valid_encoding?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest