do_sqlite3 0.10.2-x86-mingw32 → 0.10.3-x86-mingw32

data/ChangeLog.markdown

@@ -1,3 +1,7 @@
+## 0.10.3 2011-01-30
+* Reworked transactions
+* Fix a DST bug that could cause datetimes in the wrong timezone
+
 ## 0.10.2 2010-05-19
 * Make Encoding.default_internal aware
 * Rework logging for making callbacks possible

data/Rakefile

@@ -11,7 +11,7 @@ JRUBY    = RUBY_PLATFORM =~ /java/
 IRONRUBY = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ironruby'
 WINDOWS  = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i)
 SUDO     = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS'])
-BINARY_VERSION = '3_6_23_1'
+BINARY_VERSION = '3070400'
 
 CLEAN.include(%w[ {tmp,pkg}/ **/*.{o,so,bundle,jar,log,a,gem,dSYM,obj,pdb,exp,DS_Store,rbc,db} ext/do_sqlite3/Makefile ext-java/target ])
 
@@ -38,7 +38,7 @@ begin
     gem.add_dependency 'data_objects', DataObjects::Sqlite3::VERSION
 
     gem.add_development_dependency 'bacon',         '~>1.1'
-    gem.add_development_dependency 'rake-compiler', '~>0.7'
+    gem.add_development_dependency 'rake-compiler', '= 0.7.0'
 
     gem.has_rdoc = false
     gem.rubyforge_project = 'dorb'

data/ext/do_sqlite3/do_sqlite3.c

@@ -142,10 +142,10 @@ static VALUE parse_date_time(char *date) {
   do_int64 num, den;
 
   long int gmt_offset;
-  int is_dst;
+  int dst_adjustment;
 
   time_t rawtime;
-  struct tm * timeinfo;
+  struct tm timeinfo;
 
   int tokens_read, max_tokens;
 
@@ -179,22 +179,48 @@ static VALUE parse_date_time(char *date) {
     }
     // We read the Date and Time, default to the current locale's offset
 
+    tzset();
+
     // Get localtime
     time(&rawtime);
-    timeinfo = localtime(&rawtime);
+#ifdef HAVE_LOCALTIME_R
+    localtime_r(&rawtime, &timeinfo);
+#else
+    timeinfo = *localtime(&rawtime);
+#endif
 
-    is_dst = timeinfo->tm_isdst * 3600;
+    timeinfo.tm_sec = sec;
+    timeinfo.tm_min = min;
+    timeinfo.tm_hour = hour;
+    timeinfo.tm_mday = day;
+    timeinfo.tm_mon = month;
+    timeinfo.tm_year = year - 1900;
+    timeinfo.tm_isdst = -1;
+
+    // Update tm_isdst
+    mktime(&timeinfo);
+
+    if (timeinfo.tm_isdst) {
+      dst_adjustment = 3600;
+    } else {
+      dst_adjustment = 0;
+    }
 
     // Reset to GM Time
-    timeinfo = gmtime(&rawtime);
+#ifdef HAVE_GMTIME_R
+    gmtime_r(&rawtime, &timeinfo);
+#else
+    timeinfo = *gmtime(&rawtime);
+#endif
 
-    gmt_offset = mktime(timeinfo) - rawtime;
+    gmt_offset = rawtime - mktime(&timeinfo);
 
-    if ( is_dst > 0 )
-      gmt_offset -= is_dst;
+    if (dst_adjustment) {
+      gmt_offset += dst_adjustment;
+    }
 
-    hour_offset = -((int)gmt_offset / 3600);
-    minute_offset = -((int)gmt_offset % 3600 / 60);
+    hour_offset = ((int)gmt_offset / 3600);
+    minute_offset = ((int)gmt_offset % 3600 / 60);
 
   } else {
     // Something went terribly wrong
@@ -364,9 +390,9 @@ static VALUE cConnection_initialize(VALUE self, VALUE uri) {
   path = rb_funcall(uri, rb_intern("path"), 0);
 
 #ifdef HAVE_SQLITE3_OPEN_V2
-  ret = sqlite3_open_v2(rb_str_ptr_readonly(path), &db, flags_from_uri(uri), 0);
+  ret = sqlite3_open_v2(StringValuePtr(path), &db, flags_from_uri(uri), 0);
 #else
-  ret = sqlite3_open(rb_str_ptr_readonly(path), &db);
+  ret = sqlite3_open(StringValuePtr(path), &db);
 #endif
 
   if ( ret != SQLITE_OK ) {
@@ -469,6 +495,52 @@ static VALUE cConnection_character_set(VALUE self) {
   return rb_iv_get(self, "@encoding");
 }
 
+static VALUE cConnection_enable_load_extension(VALUE self, VALUE value) {
+  VALUE connection;
+  int status;
+  sqlite3 *db;
+
+  connection = rb_iv_get(self, "@connection");
+
+  if (Qnil == connection)
+    return Qfalse;
+
+  db = DATA_PTR(connection);
+
+  if (NULL == db)
+    return Qfalse;
+
+  status = sqlite3_enable_load_extension(db, value == Qtrue ? 1 : 0);
+  if ( status != SQLITE_OK ) {
+    rb_raise(eConnectionError, "Error enabling load extension.");
+  }
+  return Qtrue;
+}
+
+static VALUE cConnection_load_extension(VALUE self, VALUE string) {
+  VALUE connection;
+  sqlite3 *db;
+  const char *extension_name  = rb_str_ptr_readonly(string);
+  char* errmsg;
+  int status;
+
+  connection = rb_iv_get(self, "@connection");
+
+  if (Qnil == connection)
+    return Qfalse;
+
+  db = DATA_PTR(connection);
+
+  if (NULL == db)
+    return Qfalse;
+
+  status = sqlite3_load_extension(db, extension_name, 0, &errmsg);
+  if ( status != SQLITE_OK ) {
+    rb_raise(eConnectionError, "%s", errmsg);
+  }
+  return Qtrue;
+}
+
 static VALUE build_query_from_args(VALUE klass, int count, VALUE *args) {
   VALUE query = rb_iv_get(klass, "@text");
   int i;
@@ -599,6 +671,10 @@ static VALUE cReader_next(VALUE self) {
   VALUE field_type;
   VALUE value;
 
+  if(rb_iv_get(self, "@done") == Qtrue) {
+    return Qfalse;
+  }
+
   Data_Get_Struct(rb_iv_get(self, "@reader"), sqlite3_stmt, reader);
   field_count = NUM2INT(rb_iv_get(self, "@field_count"));
 
@@ -611,6 +687,7 @@ static VALUE cReader_next(VALUE self) {
 
   if ( result != SQLITE_ROW ) {
     rb_iv_set(self, "@values", Qnil);
+    rb_iv_set(self, "@done", Qtrue);
     return Qfalse;
   }
 
@@ -656,6 +733,7 @@ static VALUE cReader_field_count(VALUE self) {
 void Init_do_sqlite3() {
   rb_require("bigdecimal");
   rb_require("date");
+  rb_require("rational");
   rb_require("data_objects");
 
   ID_CONST_GET = rb_intern("const_get");
@@ -702,6 +780,8 @@ void Init_do_sqlite3() {
   rb_define_method(cConnection, "quote_string", cConnection_quote_string, 1);
   rb_define_method(cConnection, "quote_byte_array", cConnection_quote_byte_array, 1);
   rb_define_method(cConnection, "character_set", cConnection_character_set, 0);
+  rb_define_method(cConnection, "enable_load_extension", cConnection_enable_load_extension, 1);
+  rb_define_method(cConnection, "load_extension", cConnection_load_extension, 1);
 
   cCommand = DRIVER_CLASS("Command", cDO_Command);
   rb_define_method(cCommand, "set_types", cCommand_set_types, -1);

data/ext/do_sqlite3/do_sqlite3_extension.c

@@ -75,4 +75,4 @@ void Init_do_sqlite3_extension() {
   cExtension = DRIVER_CLASS("Extension", cDO_Extension);
   rb_define_method(cExtension, "load_extension", cExtension_load_extension, 1);
   rb_define_method(cExtension, "enable_load_extension", cExtension_enable_load_extension, 1);
-}
+}

data/ext/do_sqlite3/extconf.rb

@@ -19,6 +19,8 @@ end
 # Do the work
 # create_makefile(extension_name)
 if have_header( "sqlite3.h" ) && have_library( "sqlite3", "sqlite3_open" )
+  have_func("localtime_r")
+  have_func("gmtime_r")
   have_func("sqlite3_prepare_v2")
   have_func("sqlite3_open_v2")
 

data/lib/do_sqlite3/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Sqlite3
-    VERSION = '0.10.2'
+    VERSION = '0.10.3'
   end
 end

data/spec/error/sql_error_spec.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'data_objects/spec/error/sql_error_spec'
+
+describe 'DataObjects::Sqlite3 raising SQLError' do
+# This fails for now, need to think of a query that also exposes the issue on sqlite :S
+#  behaves_like 'raising a SQLError'
+end

data/spec/spec_helper.rb

@@ -131,6 +131,10 @@ module DataObjectsSpecHelpers
       update widgets set release_timestamp = NULL where id = 9
     EOF
 
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set release_datetime = '2008-07-14 00:31:12' where id = 10
+    EOF
+
     conn.close
   end
 

data/tasks/compile.rake

@@ -56,7 +56,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.2'
+      gem.add_dependency 'do_jdbc',      '0.10.3'
     end
   end
 rescue LoadError

data/tasks/release.rake

@@ -3,7 +3,7 @@ task :build_all do
   `rake clean`
   `rake build`
   `rake java gem`
-  `rake cross native gem RUBY_CC_VERSION=1.8.6:1.9.1`
+  `rake cross native gem RUBY_CC_VERSION=1.8.7:1.9.2`
 end
 
 desc 'Release all gems (native, binaries for JRuby and Windows)'

data/tasks/retrieve.rake

@@ -42,7 +42,7 @@ begin
   end
 
   # download dll binaries
-  file "vendor/sqlitedll-#{BINARY_VERSION}.zip" => ['vendor'] do |t|
+  file "vendor/sqlite-dll-win32-x86-#{BINARY_VERSION}.zip" => ['vendor'] do |t|
     url = "http://www.sqlite.org/#{File.basename(t.name)}"
     when_writing "downloading #{t.name}" do
       cd File.dirname(t.name) do
@@ -56,7 +56,7 @@ begin
     full_file = File.expand_path(t.prerequisites.last)
     when_writing "creating #{t.name}" do
       cd File.dirname(t.name) do
-        sh "unzip #{full_file}"
+        sh "unzip -j #{full_file}"
         # update file timestamp to avoid Rake perform this extraction again.
         touch File.basename(t.name)
       end
@@ -64,11 +64,11 @@ begin
   end
 
   # extract dll files into lib folder
-  file "vendor/sqlite3/lib/sqlite3.dll" => ['vendor/sqlite3/lib', "vendor/sqlitedll-#{BINARY_VERSION}.zip"] do |t|
+  file "vendor/sqlite3/lib/sqlite3.dll" => ['vendor/sqlite3/lib', "vendor/sqlite-dll-win32-x86-#{BINARY_VERSION}.zip"] do |t|
     full_file = File.expand_path(t.prerequisites.last)
     when_writing "creating #{t.name}" do
       cd File.dirname(t.name) do
-        sh "unzip #{full_file}"
+        sh "unzip -j #{full_file}"
         # update file timestamp to avoid Rake perform this extraction again.
         touch File.basename(t.name)
       end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: do_sqlite3
 version: !ruby/object:Gem::Version 
+  hash: 49
   prerelease: false
   segments: 
   - 0
   - 10
-  - 2
-  version: 0.10.2
+  - 3
+  version: 0.10.3
 platform: x86-mingw32
 authors: 
 - Dirkjan Bussink
@@ -14,30 +15,34 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 +02:00
+date: 2011-01-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: data_objects
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 49
         segments: 
         - 0
         - 10
-        - 2
-        version: 0.10.2
+        - 3
+        version: 0.10.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bacon
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 1
@@ -48,13 +53,16 @@ dependencies:
   name: rake-compiler
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         - 7
-        version: "0.7"
+        - 0
+        version: 0.7.0
   type: :development
   version_requirements: *id003
 description: Implements the DataObjects API for Sqlite3
@@ -74,6 +82,7 @@ files:
 - spec/command_spec.rb
 - spec/connection_spec.rb
 - spec/encoding_spec.rb
+- spec/error/sql_error_spec.rb
 - spec/reader_spec.rb
 - spec/result_spec.rb
 - spec/spec_helper.rb
@@ -116,13 +125,13 @@ post_install_message: |+
   =============================================================================
   
     You've installed the binary version of do_sqlite3.
-    It was built using Sqlite3 version 3_6_23_1.
+    It was built using Sqlite3 version 3070400.
     It's recommended to use the exact same version to avoid potential issues.
   
     At the time of building this gem, the necessary DLL files where available
     in the following download:
   
-    http://www.sqlite.org/sqlitedll-3_6_23_1.zip
+    http://www.sqlite.org/sqlitedll-3070400.zip
   
     You can put the sqlite3.dll available in this package in your Ruby bin
     directory, for example C:\Ruby\bin
@@ -134,23 +143,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: dorb
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: DataObjects Sqlite3 Driver
@@ -158,6 +171,7 @@ test_files:
 - spec/command_spec.rb
 - spec/connection_spec.rb
 - spec/encoding_spec.rb
+- spec/error/sql_error_spec.rb
 - spec/reader_spec.rb
 - spec/result_spec.rb
 - spec/spec_helper.rb