pg_query 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9d1df6666392e194e8ac7a87086cae2e3051644a
-  data.tar.gz: b524259660a3489556696cf0f4b75d0c5c3c91b7
+SHA256:
+  metadata.gz: 0db8e898d08ff3642a800ab296d7ac10dd9556e3c5a626f005bae86d35273372
+  data.tar.gz: a869a1faeb3ae0bed9d5031f2a4d26263843fde368bfeb096c1c9f48ea30c9f8
 SHA512:
-  metadata.gz: 61523601794ef69a4dad8e33ba3fc9b5f35f299dce42f3b924b8ccca8726d9a11266dbcbbb7c1fc6f92c98c3443a02092d006c2c9a1484a1a9b9e0875fa9b6e3
-  data.tar.gz: 476105d1b4a3337f9ef4266452858cb70d02278ad8b564320ad9d76169425f81f2e64fc9fff070fcc9739ce3589bde93e5ea000bf062c61a7190d5f4e38eacee
+  metadata.gz: e0f51970e5f268d9d9d32d791288db0d7a048c4880f706ff7d483b0efacd1a355600f5b8ca8a0b57b75a05cda8c7b207402bb6680fad0fdaeaf7809fab06c441
+  data.tar.gz: 6281530a32add88cd8a474a8e224e817723e288e850f9d9232aba69208b1178d89b7135d613d15800176bd611b3d6fcd0600fb48c3e8c880f6aa47f5296bae45

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 1.1.0     2018-10-04
+
+* Deparsing improvements by [@herwinw](https://github.com/herwinw)
+  * Add NULLS FIRST/LAST to ORDER BY [#95](https://github.com/lfittl/pg_query/pull/95)
+  * VACUUM [#97](https://github.com/lfittl/pg_query/pull/97)
+  * UPDATE with multiple columns [#99](https://github.com/lfittl/pg_query/pull/99)
+  * DISTINCT ON [#101](https://github.com/lfittl/pg_query/pull/101)
+  * CREATE TABLE AS [#102](https://github.com/lfittl/pg_query/pull/102)
+  * SQL value functions [#103](https://github.com/lfittl/pg_query/pull/103)
+  * LOCK [#105](https://github.com/lfittl/pg_query/pull/105)
+  * EXPLAIN [#107](https://github.com/lfittl/pg_query/pull/107)
+  * COPY [#108](https://github.com/lfittl/pg_query/pull/108)
+  * DO [#109](https://github.com/lfittl/pg_query/pull/109)
+* Ignore pg_query.so in git checkout [#110](https://github.com/lfittl/pg_query/pull/110) [@herwinw](https://github.com/herwinw)
+* Prefer __dir__ over File.dirname(__FILE__) [#110](https://github.com/lfittl/pg_query/pull/104) [@herwinw](https://github.com/herwinw)
+
+
 ## 1.0.2     2018-04-11
 
 * Deparsing improvements

data/Rakefile

@@ -17,7 +17,7 @@ task test: :spec
 task lint: :rubocop
 
 task :clean do
-  FileUtils.rm_rf File.join(File.dirname(__FILE__), 'tmp/')
-  FileUtils.rm_f Dir.glob(File.join(File.dirname(__FILE__), 'ext/pg_query/*.o'))
-  FileUtils.rm_f File.join(File.dirname(__FILE__), 'lib/pg_query/pg_query.bundle')
+  FileUtils.rm_rf File.join(__dir__, 'tmp/')
+  FileUtils.rm_f Dir.glob(File.join(__dir__, 'ext/pg_query/*.o'))
+  FileUtils.rm_f File.join(__dir__, 'lib/pg_query/pg_query.bundle')
 end

data/ext/pg_query/extconf.rb

@@ -7,7 +7,7 @@ LIB_PG_QUERY_TAG = '10-1.0.1'.freeze
 
 workdir = Dir.pwd
 libdir = File.join(workdir, 'libpg_query-' + LIB_PG_QUERY_TAG)
-gemdir = File.join(File.dirname(__FILE__), '../..')
+gemdir = File.join(__dir__, '../..')
 libfile = libdir + '/libpg_query.a'
 
 unless File.exist?("#{workdir}/libpg_query.tar.gz")
@@ -36,7 +36,7 @@ $LOCAL_LIBS << '-lpg_query'
 $LIBPATH << libdir
 $CFLAGS << " -I #{libdir} -O3 -Wall -fno-strict-aliasing -fwrapv -g"
 
-SYMFILE = File.join(File.dirname(__FILE__), 'pg_query_ruby.sym')
+SYMFILE = File.join(__dir__, 'pg_query_ruby.sym')
 if RUBY_PLATFORM =~ /darwin/
   $DLDFLAGS << " -Wl,-exported_symbols_list #{SYMFILE}" unless defined?(::Rubinius)
 else

data/lib/pg_query/deparse.rb

@@ -86,16 +86,24 @@ class PgQuery
         deparse_cte(node)
       when CONSTRAINT
         deparse_constraint(node)
+      when COPY_STMT
+        deparse_copy(node)
       when CREATE_FUNCTION_STMT
         deparse_create_function(node)
       when CREATE_STMT
         deparse_create_table(node)
+      when CREATE_TABLE_AS_STMT
+        deparse_create_table_as(node)
+      when INTO_CLAUSE
+        deparse_into_clause(node)
       when DEF_ELEM
         deparse_defelem(node)
       when DELETE_STMT
         deparse_delete_from(node)
       when DROP_STMT
         deparse_drop(node)
+      when EXPLAIN_STMT
+        deparse_explain(node)
       when FUNC_CALL
         deparse_funccall(node)
       when FUNCTION_PARAMETER
@@ -104,6 +112,8 @@ class PgQuery
         deparse_insert_into(node)
       when JOIN_EXPR
         deparse_joinexpr(node)
+      when LOCK_STMT
+        deparse_lock(node)
       when LOCKING_CLAUSE
         deparse_lockingclause(node)
       when NULL_TEST
@@ -126,6 +136,8 @@ class PgQuery
         deparse_row(node)
       when SELECT_STMT
         deparse_select(node)
+      when SQL_VALUE_FUNCTION
+        deparse_sql_value_function(node)
       when SORT_BY
         deparse_sortby(node)
       when SUB_LINK
@@ -148,6 +160,10 @@ class PgQuery
         deparse_viewstmt(node)
       when VARIABLE_SET_STMT
         deparse_variable_set_stmt(node)
+      when VACUUM_STMT
+        deparse_vacuum_stmt(node)
+      when DO_STMT
+        deparse_do_stmt(node)
       when STRING
         if context == A_CONST
           format("'%s'", node['str'].gsub("'", "''"))
@@ -458,6 +474,14 @@ class PgQuery
       output.join(' ')
     end
 
+    def deparse_lock(node)
+      output = []
+      output << 'LOCK TABLE'
+      tables = node['relations'].map { |table| deparse_item(table) }
+      output << tables.join(', ')
+      output.join(' ')
+    end
+
     LOCK_CLAUSE_STRENGTH = {
       LCS_FORKEYSHARE => 'FOR KEY SHARE',
       LCS_FORSHARE => 'FOR SHARE',
@@ -481,6 +505,8 @@ class PgQuery
       output << deparse_item(node['node'])
       output << 'ASC' if node['sortby_dir'] == 1
       output << 'DESC' if node['sortby_dir'] == 2
+      output << 'NULLS FIRST' if node['sortby_nulls'] == 1
+      output << 'NULLS LAST' if node['sortby_nulls'] == 2
       output.join(' ')
     end
 
@@ -527,6 +553,35 @@ class PgQuery
       output.join(' ')
     end
 
+    def deparse_vacuum_stmt(node)
+      output = []
+      output << 'VACUUM'
+      output.concat(deparse_vacuum_options(node))
+      output << deparse_item(node['relation']) if node.key?('relation')
+      if node.key?('va_cols')
+        output << "(#{node['va_cols'].map(&method(:deparse_item)).join(', ')})"
+      end
+      output.join(' ')
+    end
+
+    def deparse_vacuum_options(node)
+      output = []
+      output << 'FULL' if node['options'][4] == 1
+      output << 'FREEZE' if node['options'][3] == 1
+      output << 'VERBOSE' if node['options'][2] == 1
+      output << 'ANALYZE' if node['options'][1] == 1
+      output
+    end
+
+    def deparse_do_stmt(node)
+      output = []
+      output << 'DO'
+      statement, *rest = node['args']
+      output << "$$#{statement['DefElem']['arg']['String']['str']}$$"
+      output += rest.map { |item| deparse_item(item) }
+      output.join(' ')
+    end
+
     def deparse_cte(node)
       output = []
       output << node['ctename']
@@ -601,6 +656,21 @@ class PgQuery
       output.join(' ')
     end
 
+    def deparse_copy(node)
+      output = ['COPY']
+      output << deparse_item(node['relation'])
+      columns = node.fetch('attlist', []).map { |column| deparse_item(column) }
+      output << "(#{columns.join(', ')})" unless columns.empty?
+      output << (node['is_from'] ? 'FROM' : 'TO')
+      output << 'PROGRAM' if node['is_program']
+      output << if node.key?('filename')
+                  "'#{node['filename']}'"
+                else
+                  node['is_from'] ? 'STDIN' : 'STDOUT'
+                end
+      output.join(' ')
+    end
+
     def deparse_create_function(node)
       output = []
       output << 'CREATE'
@@ -645,6 +715,19 @@ class PgQuery
       output.join(' ')
     end
 
+    def deparse_create_table_as(node)
+      output = []
+      output << 'CREATE TEMPORARY TABLE'
+      output << deparse_item(node['into'])
+      output << 'AS'
+      output << deparse_item(node['query'])
+      output.join(' ')
+    end
+
+    def deparse_into_clause(node)
+      deparse_item(node['rel'])
+    end
+
     def deparse_when(node)
       output = ['WHEN']
       output << deparse_item(node['expr'])
@@ -691,7 +774,13 @@ class PgQuery
 
       if node[TARGET_LIST_FIELD]
         output << 'SELECT'
-        output << 'DISTINCT' if node['distinctClause']
+        if node['distinctClause']
+          output << 'DISTINCT'
+          unless node['distinctClause'].compact.empty?
+            columns = node['distinctClause'].map { |item| deparse_item(item, :select) }
+            output << "ON (#{columns.join(', ')})"
+          end
+        end
         output << node[TARGET_LIST_FIELD].map do |item|
           deparse_item(item, :select)
         end.join(', ')
@@ -754,6 +843,30 @@ class PgQuery
       output.join(' ')
     end
 
+    def deparse_sql_value_function(node)
+      output = []
+      lookup = [
+        'current_date',
+        'current_time',
+        'current_time', # with precision
+        'current_timestamp',
+        'current_timestamp', # with precision
+        'localtime',
+        'localtime', # with precision
+        'localtimestamp',
+        'localtimestamp', # with precision
+        'current_role',
+        'current_user',
+        'session_user',
+        'user',
+        'current_catalog',
+        'current_schema'
+      ]
+      output << lookup[node['op']]
+      output << "(#{node['typmod']})" unless node.fetch('typmod', -1) == -1
+      output.join('')
+    end
+
     def deparse_insert_into(node)
       output = []
       output << deparse_item(node['withClause']) if node['withClause']
@@ -781,9 +894,10 @@ class PgQuery
 
       if node[TARGET_LIST_FIELD]
         output << 'SET'
-        node[TARGET_LIST_FIELD].each do |item|
-          output << deparse_item(item, :update)
+        columns = node[TARGET_LIST_FIELD].map do |item|
+          deparse_item(item, :update)
         end
+        output << columns.join(', ')
       end
 
       if node['whereClause']
@@ -984,6 +1098,18 @@ class PgQuery
       output.join(' ')
     end
 
+    def deparse_explain(node)
+      output = ['EXPLAIN']
+      options = node.fetch('options', []).map { |option| option['DefElem']['defname'].upcase }
+      if options.size == 1
+        output.concat(options)
+      elsif options.size > 1
+        output << "(#{options.join(', ')})"
+      end
+      output << deparse_item(node['query'])
+      output.join(' ')
+    end
+
     # The PG parser adds several pieces of view data onto the RANGEVAR
     # that need to be printed before deparse_rangevar is called.
     def relpersistence(rangevar)

data/lib/pg_query/node_types.rb

@@ -34,6 +34,7 @@ class PgQuery
   DECLARE_CURSOR_STMT = 'DeclareCursorStmt'.freeze
   DEF_ELEM = 'DefElem'.freeze
   DELETE_STMT = 'DeleteStmt'.freeze
+  DO_STMT = 'DoStmt'.freeze
   DROP_STMT = 'DropStmt'.freeze
   EXECUTE_STMT = 'ExecuteStmt'.freeze
   EXPLAIN_STMT = 'ExplainStmt'.freeze
@@ -70,6 +71,7 @@ class PgQuery
   SELECT_STMT = 'SelectStmt'.freeze
   SET_TO_DEFAULT = 'SetToDefault'.freeze
   SORT_BY = 'SortBy'.freeze
+  SQL_VALUE_FUNCTION = 'SQLValueFunction'.freeze
   STRING = 'String'.freeze
   SUB_LINK = 'SubLink'.freeze
   TRANSACTION_STMT = 'TransactionStmt'.freeze

data/lib/pg_query/version.rb

@@ -1,3 +1,3 @@
 class PgQuery
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_query
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Lukas Fittl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2018-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: PostgreSQL query parsing and normalization library