rdo-postgres 0.0.2 → 0.0.3

data/ext/rdo_postgres/extconf.rb

@@ -20,13 +20,13 @@ def have_build_env
 end
 
 dir_config(
-  "pgsql-server",
+  "postgres",
   config_value("includedir-server"),
   config_value("libdir")
 )
 
 dir_config(
-  "pgsql-client",
+  "libpq",
   config_value("includedir"),
   config_value("libdir")
 )

data/ext/rdo_postgres/macros.h

@@ -1,5 +1,5 @@
 /*
- * RDO Postgres Driver.
+ * RDO—Ruby Data Objects.
  * Copyright © 2012 Chris Corbyn.
  *
  * See LICENSE file for details.
@@ -21,6 +21,49 @@
 #include <ruby.h>
 #include <ruby/encoding.h>
 
+/**
+ * Convenience to call #to_s on any Ruby object.
+ */
+#define RDO_OBJ_TO_S(obj) (rb_funcall(obj, rb_intern("to_s"), 0))
+
+/**
+ * Raise an RDO::Exception with the given msg format and any number of parameters.
+ *
+ * @param (char *) msg
+ *   a format string passed to rb_raise()
+ *
+ * @param (void *) ...
+ *   args used to interpolate the error message
+ */
+#define RDO_ERROR(...) (rb_raise(rb_path2class("RDO::Exception"), __VA_ARGS__))
+
+/**
+ * Factory to return a new RDO::Result for an Enumerable object of tuples.
+ *
+ * @param VALUE (Enumerable) tuples
+ *   an object that knows how to iterate all tuples
+ *
+ * @param VALUE (Hash)
+ *   an optional hash of query info.
+ *
+ * @return VALUE (RDO::Result)
+ *   a new Result object
+ */
+#define RDO_RESULT(tuples, info) \
+  (rb_funcall(rb_path2class("RDO::Result"), rb_intern("new"), 2, tuples, info))
+
+/**
+ * Wrap the given StatementExecutor in a RDO::Statement.
+ *
+ * @param VALUE
+ *   any object that responds to #command and #execute
+ *
+ * @return VALUE
+ *   an RDO::Statement
+ */
+#define RDO_STATEMENT(executor) \
+  (rb_funcall(rb_path2class("RDO::Statement"), rb_intern("new"), 1, executor))
+
 /**
  * Convert a C string to a ruby String.
  *
@@ -33,9 +76,8 @@
  * @return VALUE (String)
  *   a Ruby String
  */
-#define RDO_STRING(s, len, enc) ( \
-    rb_enc_associate_index(rb_str_new(s, len), enc > 0 ? enc : 0) \
-    )
+#define RDO_STRING(s, len, enc) \
+  (rb_enc_associate_index(rb_str_new(s, len), enc > 0 ? enc : 0))
 
 /**
  * Convert a C string to a ruby String, assuming possible NULL bytes.
@@ -67,11 +109,9 @@
  * @return VALUE (Float)
  *   a ruby Float
  */
-#define RDO_FLOAT(s) ( \
-    rb_funcall(rb_path2class("RDO::Util"), \
-      rb_intern("float"), 1, \
-      rb_str_new2(s)) \
-    )
+#define RDO_FLOAT(s) \
+  (rb_funcall(rb_path2class("RDO::Util"), \
+              rb_intern("float"), 1, rb_str_new2(s)))
 
 /**
  * Convert a C string representing a precision decimal into a BigDecimal.
@@ -86,11 +126,9 @@
  *   RDO_DECIMAL("1.234")
  *   => #<BigDecimal:7feb42b2b6e8,'0.1234E1',18(18)>
  */
-#define RDO_DECIMAL(s) ( \
-    rb_funcall(rb_path2class("RDO::Util"), \
-      rb_intern("decimal"), 1, \
-      rb_str_new2(s)) \
-    )
+#define RDO_DECIMAL(s) \
+  (rb_funcall(rb_path2class("RDO::Util"), \
+              rb_intern("decimal"), 1, rb_str_new2(s)))
 
 /**
  * Convert a C string representing a date into a Date.
@@ -105,11 +143,9 @@
  *   RDO_DATE("431-09-22 BC")
  *   #<Date: -0430-09-22 ((1564265j,0s,0n),+0s,2299161j)>
  */
-#define RDO_DATE(s) ( \
-    rb_funcall(rb_path2class("RDO::Util"), \
-      rb_intern("date"), 1, \
-      rb_str_new2(s)) \
-    )
+#define RDO_DATE(s) \
+  (rb_funcall(rb_path2class("RDO::Util"), \
+              rb_intern("date"), 1, rb_str_new2(s)))
 
 /**
  * Convert a C string representing a date & time with no time zone into a DateTime.
@@ -124,11 +160,9 @@
  *   RDO_DATE_TIME_WITHOUT_ZONE("2012-09-22 04:36:12")
  *   #<DateTime: 2012-09-22T04:36:12+10:00 ((2456192j,66972s,0n),+36000s,2299161j)>
  */
-#define RDO_DATE_TIME_WITHOUT_ZONE(s) ( \
-    rb_funcall(rb_path2class("RDO::Util"), \
-      rb_intern("date_time_without_zone"), 1, \
-      rb_str_new2(s)) \
-    )
+#define RDO_DATE_TIME_WITHOUT_ZONE(s) \
+  (rb_funcall(rb_path2class("RDO::Util"), \
+              rb_intern("date_time_without_zone"), 1, rb_str_new2(s)))
 
 /**
  * Convert a C string representing a date & time that includes a time zone into a DateTime.
@@ -143,11 +177,9 @@
  *   RDO_DATE_TIME_WITHOUT_ZONE("2012-09-22 04:36:12+10:00")
  *   #<DateTime: 2012-09-22T04:36:12+10:00 ((2456192j,66972s,0n),+36000s,2299161j)>
  */
-#define RDO_DATE_TIME_WITH_ZONE(s) ( \
-    rb_funcall(rb_path2class("RDO::Util"), \
-      rb_intern("date_time_with_zone"), 1, \
-      rb_str_new2(s)) \
-    )
+#define RDO_DATE_TIME_WITH_ZONE(s) \
+  (rb_funcall(rb_path2class("RDO::Util"), \
+              rb_intern("date_time_with_zone"), 1, rb_str_new2(s)))
 
 /**
  * Convert a boolean string to TrueClass/FalseClass.
@@ -159,22 +191,3 @@
  *   the boolean representation
  */
 #define RDO_BOOL(s) ((s[0] == 't') ? Qtrue : Qfalse)
-
-/**
- * Wrap the given StatementExecutor in a RDO::Statement.
- *
- * @param VALUE
- *   any object that responds to #command and #execute
- *
- * @return VALUE
- *   an RDO::Statement
- */
-#define RDO_STATEMENT(executor) ( \
-    rb_funcall(rb_path2class("RDO::Statement"), \
-      rb_intern("new"), 1, executor) \
-    )
-
-/**
- * Convenience to call #to_s on any Ruby object.
- */
-#define RDO_OBJ_TO_S(obj) (rb_funcall(obj, rb_intern("to_s"), 0))

data/ext/rdo_postgres/statements.c

@@ -207,6 +207,7 @@ static VALUE rdo_postgres_statement_executor_execute(int argc, VALUE * args,
   ExecStatusType status = PQresultStatus(res);
 
   if (status == PGRES_BAD_RESPONSE || status == PGRES_FATAL_ERROR) {
+    PQclear(res);
     rb_raise(rb_path2class("RDO::Exception"),
         "Failed to execute statement: %s", PQresultErrorMessage(res));
   }

data/lib/rdo/postgres/version.rb

@@ -7,6 +7,6 @@
 
 module RDO
   module Postgres
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/rdo/postgres.rb

@@ -13,6 +13,6 @@ require "rdo/postgres/driver"
 require "rdo_postgres/rdo_postgres"
 
 # Register name variants for postgresql schemes
-%w[postgres postgresql].each do |name|
+%w[postgres postgresql pgsql psql].each do |name|
   RDO::Connection.register_driver(name, RDO::Postgres::Driver)
 end

data/rdo-postgres.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |gem|
   gem.authors       = ["d11wtq"]
   gem.email         = ["chris@w3style.co.uk"]
   gem.description   = "Provides access to PostgreSQL using the RDO interface"
-  gem.summary       = "PostgreSQL Adapter for RDO"
+  gem.summary       = "PostgreSQL Driver for RDO"
   gem.homepage      = "https://github.com/d11wtq/rdo-postgres"
 
   gem.files         = `git ls-files`.split($\)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdo-postgres
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2012-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdo
@@ -118,7 +118,7 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: PostgreSQL Adapter for RDO
+summary: PostgreSQL Driver for RDO
 test_files:
 - spec/postgres/bind_params_spec.rb
 - spec/postgres/driver_spec.rb