sql_matchers 1.0.0.pre.rc.2 → 1.0.0.pre.rc.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea820ab15f14da9e85e40d721cc0744edfabf5cf6b42dfbc89eebf714acbf74c
-  data.tar.gz: 60d94b0722065797839159faf66e985f0f3b85c1f317858a9b04a9b52e82f0e3
+  metadata.gz: e0cde4f12d9a94e037920bb6549a52e2ae29f14bcb8eea6efa1ea64dc927b777
+  data.tar.gz: cf5b0efb6152a3ad11783ee44cc38083468b9e67b001e3eb8b78ced87a985a06
 SHA512:
-  metadata.gz: '092790d059e6d1c066acd87b8c3a23b8bf59eb2677a8abf8bc554e754e358ff37440722a4625fbed7f1bd08518603756050e193a849dfb775653386109cb8576'
-  data.tar.gz: e1788fe82defea276dac318dd158afd96ba9a5551f79d2628428c5a26778868c95a80b5754db43a3e0fe2bfb536e91ed739f9f8d7db18c5effb279df134d0b61
+  metadata.gz: 0f310b5513d1bef5ac0259b5d951e397dab137f27407e7ce515fdb82a4cf76177b5fe4e5507150b6a6c6dd37d313a8e43ced4a45cbf04cd366c58673962d2559
+  data.tar.gz: 2bb8fd1381957561cf6b8cfe91df600053c2e5589b969e154b4061c3e8cb96694f66b46cc7a37e58e755ea268e90646149dd9a73d7f02ca11b852edf8c513e01

data/lib/sql_matchers/matchers/sql.rb

@@ -2,16 +2,17 @@
 
 require 'anbt-sql-formatter/formatter'
 
+require_relative '../normalizers/sql'
+
 module SqlMatchers
   module Matchers
     class Sql
-      QUOTED_IDENT_RE = /[`"](\w+)[`"]/
-
       attr_reader :actual, :expected
 
       def initialize(expected)
-        @expected  = expected
-        @formatter = AnbtSql::Formatter.new(
+        @expected   = expected
+        @normalizer = Normalizers::Sql.new
+        @formatter  = AnbtSql::Formatter.new(
           AnbtSql::Rule.new.tap do |r|
             r.keyword         = AnbtSql::Rule::KEYWORD_UPPER_CASE
             r.function_names += %w[count sum substr date]
@@ -22,11 +23,8 @@ module SqlMatchers
 
       def diffable? = true
       def matches?(actual)
-        @expected = formatter.format(+expected.to_s.strip)
-                             .gsub(QUOTED_IDENT_RE, '\1')
-
-        @actual = formatter.format(+actual.to_s.strip)
-                           .gsub(QUOTED_IDENT_RE, '\1')
+        @expected = formatter.format(normalizer.normalize(expected.to_s.strip))
+        @actual   = formatter.format(normalizer.normalize(actual.to_s.strip))
 
         @actual == @expected
       end
@@ -43,7 +41,7 @@ module SqlMatchers
 
       private
 
-      attr_reader :formatter
+      attr_reader :formatter, :normalizer
     end
   end
 end

data/lib/sql_matchers/normalizers/sql.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'anbt-sql-formatter/formatter'
+
+module SqlMatchers
+  module Normalizers
+    class Sql
+      QUOTED_IDENT_RE = /[`"](\w+)[`"]/
+      SELECT_STAR_RE  = /[`"]?(\w+)[`"]?\s{,1}\*/
+
+      def normalize(sql) = +sql.gsub(SELECT_STAR_RE, '\1.*')
+                               .gsub(QUOTED_IDENT_RE, '\1')
+    end
+  end
+end

data/lib/sql_matchers/normalizers.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require_relative 'normalizers/sql'
+
+module SqlMatchers
+  module Normalizers; end
+end

data/lib/sql_matchers/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SqlMatchers
-  VERSION = '1.0.0-rc.2'
+  VERSION = '1.0.0-rc.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sql_matchers
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.rc.2
+  version: 1.0.0.pre.rc.3
 platform: ruby
 authors:
 - Zeke Gabrielse
@@ -85,6 +85,8 @@ files:
 - lib/sql_matchers/matchers/query.rb
 - lib/sql_matchers/matchers/sql.rb
 - lib/sql_matchers/methods.rb
+- lib/sql_matchers/normalizers.rb
+- lib/sql_matchers/normalizers/sql.rb
 - lib/sql_matchers/version.rb
 homepage: https://github.com/keygen-sh/sql_matchers
 licenses: