do_sqlite3 0.9.7 → 0.9.8

data/Manifest.txt

@@ -8,9 +8,9 @@ TODO
 ext/do_sqlite3_ext.c
 ext/extconf.rb
 lib/do_sqlite3.rb
+lib/do_sqlite3/sqlite3.dll
 lib/do_sqlite3/transaction.rb
 lib/do_sqlite3/version.rb
-lib/sqlite3.dll
 spec/integration/do_sqlite3_spec.rb
 spec/integration/logging_spec.rb
 spec/integration/quoting_spec.rb

data/ext/do_sqlite3_ext.c

@@ -1,5 +1,4 @@
 #include <ruby.h>
-#include <version.h>
 #include <string.h>
 #include <math.h>
 #include <time.h>
@@ -18,6 +17,18 @@
 
 #define TRUE_CLASS CONST_GET(rb_mKernel, "TrueClass")
 
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#endif
+
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(s) (RSTRING(s)->len)
+#endif
+
+#ifndef RARRAY_LEN
+#define RARRAY_LEN(a) RARRAY(a)->len
+#endif
+
 #ifdef _WIN32
 #define do_int64 signed __int64
 #else
@@ -39,7 +50,11 @@ static VALUE cDO_Reader;
 
 static VALUE rb_cDate;
 static VALUE rb_cDateTime;
+
+#ifndef RUBY_19_COMPATIBILITY
 static VALUE rb_cRational;
+#endif
+
 static VALUE rb_cBigDecimal;
 
 static VALUE mSqlite3;
@@ -404,13 +419,13 @@ static VALUE cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
 	// 	field_types = rb_ary_new();
 	// }
 
-	if ( field_types == Qnil || 0 == RARRAY(field_types)->len ) {
+	if ( field_types == Qnil || 0 == RARRAY_LEN(field_types) ) {
 		field_types = rb_ary_new();
-	} else if (RARRAY(field_types)->len != field_count) {
+	} else if (RARRAY_LEN(field_types) != field_count) {
 		// Whoops...  wrong number of types passed to set_types.  Close the reader and raise
 		// and error
 		rb_funcall(reader, rb_intern("close"), 0);
-		rb_raise(eSqlite3Error, "Field-count mismatch. Expected %d fields, but the query yielded %d", RARRAY(field_types)->len, field_count);
+		rb_raise(eSqlite3Error, "Field-count mismatch. Expected %ld fields, but the query yielded %d", RARRAY_LEN(field_types), field_count);
 	}
 
 
@@ -454,7 +469,7 @@ static VALUE cReader_next(VALUE self) {
 	field_count = NUM2INT(rb_iv_get(self, "@field_count"));
 
 	field_types = rb_iv_get(self, "@field_types");
-	ft_length = RARRAY(field_types)->len;
+	ft_length = RARRAY_LEN(field_types);
 
 	result = sqlite3_step(reader);
 
@@ -469,7 +484,7 @@ static VALUE cReader_next(VALUE self) {
 			value = native_typecast(sqlite3_column_value(reader, i), sqlite3_column_type(reader, i));
 		}
 		else {
-			value = ruby_typecast(sqlite3_column_value(reader, i), rb_class2name(RARRAY(field_types)->ptr[i]), sqlite3_column_type(reader, i));
+			value = ruby_typecast(sqlite3_column_value(reader, i), rb_class2name(RARRAY_PTR(field_types)[i]), sqlite3_column_type(reader, i));
 		}
 		rb_ary_push(arr, value);
 	}
@@ -508,7 +523,11 @@ void Init_do_sqlite3_ext() {
 
 	rb_funcall(rb_mKernel, rb_intern("require"), 1, rb_str_new2("data_objects"));
 
-	ID_NEW_DATE = RUBY_VERSION_CODE < 186 ? rb_intern("new0") : rb_intern("new!");
+#ifdef RUBY_LESS_THAN_186
+	ID_NEW_DATE = rb_intern("new0");
+#else
+	ID_NEW_DATE = rb_intern("new!");
+#endif
 	ID_LOGGER = rb_intern("logger");
 	ID_DEBUG = rb_intern("debug");
 	ID_LEVEL = rb_intern("level");

data/ext/extconf.rb

@@ -28,6 +28,12 @@ dir_config("sqlite3")
 # NOTE: use GCC flags unless Visual C compiler is used
 $CFLAGS << ' -Wall ' unless RUBY_PLATFORM =~ /mswin/
 
+if RUBY_VERSION < '1.8.6'
+  $CFLAGS << ' -DRUBY_LESS_THAN_186'
+elsif RUBY_VERSION >= '1.9.0'
+  $CFLAGS << ' -DRUBY_19_COMPATIBILITY'
+end
+
 # Do the work
 # create_makefile(extension_name)
 if have_header( "sqlite3.h" ) && have_library( "sqlite3", "sqlite3_open" )

data/lib/do_sqlite3.rb

@@ -4,10 +4,10 @@
 # of the actual extension file.
 if RUBY_PLATFORM.match(/mingw|mswin/i)
   libdir = File.expand_path(File.dirname(__FILE__)).gsub(File::SEPARATOR, File::ALT_SEPARATOR)
-  ENV['PATH'] = "#{libdir};" + ENV['PATH']
+  ENV['PATH'] = File.join(libdir, "do_sqlite3;") + ENV['PATH']
 end
 
 require 'rubygems'
 require 'data_objects'
-require 'do_sqlite3_ext'
-require 'do_sqlite3/transaction'
+require File.expand_path(File.join(File.dirname(__FILE__), 'do_sqlite3_ext.bundle'))
+require File.expand_path(File.join(File.dirname(__FILE__), 'do_sqlite3', 'transaction'))

data/lib/do_sqlite3/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Sqlite3
-    VERSION = "0.9.7"
+    VERSION = "0.9.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: do_sqlite3
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Bernerd Schaefer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-18 00:00:00 -08:00
+date: 2008-11-24 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.7
+        version: 0.9.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -54,9 +54,9 @@ files:
 - ext/do_sqlite3_ext.c
 - ext/extconf.rb
 - lib/do_sqlite3.rb
+- lib/do_sqlite3/sqlite3.dll
 - lib/do_sqlite3/transaction.rb
 - lib/do_sqlite3/version.rb
-- lib/sqlite3.dll
 - spec/integration/do_sqlite3_spec.rb
 - spec/integration/logging_spec.rb
 - spec/integration/quoting_spec.rb