pg_query_pg_ddm 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9783bc0c3d779e2a2b262d2d9f28d78445e47f926766a83c8a6956c74fe2002a
-  data.tar.gz: 568336bc9f418ab16023c636cc1bee2660a9a74b65659f801f97915d9da215dc
+  metadata.gz: 9b5b6ecf3017b7a20ab2e560e092ac24860d3be847df753556c784fdb63106a4
+  data.tar.gz: 488e1d7c21031689b9db0b266ba24395d91fbddb0c65783728243d0231bbd82b
 SHA512:
-  metadata.gz: 515131344ad73fb9a0281534b78a5ed18388de64ec15162ac740b1d966f143530456e9058593339af46ee071413fe4b4d73e4bf22125099356d17b36bc402196
-  data.tar.gz: ed62da64c5ae51ad2d58dd973a24e50bd6f54e4ebe89cea40858de6ac8338070734009ec9bad413e89abc4a0d493f3fded22759f04182f802730a2eda7c2921d
+  metadata.gz: 900b3da4a2ce5066f4f851c7e6f0bb4f317f7d90ae44aeb2d4a16440c6afd5741c5e1e98ecaf6e6d389088533ccdb0be09045299905a4e3ee1d2bbc894c6b09a
+  data.tar.gz: 951806619168d1f76b3b3d8d0dc65e4c90a4e86f2f979b4a9657de185ea351abe8b81c3bf1eb7f7eab31744f8843a536589ab2076eae331961503449c68a58a5

data/README.md

@@ -151,11 +151,15 @@ to support parsing normalized queries containing `?` replacement characters.
 
 Currently tested and officially supported Ruby versions:
 
-* MRI 2.1
-* MRI 2.2
-* MRI 2.3
-* MRI 2.4
+* CRuby 2.5
+* CRuby 2.6
+* CRuby 2.7
+* CRuby 3.0
 
+Not supported:
+
+* JRuby: `pg_query` relies on a C extension, which is discouraged / not properly supported for JRuby
+* TruffleRuby: GraalVM [does not support sigjmp](https://www.graalvm.org/reference-manual/llvm/NativeExecution/), which is used by the Postgres error handling code (`pg_query` uses a copy of the Postgres parser & error handling code)
 
 ## Resources
 

data/ext/pg_query/extconf.rb

@@ -1,5 +1,6 @@
 # rubocop:disable Style/GlobalVars
 
+require 'digest'
 require 'mkmf'
 require 'open-uri'
 
@@ -10,21 +11,30 @@ libdir = File.join(workdir, 'libpg_query-' + LIB_PG_QUERY_TAG)
 gemdir = File.join(__dir__, '../..')
 libfile = libdir + '/libpg_query.a'
 
-unless File.exist?("#{workdir}/libpg_query.tar.gz")
-  File.open("#{workdir}/libpg_query.tar.gz", 'wb') do |target_file|
-    open('https://codeload.github.com/lfittl/libpg_query/tar.gz/' + LIB_PG_QUERY_TAG, 'rb') do |read_file|
+expected_sha256 = '1332761f31c198cb9825e6ccccda0b6a0e57daeb824870e8524df77f1592d149'
+filename = "#{workdir}/libpg_query.tar.gz"
+
+unless File.exist?(filename)
+  File.open(filename, 'wb') do |target_file|
+    URI.open('https://codeload.github.com/lfittl/libpg_query/tar.gz/' + LIB_PG_QUERY_TAG, 'rb') do |read_file|
       target_file.write(read_file.read)
     end
   end
+
+  checksum = Digest::SHA256.hexdigest(File.read(filename))
+
+  if checksum != expected_sha256
+    raise "SHA256 of #{filename} does not match: got #{checksum}, expected #{expected_sha256}"
+  end
 end
 
 unless Dir.exist?(libdir)
-  system("tar -xzf #{workdir}/libpg_query.tar.gz") || raise('ERROR')
+  system("tar -xzf #{filename}") || raise('ERROR')
 end
 
 unless Dir.exist?(libfile)
   # Build libpg_query (and parts of PostgreSQL)
-  system("cd #{libdir}; #{ENV['MAKE'] || (RUBY_PLATFORM =~ /bsd/ ? 'gmake' : 'make')} build")
+  system(format("cd %s; %s build", libdir, ENV['MAKE'] || (RUBY_PLATFORM =~ /bsd/ ? 'gmake' : 'make')))
 end
 
 # Copy test files (this intentionally overwrites existing files!)

data/lib/pg_query/deparse.rb

@@ -314,7 +314,7 @@ class PgQuery
       if node['indirection']
         array_indirection = node['indirection'].select { |a| a.key?(A_INDICES) }
       end
-      output << if node['arg'].key?(FUNC_CALL) || node['arg'].key?(A_EXPR) || (node['arg'].key?(SUB_LINK) && array_indirection.count.zero?)
+      output << if node['arg'].key?(FUNC_CALL) || node['arg'].key?(COLUMN_REF) || node['arg'].key?(A_EXPR) || (node['arg'].key?(SUB_LINK) && array_indirection.count.zero?)
                   "(#{arg})."
                 else
                   arg
@@ -417,9 +417,11 @@ class PgQuery
       # COUNT(*)
       args << '*' if node['agg_star']
 
-      name = (node['funcname'].map { |n| deparse_item(n, FUNC_CALL) } - ['pg_catalog']).join('.')
-      if name == 'overlay'
-        output << format('%s(%s placing %s from %s for %s)', name, args[0], args[1], args[2], args[3])
+      name = (node['funcname'].map { |n| deparse_item(n, FUNC_CALL) }).join('.')
+      if name == 'pg_catalog.overlay'
+        # Note that this is a bit odd, but "OVERLAY" is a keyword on its own merit, and only accepts the
+        # keyword parameter style when its called as a keyword, not as a regular function (i.e. pg_catalog.overlay)
+        output << format('OVERLAY(%s PLACING %s FROM %s FOR %s)', args[0], args[1], args[2], args[3])
       else
         distinct = node['agg_distinct'] ? 'DISTINCT ' : ''
         output << format('%s(%s%s)', name, distinct, args.join(', '))
@@ -1223,7 +1225,7 @@ class PgQuery
       output << deparse_item(node['selectStmt'])
 
       if node['onConflictClause']
-        output << deparse_insert_onconflict(node['onConflictClause']['OnConflictClause'])
+        output << deparse_insert_onconflict(node['onConflictClause'][ON_CONFLICT_CLAUSE])
       end
 
       if node['returningList']
@@ -1308,10 +1310,30 @@ class PgQuery
       output.join(' ')
     end
 
-    def deparse_typecast(node) # rubocop:disable Metrics/CyclomaticComplexity
-      if deparse_item(node['typeName']) == 'boolean' || deparse_item(node['typeName']) == 'bool'
-        return 'true' if deparse_item(node['arg']) == "'t'" || deparse_item(node['arg']) == 'true'
-        return 'false' if deparse_item(node['arg']) == "'f'" || deparse_item(node['arg']) == 'false'
+    # Builds a properly-qualified reference to a built-in Postgres type.
+    #
+    # Inspired by SystemTypeName in Postgres' gram.y, but without node name
+    # and locations, to simplify comparison.
+    def make_system_type_name(name)
+      {
+        'names' => [
+          { 'String' => { 'str' => 'pg_catalog' } },
+          { 'String' => { 'str' => name } }
+        ],
+        'typemod' => -1
+      }
+    end
+
+    def make_string(str)
+      { 'String' => { 'str' => str } }
+    end
+
+    def deparse_typecast(node)
+      # Handle "bool" or "false" in the statement, which is represented as a typecast
+      # (other boolean casts should be represented as a cast, i.e. don't need special handling)
+      if node['arg'][A_CONST] && node['typeName'][TYPE_NAME].slice('names', 'typemod') == make_system_type_name('bool')
+        return 'true' if node['arg'][A_CONST]['val'] == make_string('t')
+        return 'false' if node['arg'][A_CONST]['val'] == make_string('f')
       end
 
       context = true if node['arg']['A_Expr']

data/lib/pg_query/node_types.rb

@@ -68,6 +68,7 @@ class PgQuery
   NULL_TEST = 'NullTest'.freeze
   OBJECT_WITH_ARGS = 'ObjectWithArgs'.freeze
   OID_LIST = 'OidList'.freeze
+  ON_CONFLICT_CLAUSE = 'OnConflictClause'.freeze
   PARAM_REF = 'ParamRef'.freeze
   PREPARE_STMT = 'PrepareStmt'.freeze
   RANGE_FUNCTION = 'RangeFunction'.freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_query_pg_ddm
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Mehmet Emin KARAKAŞ
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2021-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -126,8 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: PostgreSQL query parsing and normalization library