swift-db-postgres 0.2.4 → 0.2.5

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.2.5 (2012-09-26)
+
+* allow more than 99 placeholders. contributor: @filterfish
+
 == 0.2.4 (2012-08-18)
 
 * gc protect bind args.

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

@@ -18,22 +18,33 @@ VALUE rb_uuid_string() {
     return rb_str_new(uuid_hex, sizeof(uuid_t) * 2 + 1);
 }
 
-/* NOTE: very naive, no regex etc. */
-/* TODO: a better ragel based replace thingamajigy */
+/* TODO: very naive, a better ragel based replace thingamajigy */
 VALUE db_postgres_normalized_sql(VALUE sql) {
-    int i = 0, j = 0, n = 1;
-    char normalized[RSTRING_LEN(sql) * 2], *ptr = RSTRING_PTR(sql);
+    VALUE result;
+    int i = 0, j = 0, n = 1, size;
+    char *normalized, *ptr = RSTRING_PTR(sql);
+
+    size       = RSTRING_LEN(sql) * 2;
+    normalized = (char *)malloc(size);
 
     while (i < RSTRING_LEN(sql)) {
         if (*ptr == '?')
-            j += snprintf(normalized + j, 4, "$%d", n++);
+            j += snprintf(normalized + j, 6, "$%d", n++);
         else
             normalized[j++] = *ptr;
+
+        if (j >= size - 6) {
+            size       = size * 2;
+            normalized = (char *)realloc(normalized, size);
+        }
+
         ptr++;
         i++;
     }
 
-    return rb_str_new(normalized, j);
+    result = rb_str_new(normalized, j);
+    free(normalized);
+    return result;
 }
 
 void db_postgres_check_result(PGresult *result) {

data/test/test_adapter.rb

@@ -74,6 +74,20 @@ describe 'postgres adapter' do
     assert_raises(Swift::RuntimeError) { s.execute(1) }
   end
 
+  it 'should allow a statement with more than 99 placeholders' do
+    statement_placeholders = Array.new(100, "(?)").join(",")
+    data = Array.new(100, "test")
+
+    assert db.execute('drop table if exists users')
+    assert db.execute("create table users(id serial primary key, name text)")
+    assert db.execute("insert into users (name) values #{statement_placeholders}", *data)
+
+    res = db.execute("select * from users")
+
+    assert_equal 100, res.count
+    assert_equal ["test"], res.map {|u| u[:name] }.uniq
+  end
+
   it 'should escape whatever' do
     assert_equal "foo''bar", db.escape("foo'bar")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swift-db-postgres
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-18 00:00:00.000000000 Z
+date: 2012-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake