pg_query 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 2c434b8e00b40d06b104aae879be0538073ea63e
-  data.tar.gz: 23f8b4c1bd7948b7686fa413aab4aad053bd0516
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZmUwNmJlMDhkZjA5MjVmYTIyMDIzNTk1NzUwNjdiMWM4YjllNzc1OQ==
+  data.tar.gz: !binary |-
+    ZGM4M2RmYTcxZDVhMjYwZDgwOTgwZjAwZGYzOWU3MTRkODYzMzBlNQ==
 SHA512:
-  metadata.gz: 0ce5919e1e9d0908b0605e59dce2835c8d4f8b8083d174ffe0dc9e9fed33ec8d3abbde68440e924e8a69429a5657b256d17b087f4fb51c8b3815601a067e9c3c
-  data.tar.gz: 9a0c19be11e104e7bb3f6bde9c64adb234ac19979ed031506081f199a1f5a6ff67a3026ee26a13a19dd6775b0d5d9e72a1618ce132594616ed4da79c786b7b5b
+  metadata.gz: !binary |-
+    ZDM2Nzg2MzVhNDEwMDkwOTg1ZDQ4YjdlMThhZmI4YTc4N2Y4YzMwOTViODA4
+    NmQ4MmZiN2Y2OTcyOWVjN2UzNTJkOWI1MDcxZTliMDBjYWZkNTExNmJhZWM0
+    ZTcxMzEzMjk3N2Y3MmY4NTkzZTFjMTdlOGUzNjA2YWI2ZjFiOGU=
+  data.tar.gz: !binary |-
+    ZjBkNTEwY2U3NDIwNjlmZmQzNjQ4YzRmOGJjMDJjNjExYTE5ZTAxYWMxN2Y1
+    NGYyMzQ0M2YwOWVlZjJhNzVmMWE3ZTcwMjliYTQ2OGRiMmVlOTVjM2JlNWYx
+    YTgzYTQwOTk2YTE0NWMyNDA1ZDIxZmJmNGMzZTdlYjkyNGMyODM=

data/ext/pg_query/extconf.rb

@@ -30,6 +30,9 @@ $objs << File.join(File.dirname(__FILE__), "pg_query.o")
 
 $CFLAGS << " -I #{pgdir}/src/include"
 
+# Similar to those used by PostgreSQL
+$CFLAGS << " -O2 -Wall -Wmissing-prototypes -Wpointer-arith -Wdeclaration-after-statement -Wendif-labels -Wmissing-format-attribute -Wformat-security -fno-strict-aliasing -fwrapv"
+
 SYMFILE = File.join(File.dirname(__FILE__), "pg_query.sym")
 if RUBY_PLATFORM =~ /darwin/
   $DLDFLAGS << "-Wl,-exported_symbols_list #{SYMFILE}" unless defined?(::Rubinius)
@@ -37,4 +40,4 @@ else
   $DLDFLAGS << "-Wl,--retain-symbols-file=#{SYMFILE}"
 end
 
-create_makefile 'pg_query/pg_query'
+create_makefile 'pg_query/pg_query'

data/ext/pg_query/pg_query.c

@@ -14,6 +14,8 @@
 
 const char* progname = "pg_query";
 
+void Init_pg_query(void);
+
 static VALUE new_parse_error(ErrorData* error)
 {
 	VALUE cPgQuery, cParseError;
@@ -29,6 +31,7 @@ static VALUE new_parse_error(ErrorData* error)
 }
 
 #define STDERR_BUFFER_LEN 4096
+//#define DEBUG
 
 static VALUE pg_query_raw_parse(VALUE self, VALUE input)
 {
@@ -38,8 +41,10 @@ static VALUE pg_query_raw_parse(VALUE self, VALUE input)
 	VALUE result = Qnil;
 	VALUE error = Qnil;
 	char stderr_buffer[STDERR_BUFFER_LEN + 1] = {0};
+#ifndef DEBUG
 	int stderr_global;
 	int stderr_pipe[2];
+#endif
 
 	ctx = AllocSetContextCreate(TopMemoryContext,
 								"pg_query_raw_parse",
@@ -48,6 +53,7 @@ static VALUE pg_query_raw_parse(VALUE self, VALUE input)
 								ALLOCSET_DEFAULT_MAXSIZE);
 	MemoryContextSwitchTo(ctx);
 	
+#ifndef DEBUG
 	// Setup pipe for stderr redirection
 	if (pipe(stderr_pipe) != 0)
 		rb_raise(rb_eIOError, "Failed to open pipe, too many open file descriptors");
@@ -58,6 +64,7 @@ static VALUE pg_query_raw_parse(VALUE self, VALUE input)
 	stderr_global = dup(STDERR_FILENO);
 	dup2(stderr_pipe[1], STDERR_FILENO);
 	close(stderr_pipe[1]);
+#endif
 	
 	// Parse it!
 	PG_TRY();
@@ -70,9 +77,11 @@ static VALUE pg_query_raw_parse(VALUE self, VALUE input)
 		
 		str = nodeToJSONString(tree);
 	
+#ifndef DEBUG
 		// Save stderr for result
 		read(stderr_pipe[0], stderr_buffer, STDERR_BUFFER_LEN);
-	
+#endif
+
 		result = rb_ary_new();
 		rb_ary_push(result, rb_str_new2(str));
 		rb_ary_push(result, rb_str_new2(stderr_buffer));
@@ -87,10 +96,14 @@ static VALUE pg_query_raw_parse(VALUE self, VALUE input)
 	}
 	PG_END_TRY();
 	
-	// Restore stderr, close pipe & return to previous PostgreSQL memory context
+#ifndef DEBUG
+	// Restore stderr, close pipe
 	dup2(stderr_global, STDERR_FILENO);
 	close(stderr_pipe[0]);
 	close(stderr_global);
+#endif
+
+	// Return to previous PostgreSQL memory context
 	MemoryContextSwitchTo(TopMemoryContext);
 	MemoryContextDelete(ctx);
 	
@@ -347,7 +360,7 @@ generate_normalized_query(pgssConstLocations *jstate, const char *query,
 	return norm_query;
 }
 
-bool const_record_walker(Node *node, pgssConstLocations *jstate)
+static bool const_record_walker(Node *node, pgssConstLocations *jstate)
 {
 	bool result;
 	

data/lib/pg_query/parse.rb

@@ -27,26 +27,26 @@ class PgQuery
     @parsetree = parsetree
     @warnings = warnings
   end
-  
+
   def tables
     load_tables_and_aliases! if @tables.nil?
     @tables
   end
-  
+
   def aliases
     load_tables_and_aliases! if @aliases.nil?
     @aliases
   end
-  
+
 protected
   def load_tables_and_aliases!
     @tables = []
     @aliases = {}
-  
+
     statements = @parsetree.dup
     from_clause_items = []
     where_clause_items = []
-  
+
     loop do
       if statement = statements.shift
         case statement.keys[0]
@@ -63,22 +63,39 @@ protected
             statements << statement["SELECT"]["larg"] if statement["SELECT"]["larg"]
             statements << statement["SELECT"]["rarg"] if statement["SELECT"]["rarg"]
           end
-        when "INSERT INTO", "UPDATE", "DELETE FROM", "VACUUM", "COPY", "ALTER TABLE"
+        when "INSERT INTO", "UPDATE", "DELETE FROM", "VACUUM", "COPY", "ALTER TABLE", "CREATESTMT", "INDEXSTMT", "RULESTMT", "CREATETRIGSTMT"
           from_clause_items << statement.values[0]["relation"]
-        when "EXPLAIN"
-          statements << statement["EXPLAIN"]["query"]
+        when "EXPLAIN", "VIEWSTMT"
+          statements << statement.values[0]["query"]
         when "CREATE TABLE AS"
           from_clause_items << statement["CREATE TABLE AS"]["into"]["INTOCLAUSE"]["rel"] rescue nil
-        when "LOCK"
-          from_clause_items += statement["LOCK"]["relations"]
+        when "LOCK", "TRUNCATE"
+          from_clause_items += statement.values[0]["relations"]
+        when "GRANTSTMT"
+          objects = statement["GRANTSTMT"]["objects"]
+          case statement["GRANTSTMT"]["objtype"]
+          when 0 # Column
+            # FIXME
+          when 1 # Table
+            from_clause_items += objects
+          when 2 # Sequence
+            # FIXME
+          end
         when "DROP"
-          object_type = statement["DROP"]["removeType"]
-          @tables += statement["DROP"]["objects"].map {|r| r.join('.') } if object_type == 26 # Table
+          objects = statement["DROP"]["objects"]
+          case statement["DROP"]["removeType"]
+          when 26 # Table
+            @tables += objects.map {|r| r.join('.') }
+          when 23 # Rule
+            @tables += objects.map {|r| r[0..-2].join('.') }
+          when 28 # Trigger
+            @tables += objects.map {|r| r[0..-2].join('.') }
+          end
         end
-    
+
         where_clause_items << statement.values[0]["whereClause"] if !statement.empty? && statement.values[0]["whereClause"]
       end
-    
+
       # Find subselects in WHERE clause
       if next_item = where_clause_items.shift
         case next_item.keys[0]
@@ -95,13 +112,13 @@ protected
           statements << next_item["SUBLINK"]["subselect"]
         end
       end
-    
+
       break if where_clause_items.empty? && statements.empty?
     end
-  
+
     loop do
       break unless next_item = from_clause_items.shift
-    
+
       case next_item.keys[0]
       when "JOINEXPR"
         ["larg", "rarg"].each do |side|
@@ -116,7 +133,7 @@ protected
         @aliases[rangevar["alias"]["ALIAS"]["aliasname"]] = table if rangevar["alias"]
       end
     end
-  
+
     @tables.uniq!
   end
-end
+end

data/lib/pg_query/version.rb

@@ -1,3 +1,3 @@
 class PgQuery
-  VERSION = '0.2.9'
-end
+  VERSION = '0.3.0'
+end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: pg_query
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Lukas Fittl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
 description: Parses SQL queries using a copy of the PostgreSQL server query parser
@@ -78,12 +78,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []