Merge pull request #28 from purcell/pg_query-4

pg_query v4 support

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
-        ruby: [2.4, 2.5, 2.6, 2.7, '3.0', '3.1', '3.2']
+        ruby: ['2.7', '3.0', '3.1', '3.2']
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2

.ruby-version

@@ -1 +1 @@
-2.4.10
+2.7

Gemfile

@@ -1,7 +1,8 @@
+ruby ">= 2.7"
+
 source "https://rubygems.org"
 
-gem "pg_query", ">= 1.0", "< 3"
-gem "bundler", "2.3.20"
+gem "pg_query", ">= 1.0"
 
 group :development do
   gem "rspec"

Gemfile.lock

@@ -2,32 +2,31 @@ GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.5.0)
-    google-protobuf (3.21.12)
-    pg_query (2.2.0)
-      google-protobuf (>= 3.19.2)
-    rake (13.0.6)
+    google-protobuf (3.25.0)
+    pg_query (4.2.3)
+      google-protobuf (>= 3.22.3)
+    rake (13.1.0)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.1)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.1)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+    rspec-support (3.12.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (= 2.3.20)
-  pg_query (>= 1.0, < 3)
+  pg_query (>= 1.0)
   rake
   rspec
 
 BUNDLED WITH
-   2.3.20
+   2.4.2

flake.nix

@@ -24,7 +24,7 @@
       in
       {
         devShell = pkgs.mkShell {
-          buildInputs = [ pkgs.ruby pkgs.bundler env pkgs.bundix ];
+          buildInputs = [ pkgs.ruby env pkgs.bundix ];
         };
       }
     );

gemset.nix

@@ -14,31 +14,31 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1dcgkhjiaxha3yznyxxzm8a4n4jf61rk7kgbxy4sdkb865zbn2ab";
+      sha256 = "18d1w5j7vjaza3v1ig9j7zyis04kxqdkb1272vbgncxn03ck45mm";
       type = "gem";
     };
-    version = "3.21.12";
+    version = "3.25.0";
   };
   pg_query = {
     dependencies = ["google-protobuf"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0l79y41nwwacabj61jkbh4r7haajaf8y4bn5pihh0m1g8547b8w4";
+      sha256 = "15ynrzqsmmbmxib8ri8n9k6z3l6rwd91j7y1mghm33nfgdf9bj8w";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "4.2.3";
   };
   rake = {
     groups = ["development"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w";
+      sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy";
       type = "gem";
     };
-    version = "13.0.6";
+    version = "13.1.0";
   };
   rspec = {
     dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
@@ -57,41 +57,41 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ibb81slc35q5yp276sixp3yrvj9q92wlmi1glbnwlk6g49z8rn4";
+      sha256 = "0l95bnjxdabrn79hwdhn2q1n7mn26pj7y1w5660v5qi81x458nqm";
       type = "gem";
     };
-    version = "3.12.0";
+    version = "3.12.2";
   };
   rspec-expectations = {
     dependencies = ["diff-lcs" "rspec-support"];
     groups = ["default" "development"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "17kcw2lb68w62mbfqvs0361bbdibcrdj643wi7y3aiggygvjk2w0";
+      sha256 = "05j44jfqlv7j2rpxb5vqzf9hfv7w8ba46wwgxwcwd8p0wzi1hg89";
       type = "gem";
     };
-    version = "3.12.1";
+    version = "3.12.3";
   };
   rspec-mocks = {
     dependencies = ["diff-lcs" "rspec-support"];
     groups = ["default" "development"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "008q63p78bg23jlyabavq2vgl961857cqp3il71if50wgmf75pg0";
+      sha256 = "1gq7gviwpck7fhp4y5ibljljvxgjklza18j62qf6zkm2icaa8lfy";
       type = "gem";
     };
-    version = "3.12.1";
+    version = "3.12.6";
   };
   rspec-support = {
     groups = ["default" "development"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx";
+      sha256 = "1ky86j3ksi26ng9ybd7j0qsdf1lpr8mzrmn98yy9gzv801fvhsgr";
       type = "gem";
     };
-    version = "3.12.0";
+    version = "3.12.1";
   };
 }

sqlint.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.name = 'sqlint'
   s.version = SQLint::VERSION
   s.platform = Gem::Platform::RUBY
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.7'
   s.authors = ['Steve Purcell', 'Kieran Trezona-le Comte']
   s.description = <<-EOF
     Simple SQL linter.
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.8.23'
   s.summary = 'Simple SQL linter.'
 
-  s.add_runtime_dependency('pg_query', '~> 2')
+  s.add_runtime_dependency('pg_query', '>= 1')
   s.add_development_dependency('rake', '>= 12.3.3')
   s.add_development_dependency('rspec', '~> 3.2')
   s.add_development_dependency('bundler', '>= 2.2.33')