rdo-postgres 0.0.9 → 0.0.10

data/README.md

@@ -100,9 +100,9 @@ conn.execute("SELECT * FROM users WHERE banned = $1 AND created_at > ?", true, 1
 If you find any bugs, please send a pull request if you think you can
 fix it, or file in an issue in the issue tracker.
 
-I'm particulary interested in patches surrounding support for built-in type
-arrays, multi-dimensional arrays and arrays of custom types, such as ENUMs
-(in order of difficulty/preference).
+I'm particulary interested in patches surrounding support for arrays of
+custom types, such as ENUMs (this is done by reading from pg_type, in an
+efficient manner).
 
 When sending pull requests, please use topic branches—don't send a pull
 request from the master branch of your fork, as that may change

data/ext/rdo_postgres/driver.c

@@ -14,7 +14,12 @@
 
 /** During GC, free any stranded connection */
 static void rdo_postgres_driver_free(RDOPostgresDriver * driver) {
+  if (driver->ref_count > 0)
+    return;
+
   PQfinish(driver->conn_ptr);
+  driver->is_open  = 0;
+  driver->conn_ptr = NULL;
   free(driver);
 }
 
@@ -26,6 +31,7 @@ static VALUE rdo_postgres_driver_allocate(VALUE klass) {
   RDOPostgresDriver * driver = malloc(sizeof(RDOPostgresDriver));
 
   driver->conn_ptr   = NULL;
+  driver->ref_count  = 0;
   driver->is_open    = 0;
   driver->stmt_count = 0;
   driver->encoding   = -1;

data/ext/rdo_postgres/driver.h

@@ -11,6 +11,7 @@
 /** Struct that RDO::Postgres::Driver wraps */
 typedef struct {
   PGconn * conn_ptr;
+  int      ref_count;
   int      is_open;
   int      stmt_count;
   int      encoding;

data/ext/rdo_postgres/statements.c

@@ -13,6 +13,7 @@
 #include <stdlib.h>
 #include <libpq-fe.h>
 #include "types.h"
+#include <string.h>
 
 /** I don't like magic numbers */
 #define RDO_PG_NO_OIDS 0
@@ -35,11 +36,23 @@ typedef struct {
   int                 nparams;
   Oid               * param_types;
   RDOPostgresDriver * driver;
+  VALUE               driver_obj;
 } RDOPostgresStatementExecutor;
 
+/** Claim ownership of driver during GC */
+static void rdo_postgres_statement_executor_mark(RDOPostgresStatementExecutor * executor) {
+  rb_gc_mark(executor->driver_obj);
+}
+
 /** Free memory associated with the StatementExecutor during GC */
-static void rdo_postgres_statement_executor_free(
-    RDOPostgresStatementExecutor * executor) {
+static void rdo_postgres_statement_executor_free(RDOPostgresStatementExecutor * executor) {
+  if (executor->driver->is_open) {
+    char dealloc_cmd[strlen(executor->stmt_name) + 12];
+    sprintf(dealloc_cmd, "DEALLOCATE %s", executor->stmt_name);
+    PQclear(PQexec(executor->driver->conn_ptr, dealloc_cmd));
+  }
+
+  executor->driver->ref_count--;
   free(executor->stmt_name);
   free(executor->cmd);
   free(executor->param_types);
@@ -120,13 +133,17 @@ VALUE rdo_postgres_statement_executor_new(VALUE driver, VALUE cmd, VALUE name) {
     malloc(sizeof(RDOPostgresStatementExecutor));
 
   Data_Get_Struct(driver, RDOPostgresDriver, executor->driver);
+  executor->driver_obj  = driver;
   executor->stmt_name   = strdup(RSTRING_PTR(name));
   executor->cmd         = strdup(RSTRING_PTR(cmd));
   executor->nparams     = 0;
   executor->param_types = NULL;
+  executor->driver->ref_count++;
 
-  VALUE self = Data_Wrap_Struct(rdo_postgres_cStatementExecutor, 0,
-      rdo_postgres_statement_executor_free, executor);
+  VALUE self = Data_Wrap_Struct(rdo_postgres_cStatementExecutor,
+      &rdo_postgres_statement_executor_mark,
+      rdo_postgres_statement_executor_free,
+      executor);
 
   rb_obj_call_init(self, 1, &driver);
 
@@ -135,7 +152,6 @@ VALUE rdo_postgres_statement_executor_new(VALUE driver, VALUE cmd, VALUE name) {
 
 /** Initialize the StatementExecutor with the given driver and command */
 static VALUE rdo_postgres_statement_executor_initialize(VALUE self, VALUE driver) {
-  rb_iv_set(self, "driver", driver); // GC safety
   rdo_postgres_statement_executor_prepare(self);
   return self;
 }

data/lib/rdo/postgres/version.rb

@@ -7,6 +7,6 @@
 
 module RDO
   module Postgres
-    VERSION = "0.0.9"
+    VERSION = "0.0.10"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdo-postgres
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-14 00:00:00.000000000 Z
+date: 2012-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdo
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: PostgreSQL Driver for RDO