swift-db-postgres 0.1.2 → 0.2.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.2.0 (2012-07-29)
+
+* Added Adapter#native_bind_format and Adapter#native_bind_format=
+
 == 0.1.2 (2012-07-29)
 
 * gc guard bind parameters during execute.

data/README.md

@@ -21,6 +21,8 @@ MRI adapter for PostgreSQL
     #commit(savepoint = nil)
     #rollback(savepoint = nil)
     #transaction(savepoint = nil, &block)
+    #native_bind_format(&block)
+    #native_bind_format=(value)
     #ping
     #close
     #closed?
@@ -45,6 +47,22 @@ MRI adapter for PostgreSQL
     #insert_id
 ```
 
+## Bind parameters and hstore operators
+
+Swift::DB::Postgres uses '?' as a bind parameter and replaces them with the '$' equivalents. This causes issues when
+you try to use the HStore '?' operator. You can permanently or temporarily disable the replacement strategy as below:
+
+```ruby
+
+db.native_bind_format = true
+db.execute("select * from users where tags ? $1", 'mayor')
+db.native_bind_format = false
+
+db.native_bind_format do
+  db.execute("select * from users where tags ? $1", 'mayor')
+end
+```
+
 ## Example
 
 ```ruby

data/ext/swift/db/postgres/adapter.c

@@ -130,7 +130,8 @@ VALUE db_postgres_adapter_execute(int argc, VALUE *argv, VALUE self) {
     Adapter *a = db_postgres_adapter_handle_safe(self);
 
     rb_scan_args(argc, argv, "10*", &sql, &bind);
-    sql = db_postgres_normalized_sql(sql);
+    if (!a->native)
+        sql = db_postgres_normalized_sql(sql);
 
     if (RARRAY_LEN(bind) > 0) {
         bind_args_size = (int   *) malloc(sizeof(int)    * RARRAY_LEN(bind));
@@ -361,6 +362,26 @@ VALUE db_postgres_adapter_result(VALUE self) {
     return db_postgres_result_load(db_postgres_result_allocate(cDPR), result);
 }
 
+VALUE db_postgres_adapter_native(VALUE self) {
+    int status, native;
+    VALUE result;
+    Adapter *a = db_postgres_adapter_handle_safe(self);
+
+    native    = a->native;
+    a->native = 1;
+    result = rb_protect(rb_yield, Qnil, &status);
+    a->native = native;
+    if (status)
+        rb_jump_tag(status);
+    return result;
+}
+
+VALUE db_postgres_adapter_native_set(VALUE self, VALUE flag) {
+    Adapter *a = db_postgres_adapter_handle_safe(self);
+    a->native = Qtrue == flag ? 1 : 0;
+    return flag;
+}
+
 VALUE db_postgres_adapter_query(int argc, VALUE *argv, VALUE self) {
     VALUE sql, bind, data;
     char **bind_args_data = 0;
@@ -368,7 +389,8 @@ VALUE db_postgres_adapter_query(int argc, VALUE *argv, VALUE self) {
     Adapter *a = db_postgres_adapter_handle_safe(self);
 
     rb_scan_args(argc, argv, "10*", &sql, &bind);
-    sql = db_postgres_normalized_sql(sql);
+    if (!a->native)
+        sql = db_postgres_normalized_sql(sql);
 
     if (RARRAY_LEN(bind) > 0) {
         bind_args_size = (int   *) malloc(sizeof(int)    * RARRAY_LEN(bind));
@@ -583,5 +605,8 @@ void init_swift_db_postgres_adapter() {
     rb_define_method(cDPA, "write",       db_postgres_adapter_write,       -1);
     rb_define_method(cDPA, "read",        db_postgres_adapter_read,        -1);
 
+    rb_define_method(cDPA, "native_bind_format",  db_postgres_adapter_native,     0);
+    rb_define_method(cDPA, "native_bind_format=", db_postgres_adapter_native_set, 1);
+
     rb_global_variable(&sUser);
 }

data/ext/swift/db/postgres/adapter.h

@@ -9,6 +9,7 @@
 typedef struct Adapter {
     PGconn *connection;
     int t_nesting;
+    int native;
 } Adapter;
 
 void init_swift_db_postgres_adapter();

data/ext/swift/db/postgres/statement.c

@@ -54,16 +54,17 @@ VALUE db_postgres_statement_allocate(VALUE klass) {
 
 VALUE db_postgres_statement_initialize(VALUE self, VALUE adapter, VALUE sql) {
     PGresult *result;
-    PGconn *connection;
     Statement *s = db_postgres_statement_handle(self);
+    Adapter *a   = db_postgres_adapter_handle_safe(adapter);
 
     snprintf(s->id, 64, "s%s", CSTRING(rb_uuid_string()));
     s->adapter = adapter;
     rb_gc_mark(s->adapter);
 
-    connection = db_postgres_adapter_handle_safe(adapter)->connection;
-    result     = PQprepare(connection, s->id, CSTRING(db_postgres_normalized_sql(sql)), 0, 0);
+    if (!a->native)
+        sql = db_postgres_normalized_sql(sql);
 
+    result = PQprepare(a->connection, s->id, CSTRING(sql), 0, 0);
     db_postgres_check_result(result);
     PQclear(result);
     return self;

data/test/test_adapter.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
- describe 'postgres adapter' do
+describe 'postgres adapter' do
   it 'should initialize' do
     assert db
   end
@@ -109,19 +109,20 @@ require 'helper'
     assert_raises(Swift::RuntimeError) { db.write("users", %w(name), "bar") }
   end
 
-  # TODO
   it 'should not change the hstore ? operator' do
-    skip
     assert db.execute('create extension if not exists hstore')
     assert db.execute('drop table if exists hstore_test')
     assert db.execute('create table hstore_test(id int, payload hstore)')
     assert db.execute('insert into hstore_test values(1, ?)', 'a => 1, b => 2')
 
+    db.native_bind_format = true
     assert_equal 1, db.execute('select * from hstore_test where payload ? $1', 'a').selected_rows
     assert_equal 0, db.execute('select * from hstore_test where payload ? $1', 'c').selected_rows
-    assert_equal 1, db.execute('select * from hstore_test where payload ? ?',  'a').selected_rows
+    db.native_bind_format = false
 
-    assert_equal 1, db.execute('select * from hstore_test where payload ?| ARRAY[?, ?]', 'a', 'b').selected_rows
-    assert_equal 1, db.execute('select * from hstore_test where payload ?& ARRAY[?, ?]', 'a', 'b').selected_rows
+    db.native_bind_format do
+      assert_equal 1, db.execute('select * from hstore_test where payload ?| ARRAY[$1, $2]', 'a', 'b').selected_rows
+      assert_equal 1, db.execute('select * from hstore_test where payload ?& ARRAY[$1, $2]', 'a', 'b').selected_rows
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swift-db-postgres
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -37,17 +37,17 @@ extra_rdoc_files: []
 files:
 - ext/swift/db/postgres/datetime.c
 - ext/swift/db/postgres/statement.c
+- ext/swift/db/postgres/adapter.c
 - ext/swift/db/postgres/typecast.c
 - ext/swift/db/postgres/common.c
 - ext/swift/db/postgres/main.c
 - ext/swift/db/postgres/result.c
-- ext/swift/db/postgres/adapter.c
 - ext/swift/db/postgres/typecast.h
 - ext/swift/db/postgres/common.h
 - ext/swift/db/postgres/datetime.h
 - ext/swift/db/postgres/result.h
-- ext/swift/db/postgres/adapter.h
 - ext/swift/db/postgres/statement.h
+- ext/swift/db/postgres/adapter.h
 - ext/swift/db/postgres/extconf.rb
 - test/test_ssl.rb
 - test/test_adapter.rb
@@ -84,3 +84,4 @@ signing_key:
 specification_version: 3
 summary: Swift postgres adapter
 test_files: []
+has_rdoc: