do_sqlite3 0.10.7 → 0.10.8

data/ChangeLog.markdown

@@ -1,3 +1,8 @@
+## 0.10.8 2012-02-10
+
+* Ruby 1.9.3 compatibility on Windows
+* Fix issue with sqlite3_load_extension
+
 ## 0.10.7 2011-10-13
 
 * Ruby 1.9.3 compatibility

data/ext/do_sqlite3/do_common.c

@@ -53,9 +53,10 @@ VALUE data_objects_const_get(VALUE scope, const char *constant) {
 void data_objects_debug(VALUE connection, VALUE string, struct timeval *start) {
   struct timeval stop;
   VALUE message;
+  do_int64 duration;
 
   gettimeofday(&stop, NULL);
-  do_int64 duration = (stop.tv_sec - start->tv_sec) * 1000000 + stop.tv_usec - start->tv_usec;
+  duration = (stop.tv_sec - start->tv_sec) * 1000000 + stop.tv_usec - start->tv_usec;
 
   message = rb_funcall(cDO_Logger_Message, ID_NEW, 3, string, rb_time_new(start->tv_sec, start->tv_usec), INT2NUM(duration));
 
@@ -65,6 +66,7 @@ void data_objects_debug(VALUE connection, VALUE string, struct timeval *start) {
 void data_objects_raise_error(VALUE self, const struct errcodes *errors, int errnum, const char *message, VALUE query, VALUE state) {
   const char *exception_type = "SQLError";
   const struct errcodes *e;
+  VALUE uri, exception;
 
   for (e = errors; e->error_name; e++) {
     if (e->error_no == errnum) {
@@ -74,9 +76,9 @@ void data_objects_raise_error(VALUE self, const struct errcodes *errors, int err
     }
   }
 
-  VALUE uri = rb_funcall(rb_iv_get(self, "@connection"), rb_intern("to_s"), 0);
+  uri = rb_funcall(rb_iv_get(self, "@connection"), rb_intern("to_s"), 0);
 
-  VALUE exception = rb_funcall(
+  exception = rb_funcall(
     data_objects_const_get(mDO, exception_type),
     ID_NEW,
     5,
@@ -116,8 +118,8 @@ void data_objects_assert_file_exists(char *file, const char *message) {
 }
 
 VALUE data_objects_build_query_from_args(VALUE klass, int count, VALUE *args) {
-  VALUE array = rb_ary_new();
   int i;
+  VALUE array = rb_ary_new();
 
   for (i = 0; i < count; i++) {
     rb_ary_push(array, args[i]);
@@ -176,8 +178,6 @@ VALUE data_objects_timezone_to_offset(int hour_offset, int minute_offset) {
 VALUE data_objects_parse_date(const char *date) {
   static char const *const _fmt_date = "%4d-%2d-%2d";
   int year = 0, month = 0, day = 0;
-  int jd, ajd;
-  VALUE rational;
 
   switch (sscanf(date, _fmt_date, &year, &month, &day)) {
     case 0:
@@ -185,16 +185,7 @@ VALUE data_objects_parse_date(const char *date) {
       return Qnil;
   }
 
-#ifdef HAVE_NO_DATETIME_NEWBANG
   return rb_funcall(rb_cDate, ID_NEW, 3, INT2NUM(year), INT2NUM(month), INT2NUM(day));
-#else
-
-  jd       = data_objects_jd_from_date(year, month, day);
-  ajd      = (jd * 2) - 1;        // Math from Date.jd_to_ajd
-  rational = rb_funcall(rb_mKernel, ID_RATIONAL, 2, INT2NUM(ajd), INT2NUM(2));
-
-  return rb_funcall(rb_cDate, ID_NEW_DATE, 3, rational, INT2NUM(0), INT2NUM(2299161));
-#endif
 }
 
 VALUE data_objects_parse_time(const char *date) {
@@ -224,10 +215,9 @@ VALUE data_objects_parse_date_time(const char *date) {
   int tokens_read;
   const char *fmt_datetime;
 
-  VALUE ajd, offset;
+  VALUE offset;
 
-  int year, month, day, hour, min, sec, hour_offset, minute_offset, jd;
-  do_int64 num, den;
+  int year, month, day, hour, min, sec, hour_offset, minute_offset;
 
   struct tm timeinfo;
   time_t target_time;
@@ -304,40 +294,9 @@ VALUE data_objects_parse_date_time(const char *date) {
       rb_raise(eDataError, "Couldn't parse date: %s", date);
   }
 
-#ifdef HAVE_NO_DATETIME_NEWBANG
   offset = data_objects_timezone_to_offset(hour_offset, minute_offset);
   return rb_funcall(rb_cDateTime, ID_NEW, 7, INT2NUM(year), INT2NUM(month), INT2NUM(day),
                                              INT2NUM(hour), INT2NUM(min), INT2NUM(sec), offset);
-#else
-  jd = data_objects_jd_from_date(year, month, day);
-
-  /*
-   * Generate ajd with fractional days for the time.
-   * Extracted from Date#jd_to_ajd, Date#day_fraction_to_time, and Rational#+ and #-.
-   *
-   * TODO: These are 64bit numbers; is reduce() really necessary?
-   */
-
-  num = (hour * 1440) + (min * 24);
-  num -= (hour_offset * 1440) + (minute_offset * 24);
-  den = (24 * 1440);
-  data_objects_reduce(&num, &den);
-
-  num = (num * 86400) + (sec * den);
-  den = den * 86400;
-  data_objects_reduce(&num, &den);
-
-  num += jd * den;
-
-  num = (num * 2) - den;
-  den *= 2;
-  data_objects_reduce(&num, &den);
-
-  ajd = rb_funcall(rb_mKernel, ID_RATIONAL, 2, rb_ull2inum(num), rb_ull2inum(den));
-  offset = data_objects_timezone_to_offset(hour_offset, minute_offset);
-
-  return rb_funcall(rb_cDateTime, ID_NEW_DATE, 3, ajd, offset, INT2NUM(2299161));
-#endif
 }
 
 VALUE data_objects_cConnection_character_set(VALUE self) {
@@ -371,17 +330,15 @@ VALUE data_objects_cConnection_quote_date(VALUE self, VALUE value) {
  * into Ruby-strings so we can easily typecast later
  */
 VALUE data_objects_cCommand_set_types(int argc, VALUE *argv, VALUE self) {
+  VALUE entry, sub_entry;
+  int i, j;
   VALUE type_strings = rb_ary_new();
   VALUE array = rb_ary_new();
 
-  int i, j;
-
   for (i = 0; i < argc; i++) {
     rb_ary_push(array, argv[i]);
   }
 
-  VALUE entry, sub_entry;
-
   for (i = 0; i < RARRAY_LEN(array); i++) {
     entry = rb_ary_entry(array, i);
 

data/ext/do_sqlite3/do_sqlite3.c

@@ -215,50 +215,6 @@ VALUE do_sqlite3_cConnection_quote_byte_array(VALUE self, VALUE string) {
   return rb_ary_join(array, Qnil);
 }
 
-VALUE do_sqlite3_cConnection_enable_load_extension(VALUE self, VALUE value) {
-  VALUE connection = rb_iv_get(self, "@connection");
-
-  if (connection == Qnil) {
-    return Qfalse;
-  }
-
-  sqlite3 *db = DATA_PTR(connection);
-
-  if (!db) {
-    return Qfalse;
-  }
-
-  int status = sqlite3_enable_load_extension(db, value == Qtrue ? 1 : 0);
-
-  if (status != SQLITE_OK) {
-    rb_raise(eConnectionError, "Error enabling load extension.");
-  }
-  return Qtrue;
-}
-
-VALUE do_sqlite3_cConnection_load_extension(VALUE self, VALUE string) {
-  VALUE connection = rb_iv_get(self, "@connection");
-
-  if (connection == Qnil) {
-    return Qfalse;
-  }
-
-  sqlite3 *db = DATA_PTR(connection);
-
-  if (!db) {
-    return Qfalse;
-  }
-
-  const char *extension_name  = rb_str_ptr_readonly(string);
-  char *errmsg = NULL;
-  int status = sqlite3_load_extension(db, extension_name, 0, &errmsg);
-
-  if (status != SQLITE_OK) {
-    rb_raise(eConnectionError, "%s", errmsg);
-  }
-  return Qtrue;
-}
-
 VALUE do_sqlite3_cCommand_execute_non_query(int argc, VALUE *argv, VALUE self) {
   VALUE query = data_objects_build_query_from_args(self, argc, argv);
   VALUE connection = rb_iv_get(self, "@connection");
@@ -363,16 +319,23 @@ VALUE do_sqlite3_cReader_close(VALUE self) {
 }
 
 VALUE do_sqlite3_cReader_next(VALUE self) {
+
+  VALUE reader = rb_iv_get(self, "@reader");
+
+  if(reader == Qnil) {
+    rb_raise(eConnectionError, "This result set has already been closed.");
+  }
+
   if (rb_iv_get(self, "@done") == Qtrue) {
     return Qfalse;
   }
 
-  sqlite3_stmt *reader = NULL;
+  sqlite3_stmt *sqlite_reader = NULL;
   int result;
 
-  Data_Get_Struct(rb_iv_get(self, "@reader"), sqlite3_stmt, reader);
+  Data_Get_Struct(reader, sqlite3_stmt, sqlite_reader);
 
-  result = sqlite3_step(reader);
+  result = sqlite3_step(sqlite_reader);
   rb_iv_set(self, "@state", INT2NUM(result));
 
   if (result != SQLITE_ROW) {
@@ -399,7 +362,7 @@ VALUE do_sqlite3_cReader_next(VALUE self) {
 
   for (i = 0; i < field_count; i++) {
     field_type = rb_ary_entry(field_types, i);
-    value = do_sqlite3_typecast(reader, i, field_type, enc);
+    value = do_sqlite3_typecast(sqlite_reader, i, field_type, enc);
     rb_ary_push(arr, value);
   }
 
@@ -430,8 +393,6 @@ void Init_do_sqlite3() {
   rb_define_method(cSqlite3Connection, "quote_string", do_sqlite3_cConnection_quote_string, 1);
   rb_define_method(cSqlite3Connection, "quote_byte_array", do_sqlite3_cConnection_quote_byte_array, 1);
   rb_define_method(cSqlite3Connection, "character_set", data_objects_cConnection_character_set, 0);
-  rb_define_method(cSqlite3Connection, "enable_load_extension", do_sqlite3_cConnection_enable_load_extension, 1);
-  rb_define_method(cSqlite3Connection, "load_extension", do_sqlite3_cConnection_load_extension, 1);
 
   cSqlite3Command = rb_define_class_under(mSqlite3, "Command", cDO_Command);
   rb_define_method(cSqlite3Command, "set_types", data_objects_cCommand_set_types, -1);

data/ext/do_sqlite3/do_sqlite3_extension.c

@@ -9,6 +9,7 @@ VALUE cSqlite3Extension;
 /* API that are driver specific.                     */
 /*****************************************************/
 VALUE do_sqlite3_cExtension_enable_load_extension(VALUE self, VALUE on) {
+#ifdef HAVE_SQLITE3_ENABLE_LOAD_EXTENSION
   VALUE id_connection = rb_intern("connection");
   VALUE connection = rb_funcall(self, id_connection, 0);
 
@@ -32,9 +33,13 @@ VALUE do_sqlite3_cExtension_enable_load_extension(VALUE self, VALUE on) {
   }
 
   return Qtrue;
+#else
+  return Qfalse;
+#endif
 }
 
 VALUE do_sqlite3_cExtension_load_extension(VALUE self, VALUE path) {
+#ifdef HAVE_SQLITE3_ENABLE_LOAD_EXTENSION
   VALUE id_connection = rb_intern("connection");
   VALUE connection = rb_funcall(self, id_connection, 0);
 
@@ -68,6 +73,9 @@ VALUE do_sqlite3_cExtension_load_extension(VALUE self, VALUE path) {
   }
 
   return Qtrue;
+#else
+  return Qfalse;
+#endif
 }
 
 void Init_do_sqlite3_extension() {

data/ext/do_sqlite3/extconf.rb

@@ -28,6 +28,7 @@ if have_header( "sqlite3.h" ) && have_library( "sqlite3", "sqlite3_open" )
   have_func("gmtime_r")
   have_func("sqlite3_prepare_v2")
   have_func("sqlite3_open_v2")
+  have_func("sqlite3_enable_load_extension")
 
   create_makefile('do_sqlite3/do_sqlite3')
 end

data/lib/do_sqlite3/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Sqlite3
-    VERSION = '0.10.7'
+    VERSION = '0.10.8'
   end
 end

data/tasks/compile.rake

@@ -55,7 +55,7 @@ begin
     ext.classpath = '../do_jdbc/lib/do_jdbc_internal.jar'
     ext.java_compiling do |gem|
       gem.add_dependency 'jdbc-sqlite3', '>=3.5.8'
-      gem.add_dependency 'do_jdbc',      '0.10.7'
+      gem.add_dependency 'do_jdbc',      '0.10.8'
     end
   end
 rescue LoadError

data/tasks/spec.rake

@@ -2,7 +2,6 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec => [:clean, :compile]) do |spec|
   spec.pattern      = './spec/**/*_spec.rb'
-  spec.skip_bundler = true
 end
 
 RSpec::Core::RakeTask.new(:rcov => [:clean, :compile]) do |rcov|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: do_sqlite3
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 39
   prerelease: 
   segments: 
   - 0
   - 10
-  - 7
-  version: 0.10.7
+  - 8
+  version: 0.10.8
 platform: ruby
 authors: 
 - Dirkjan Bussink
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 57
+        hash: 39
         segments: 
         - 0
         - 10
-        - 7
-        version: 0.10.7
+        - 8
+        version: 0.10.8
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: dorb
-rubygems_version: 1.8.6
+rubygems_version: 1.8.14
 signing_key: 
 specification_version: 3
 summary: DataObjects Sqlite3 Driver