CR: fixing missed regex

instacart · Feb 6, 2015 · 976091d · 976091d
1 parent c70ae89
commit 976091d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/active_record/connection_adapters/makara_abstract_adapter.rb b/lib/active_record/connection_adapters/makara_abstract_adapter.rb
@@ -103,7 +103,7 @@ def custom_error_message?(connection, message)
       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
+      SQL_SKIP_STICKINESS_MATCHERS  = [/^\s*show\s([\w]+\s)?(field|table|database|schema|view|index)(es|s)?/i, /^\s*(set|describe|explain|pragma)\s/i].map(&:freeze).freeze
 
 
       def sql_master_matchers

diff --git a/spec/middleware_spec.rb b/spec/middleware_spec.rb
@@ -56,7 +56,7 @@
 
     status, headers, body = middleware.call(env)
 
-    expect(headers['Set-Cookie']).to eq("#{key}=#{Makara::Context.get_current}--200; path=/; max-age=5")
+    expect(headers['Set-Cookie']).to eq("#{key}=#{Makara::Context.get_current}--200; path=/; max-age=5; HttpOnly")
   end
 
   it 'should preserve the same context if the previous request was a redirect' do