Fix ruby 3.4 compatibility

pganalyze · Dec 20, 2024 · b973a95 · b973a95
1 parent 91bb771
commit b973a95
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,11 +8,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['2.7', '3.0', '3.1', '3.2', '3.3'] # 3.4+ is not yet supported by google-protobuf
+        ruby:
+          - '2.7'
+          - '3.0'
+          - '3.1'
+          - '3.2'
+          - '3.3'
+          # Note: 3.4+ is not yet supported by google-protobuf
+          - '3.4.0-rc1'
         os: ['ubuntu-latest', 'windows-latest']
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
@@ -21,4 +28,4 @@ jobs:
       run: bundle exec rake test
     - name: RuboCop
       run: bundle exec rake lint
-      if: matrix.ruby != '3.1' && matrix.ruby != '3.2' && matrix.ruby != '3.3'
+      if: matrix.ruby != '3.1' && matrix.ruby != '3.2' && matrix.ruby != '3.3' && matrix.ruby != '3.4.0-rc1'
diff --git a/lib/pg_query.rb b/lib/pg_query.rb
@@ -4,7 +4,7 @@
 require 'pg_query/pg_query_pb'
 require 'pg_query/node'
 
-require 'pg_query/pg_query'
+require 'pg_query/pg_query' unless RUBY_VERSION >= '3.4.0'
 require 'pg_query/constants'
 require 'pg_query/parse'
 require 'pg_query/treewalker'