Handle leading spaces in the SQL

instacart · Feb 6, 2015 · c70ae89 · c70ae89
1 parent 3ceeed2
commit c70ae89
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/active_record/connection_adapters/makara_abstract_adapter.rb b/lib/active_record/connection_adapters/makara_abstract_adapter.rb
@@ -100,10 +100,10 @@ def custom_error_message?(connection, message)
       hijack_method :execute, :select_rows, :exec_query
       send_to_all :connect, :disconnect!, :reconnect!, :verify!, :clear_cache!, :reset!
 
-      SQL_MASTER_MATCHERS           = [/^select.+for update$/i, /select.+lock in share mode$/i].map(&:freeze).freeze
-      SQL_SLAVE_MATCHERS            = [/^select\s/i].map(&:freeze).freeze
-      SQL_ALL_MATCHERS              = [/^set\s/i].map(&:freeze).freeze
-      SQL_SKIP_STICKINESS_MATCHERS  = [/^show\s([\w]+\s)?(field|table|database|schema|view|index)(es|s)?/i, /^(set|describe|explain|pragma)\s/i].map(&:freeze).freeze
+      SQL_MASTER_MATCHERS           = [/^\s*select.+for update$/i, /select.+lock in share mode$/i].map(&:freeze).freeze
+      SQL_SLAVE_MATCHERS            = [/^\s*select\s/i].map(&:freeze).freeze
+      SQL_ALL_MATCHERS              = [/^\s*set\s/i].map(&:freeze).freeze
+      SQL_SKIP_STICKINESS_MATCHERS  = [/^\s*show\s([\w]+\s)?(field|table|database|schema|view|index)(es|s)?/i, /^(set|describe|explain|pragma)\s/i].map(&:freeze).freeze
 
 
       def sql_master_matchers

diff --git a/spec/active_record/connection_adapters/makara_abstract_adapter_spec.rb b/spec/active_record/connection_adapters/makara_abstract_adapter_spec.rb
@@ -21,7 +21,9 @@
     'set @@things' => true,
     'commit' => true,
     'select * from felines' => false,
+    '    select * from felines' => false,
     'select * from users for update' => true,
+    '    select * from users for update' => true,
     'select * from users lock in share mode' => true,
     'select * from users where name = "for update"' => false,
     'select * from users where name = "lock in share mode"' => false