query_matchers 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f78d721c38dc71a9253a97fcfa30a776b3b5b721
-  data.tar.gz: 92641ed402a948cea988adcc6bbdfe5a28c6ea13
+  metadata.gz: 4e9b67001d03e3aba3c3f24e3e9042c1791694cf
+  data.tar.gz: 9eec49081038cc104babaf0b6ffc7e8986c297ec
 SHA512:
-  metadata.gz: 8225933bccc86b9dda7dd7d6ca23222b87be5867e9b683a7e9134992c19744d63155cbddb6128ae959684850a915bd701ca3a9b4b3115aa49d8353a15330cabf
-  data.tar.gz: 31c22139aaeaa65f0849652049548333980b638ee2c86a7b327ddc7e1201c838d43888b92808db8290f984634e38dad364e0c8fd8c0486768c4da4b07aea5d94
+  metadata.gz: 47a67e26e09c7e7b29a605f6f673085d7485c903435b0e5c52caad99da80311900af702bf040468a4631e77223d292674d254f4be467fa3782494d4a3e5fbc6d
+  data.tar.gz: d89c17cab0bcadfbae09c7d6c844a79b15ae8e73d0ad3715ebe67d5cd624058e8449e1f9260e3998f7ce019a7bd1ca31a01f974d8203abd805eebb484d04db72

data/lib/query_matchers/query_counter.rb

@@ -1,6 +1,7 @@
 module QueryMatchers
   class QueryCounter
     OPERATIONS = %w(SELECT INSERT UPDATE DELETE)
+    RAILS5_INFORMATION_SCHEMA_REGEX = /^\s*SELECT.+FROM information_schema\./m
 
     def initialize
       @events = []
@@ -28,7 +29,11 @@ module QueryMatchers
     end
 
     def count_query?(sql)
-      OPERATIONS.any? {|op| sql.start_with?(op) }
+      OPERATIONS.any? {|op| sql.lstrip.start_with?(op) } && !ignore_query?(sql)
+    end
+
+    def ignore_query?(sql)
+      sql.match?(RAILS5_INFORMATION_SCHEMA_REGEX)
     end
   end
 end

data/lib/query_matchers/version.rb

@@ -1,3 +1,3 @@
 module QueryMatchers
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/query_counter_spec.rb

@@ -42,12 +42,31 @@ describe QueryMatchers::QueryCounter do
     expect(counter.query_count).to eq(1)
   end
 
+  it "counts queries with a bit of whitespace" do
+    counter.execute!(sql_target("  SELECT FROM inventory"))
+
+    expect(counter.query_count).to eq(1)
+  end
+
   it "doesn't count any other type of query" do
     counter.execute!(sql_target("BREAKDANCE"))
 
     expect(counter.query_count).to eq(0)
   end
 
+  it "ignores Rails 5's schema queries" do
+    counter.execute!(sql_target(<<-SQL))
+      SELECT column_name
+        FROM information_schema.key_column_usage
+       WHERE constraint_name = 'PRIMARY'
+         AND table_schema = DATABASE()
+         AND table_name = 'jokes'
+       ORDER BY ordinal_position
+    SQL
+
+    expect(counter.query_count).to eq(0)
+  end
+
   def sql_target(sql)
     proc { perform_sql(sql) }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: query_matchers
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Daniel Schierbeck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Match the number of queries performed in any block of code