pg_query 0.2.0 → 0.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Zjc4NWU4NWY5MzMzNjYxMTA4NzU0ZDg2OWQ2OGQ4ZTQwZDBlMTRhYw==
+    ZDNiOTIxMTliNzI0NmUzMjU2ZjYzNTcwZDI2ZDE0NzE1MzY5ZWIxMA==
   data.tar.gz: !binary |-
-    YzEzNzc3YjlkNzcxNTUxOGEwOGYyZjdjMWM5YzE4Y2EwY2QwODc0NA==
+    NzQxMTg0YWNkZWJjZTQ1NTQyMThjZGRhN2JhY2ZlZmEwMmQyNzAyMg==
 SHA512:
   metadata.gz: !binary |-
-    ZmFkNDYwYjk1OGU1MGYzNjdkZDJjNzRmOGFjNWVkYzMxNTBlNjk1ZTI2YjQ3
-    OTQxNTYxZTZkNzZhYjEyNzczMDYwMGFlMjdlNmRmNGNlZmU1MGFjMjg5MjU5
-    ZGI5OGFlYWUzYjZhNGQ3MDFmMjQ5NzdjMGM1OGJlNWNiYTI5OGQ=
+    ODc0N2Q4ZmE0ZmJjZjJkYzRiZmVmMjg0MGJiOTA4NDNiODg5Zjc4M2Q3YThh
+    NmM2Zjk5ZDViMzk1ZjJlZTM4ZDE5NTlkN2NlNGJhYTM3ODA1YzQ0NTE2ZDll
+    OTIzMjc2OWE3ZGIyMDAzMWRlNjE1NDdkYzQ0YjYxZjgyNjcyN2I=
   data.tar.gz: !binary |-
-    MDY3N2U2NGUzNzg2ZjRjMTdmMzhkMDBmYjY4ODBjM2MxMGFhZGYwM2UzMzAx
-    OTFkMzIxMDExODM0MjhhZGY5MzhiNjMxZDg2OTNiMTU4NjE2MzQzMDEzNjhl
-    YTE5ODc2ODRjNDM1ZTI1NTM2YjdkZTQxNDE4ZjljOGRiNThkYjA=
+    Zjg0NDA0MjI4NTc4OWJkNTg4OGY3MWJhY2EyMDZkOGVkMWI2YzkwOTUwYjFl
+    YmZkZTI5YmRhZjU1YmViN2JiNDFhMjc3YzE0YjQyYjA2YWQyMDU0NjQwYWVi
+    MDZhYTZmZWU1YWE5NzdiZjFmNGMzMGEzZjBjNDgyMGM0NzBlYzI=

data/ext/pg_query/pg_query.c

@@ -13,10 +13,10 @@
 
 const char* progname = "pg_query";
 
-static void raise_parse_error(ErrorData* error)
+static VALUE new_parse_error(ErrorData* error)
 {
 	VALUE cPgQuery, cParseError;
-	VALUE exc, args[2];
+	VALUE args[2];
 	
 	cPgQuery = rb_const_get(rb_cObject, rb_intern("PgQuery"));
 	cParseError = rb_const_get_at(cPgQuery, rb_intern("ParseError"));
@@ -24,9 +24,7 @@ static void raise_parse_error(ErrorData* error)
 	args[0] = rb_tainted_str_new_cstr(error->message);
 	args[1] = INT2NUM(error->cursorpos);
 	
-	exc = rb_class_new_instance(2, args, cParseError);
-	
-	rb_exc_raise(exc);
+	return rb_class_new_instance(2, args, cParseError);
 }
 
 #define STDERR_BUFFER_LEN 4096
@@ -36,8 +34,8 @@ static VALUE pg_query_raw_parse(VALUE self, VALUE input)
 	Check_Type(input, T_STRING);
 	
 	MemoryContext ctx = NULL;
-	VALUE result;
-	ErrorData* error = NULL;
+	VALUE result = Qnil;
+	VALUE error = Qnil;
 	char stderr_buffer[STDERR_BUFFER_LEN + 1] = {0};
 	int stderr_global;
 	int stderr_pipe[2];
@@ -82,7 +80,8 @@ static VALUE pg_query_raw_parse(VALUE self, VALUE input)
 	}
 	PG_CATCH();
 	{
-		error = CopyErrorData();
+		ErrorData* error_data = CopyErrorData();
+		error = new_parse_error(error_data);
 		FlushErrorState();
 	}
 	PG_END_TRY();
@@ -93,8 +92,8 @@ static VALUE pg_query_raw_parse(VALUE self, VALUE input)
 	MemoryContextSwitchTo(TopMemoryContext);
 	MemoryContextDelete(ctx);
 	
-	// If we got an error, throw a ParseError exception
-	if (error) raise_parse_error(error);
+	// If we got an error, throw it
+	if (!NIL_P(error)) rb_exc_raise(error);
 	
 	return result;
 }
@@ -351,10 +350,6 @@ bool const_record_walker(Node *node, pgssConstLocations *jstate)
 		jstate->clocations[jstate->clocations_count].length = -1;
 		jstate->clocations_count++;
 	}
-	//else if (isA(node, Query))
-	//{
-	//	return query_tree_walker(node, const_record_walker, jstate, 0);
-	//}
 	
 	PG_TRY();
 	{
@@ -372,8 +367,8 @@ static VALUE pg_query_normalize(VALUE self, VALUE input)
 	Check_Type(input, T_STRING);
 	
 	MemoryContext ctx = NULL;
-	VALUE result;
-	ErrorData* error = NULL;
+	VALUE result = Qnil;
+	VALUE error = Qnil;
 	
 	ctx = AllocSetContextCreate(TopMemoryContext,
 								"pg_query_normalize",
@@ -412,16 +407,17 @@ static VALUE pg_query_normalize(VALUE self, VALUE input)
 	}
 	PG_CATCH();
 	{
-		error = CopyErrorData();
+		ErrorData* error_data = CopyErrorData();
+		error = new_parse_error(error_data);
 		FlushErrorState();
 	}
 	PG_END_TRY();
-
+	
 	MemoryContextSwitchTo(TopMemoryContext);
 	MemoryContextDelete(ctx);
 	
-	// If we got an error, throw a ParseError exception
-	if (error) raise_parse_error(error);
+	// If we got an error, throw it
+	if (!NIL_P(error)) rb_exc_raise(error);
 	
 	return result;
 }

data/lib/pg_query/version.rb

@@ -1,3 +1,3 @@
 class PgQuery
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_query
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Lukas Fittl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler