swift-db-sqlite3 0.1.1 → 0.1.2

data/CHANGELOG

@@ -1,3 +1,9 @@
+== 0.1.2 (2012-07-28)
+
+* Fixed compiler warnings on i386.
+* gc guard bind parameters during execute.
+* Fixed segfault due to marking tuples as globals.
+
 == 0.1.1 (2012-07-26)
 
 * Type parsing should be case insensitive.

data/ext/swift/db/sqlite3/extconf.rb

@@ -4,7 +4,31 @@ require 'mkmf'
 
 $CFLAGS = '-std=c99 -Os'
 
-find_library('sqlite3', 'main', '/usr/lib /usr/local/lib /opt/lib /opt/local/lib')
-find_library('uuid',    'main', '/usr/lib /usr/local/lib /opt/lib /opt/local/lib')
-create_makefile('swift_db_sqlite3_ext')
+inc_paths = %w(
+  /usr/include
+  /usr/local/include
+  /opt/local/include
+  /sw/include
+)
+
+lib_paths = %w(
+  /usr/lib
+  /usr/local/lib
+  /opt/local/lib
+  /sw/lib
+)
+
+def ensure_library name, lib_paths, hint = nil
+  unless find_library(name, 'main', *lib_paths)
+    puts $/, '#' * 80, hint, '#' * 80, $/ if hint
+    raise "unable to find #{name}"
+  end
+end
 
+find_header('sqlite3.h',   *inc_paths) or raise 'unable to locate sqlite3 headers'
+find_header('uuid/uuid.h', *inc_paths) or raise 'unable to locate uuid headers'
+
+ensure_library 'sqlite3',  lib_paths, 'please install sqlite3 development libraries'
+ensure_library 'uuid',     lib_paths, 'please install uuid development libraries'
+
+create_makefile('swift_db_sqlite3_ext')

data/ext/swift/db/sqlite3/result.c

@@ -38,14 +38,14 @@ Result* db_sqlite3_result_handle(VALUE self) {
 
 void db_sqlite3_result_mark(Result *r) {
     if (r) {
-        if (!NIL_P(r->statement))
-            rb_gc_mark_maybe(r->statement);
-        if (!NIL_P(r->fields))
-            rb_gc_mark_maybe(r->fields);
-        if (!NIL_P(r->types))
-            rb_gc_mark_maybe(r->types);
-        if (!NIL_P(r->rows))
-            rb_gc_mark_maybe(r->rows);
+        if (r->rows)
+            rb_gc_mark(r->rows);
+        if (r->statement)
+            rb_gc_mark(r->statement);
+        if (r->fields)
+            rb_gc_mark(r->fields);
+        if (r->types)
+            rb_gc_mark(r->types);
     }
 }
 
@@ -101,7 +101,7 @@ VALUE db_sqlite3_result_consume(VALUE self) {
     };
 
     int lazy_types = 0;
-    size_t ntypes = sizeof(types) / sizeof(Type);
+    size_t ntypes  = sizeof(types) / sizeof(Type);
 
     rb_ary_clear(r->fields);
     rb_ary_clear(r->types);
@@ -181,9 +181,9 @@ VALUE db_sqlite3_result_each(VALUE self) {
     int n, f;
     Result *r = db_sqlite3_result_handle(self);
 
-    if (!r->rows) return Qnil;
+    if (!r->rows)
+        return Qnil;
 
-    rb_gc_register_address(&r->rows);
     for (n = 0; n < RARRAY_LEN(r->rows); n++) {
         VALUE tuple = rb_hash_new();
         VALUE row   = rb_ary_entry(r->rows, n);
@@ -191,7 +191,8 @@ VALUE db_sqlite3_result_each(VALUE self) {
             rb_hash_aset(tuple, rb_ary_entry(r->fields, f), rb_ary_entry(row, f));
         rb_yield(tuple);
     }
-    rb_gc_unregister_address(&r->rows);
+
+    return Qtrue;
 }
 
 VALUE db_sqlite3_result_selected_rows(VALUE self) {

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

@@ -33,8 +33,8 @@ Statement* db_sqlite3_statement_handle_safe(VALUE self) {
 }
 
 void db_sqlite3_statement_mark(Statement *s) {
-    if (s && !NIL_P(s->adapter))
-        rb_gc_mark_maybe(s->adapter);
+    if (s && s->adapter)
+        rb_gc_mark(s->adapter);
 }
 
 VALUE db_sqlite3_statement_deallocate(Statement *s) {
@@ -80,8 +80,9 @@ VALUE db_sqlite3_statement_execute(int argc, VALUE *argv, VALUE self) {
     rb_scan_args(argc, argv, "00*", &bind);
     expect = sqlite3_bind_parameter_count(s->s);
     if (expect != RARRAY_LEN(bind))
-        rb_raise(eSwiftArgumentError, "expected %d bind values got %d", expect, RARRAY_LEN(bind));
+        rb_raise(eSwiftArgumentError, "expected %d bind values got %d", expect, (int)RARRAY_LEN(bind));
 
+    rb_gc_register_address(&bind);
     for (n = 0; n < expect; n++) {
         VALUE value = rb_ary_entry(bind, n);
         if (NIL_P(value))
@@ -95,6 +96,7 @@ VALUE db_sqlite3_statement_execute(int argc, VALUE *argv, VALUE self) {
     result = db_sqlite3_result_allocate(cDSR);
     db_sqlite3_result_initialize(result, self);
     db_sqlite3_result_consume(result);
+    rb_gc_unregister_address(&bind);
     return result;
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swift-db-sqlite3
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-26 00:00:00.000000000 Z
+date: 2012-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -35,25 +35,25 @@ extensions:
 - ext/swift/db/sqlite3/extconf.rb
 extra_rdoc_files: []
 files:
-- ext/swift/db/sqlite3/statement.c
-- ext/swift/db/sqlite3/result.c
-- ext/swift/db/sqlite3/datetime.c
-- ext/swift/db/sqlite3/typecast.c
+- ext/swift/db/sqlite3/adapter.c
 - ext/swift/db/sqlite3/common.c
+- ext/swift/db/sqlite3/datetime.c
 - ext/swift/db/sqlite3/main.c
-- ext/swift/db/sqlite3/adapter.c
+- ext/swift/db/sqlite3/result.c
+- ext/swift/db/sqlite3/statement.c
+- ext/swift/db/sqlite3/typecast.c
 - ext/swift/db/sqlite3/adapter.h
-- ext/swift/db/sqlite3/statement.h
-- ext/swift/db/sqlite3/typecast.h
 - ext/swift/db/sqlite3/common.h
-- ext/swift/db/sqlite3/result.h
 - ext/swift/db/sqlite3/datetime.h
+- ext/swift/db/sqlite3/result.h
+- ext/swift/db/sqlite3/statement.h
+- ext/swift/db/sqlite3/typecast.h
 - ext/swift/db/sqlite3/extconf.rb
-- test/test_encoding.rb
 - test/helper.rb
 - test/test_adapter.rb
-- lib/swift/db/sqlite3.rb
+- test/test_encoding.rb
 - lib/swift-db-sqlite3.rb
+- lib/swift/db/sqlite3.rb
 - README.md
 - CHANGELOG
 homepage: http://github.com/deepfryed/swift-db-sqlite3
@@ -82,4 +82,3 @@ signing_key:
 specification_version: 3
 summary: Swift sqlite3 adapter
 test_files: []
-has_rdoc: