sqlite3-ruby 1.2.1 → 1.2.2

data/test/tc_errors.rb

@@ -1,46 +1,13 @@
-#--
-# =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# 
-#     * Redistributions of source code must retain the above copyright notice,
-#       this list of conditions and the following disclaimer.
-# 
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-# 
-#     * The names of its contributors may not be used to endorse or promote
-#       products derived from this software without specific prior written
-#       permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# =============================================================================
-#++
-
 $:.unshift "../lib"
 
 require 'sqlite3/errors'
 require 'test/unit'
-require 'flexmock'
+require 'mocha'
 
 class TC_Errors < Test::Unit::TestCase
   (1..26).each do |code|
     define_method( "test_error_code_%02d" % code ) do
-      db = FlexMock.new
-      db.mock_handle( :errmsg ) { "message" }
+      db = stub('database', :errmsg => 'message')
       begin
         SQLite3::Error.check( code, db )
       rescue SQLite3::Exception => e

data/test/tc_integration.rb

@@ -4,6 +4,7 @@ $:.unshift "#{File.dirname(__FILE__)}/../ext/sqlite3_api"
 require 'test/unit'
 require 'benchmark'
 require 'sqlite3/database'
+require 'thread'
 
 class String
   def to_utf16(terminate=false)
@@ -27,8 +28,8 @@ module Integration
 
     # == TC_OpenClose =========================================================
 
-    test_case = Class.new( Test::Unit::TestCase ) do 
-      define_method( "test_create_close" ) do 
+    test_case = Class.new( Test::Unit::TestCase ) do
+      define_method( "test_create_close" ) do
         begin
           db = SQLite3::Database.new( "test-create.db",
             :driver => driver )
@@ -39,7 +40,7 @@ module Integration
         end
       end
 
-      define_method( "test_open_close" ) do 
+      define_method( "test_open_close" ) do
         begin
           File.open( "test-open.db", "w" ) { |f| }
           assert File.exist?( "test-open.db" )
@@ -51,7 +52,7 @@ module Integration
         end
       end
 
-      define_method( "test_bad_open" ) do 
+      define_method( "test_bad_open" ) do
         assert_raise( SQLite3::CantOpenException ) do
           SQLite3::Database.new( ".", :driver => driver )
         end
@@ -61,7 +62,7 @@ module Integration
 
     # == TC_Database ==========================================================
 
-    test_case = Class.new( Test::Unit::TestCase ) do 
+    test_case = Class.new( Test::Unit::TestCase ) do
       define_method( "setup" ) do
         @db = SQLite3::Database.new( "test.db", :driver=>driver )
         @db.transaction do
@@ -93,6 +94,17 @@ module Integration
         end
       end
 
+      define_method( "test_table_info_without_defaults_for_version_3_3_8_and_higher" ) do
+        @db.transaction do
+          @db.execute "create table no_defaults_test ( a integer default 1, b integer )"
+          data = @db.table_info( "no_defaults_test" )
+          assert_equal({"name" => "a", "type" => "integer", "dflt_value" => "1", "notnull" => "0", "cid" => "0", "pk" => "0"},
+            data[0])
+          assert_equal({"name" => "b", "type" => "integer", "dflt_value" => nil, "notnull" => "0", "cid" => "1", "pk" => "0"},
+            data[1])
+        end
+      end
+
       define_method( "test_complete_fail" ) do
         assert !@db.complete?( "select * from foo" )
       end
@@ -244,7 +256,7 @@ module Integration
           assert [ "a", "b" ], row unless called == 0
           called += 1
         end
-        assert_equal 1, called 
+        assert_equal 1, called
       end
 
       define_method( "test_execute2_no_block_with_bind_no_match" ) do
@@ -519,83 +531,93 @@ module Integration
       end
 
       define_method( "test_busy_handler_outwait" ) do
-        begin
-          db2 = SQLite3::Database.open( "test.db", :driver=>driver )
-          handler_call_count = 0
-          db2.busy_handler do |data,count|
-            handler_call_count += 1
-            sleep 0.5
-            1
-          end
-
-          t = Thread.new do
-            @db.transaction( :exclusive ) do
-              sleep 0.3
+        busy = Mutex.new
+        busy.lock
+        handler_call_count = 0
+
+        t = Thread.new do
+          begin
+            db2 = SQLite3::Database.open( "test.db", :driver=>driver )
+            db2.transaction( :exclusive ) do
+              busy.lock
             end
+          ensure
+            db2.close if db2
           end
+        end
 
-          assert_nothing_raised do
-            db2.execute "insert into foo (b) values ( 'from 2' )"
-          end
-
-          assert_equal 1, handler_call_count
+        @db.busy_handler do |data,count|
+          handler_call_count += 1
+          busy.unlock
+          true
+        end
 
-          t.join
-        ensure
-          db2.close if db2
+        assert_nothing_raised do
+          @db.execute "insert into foo (b) values ( 'from 2' )"
         end
+
+        t.join
+
+        assert_equal 1, handler_call_count
       end
 
       define_method( "test_busy_handler_impatient" ) do
-        begin
-          db2 = SQLite3::Database.open( "test.db", :driver=>driver )
-          handler_call_count = 0
-          db2.busy_handler do |data,count|
-            handler_call_count += 1
-            sleep 0.1
-            0
-          end
-
-          t = Thread.new do
-            @db.transaction( :exclusive ) do
-              sleep 0.2
+        busy = Mutex.new
+        busy.lock
+        handler_call_count = 0
+
+        t = Thread.new do
+          begin
+            db2 = SQLite3::Database.open( "test.db", :driver=>driver )
+            db2.transaction( :exclusive ) do
+              busy.lock
             end
+          ensure
+            db2.close if db2
           end
+        end
 
-          assert_raise( SQLite3::BusyException ) do
-            db2.execute "insert into foo (b) values ( 'from 2' )"
-          end
-
-          assert_equal 1, handler_call_count
+        @db.busy_handler do |data, count|
+          handler_call_count += 1
+          false
+        end
 
-          t.join
-        ensure
-          db2.close if db2
+        assert_raise( SQLite3::BusyException ) do
+          @db.execute "insert into foo (b) values ( 'from 2' )"
         end
+
+        busy.unlock
+        t.join
+
+        assert_equal 1, handler_call_count
       end
 
       define_method( "test_busy_timeout" ) do
-        begin
-          db2 = SQLite3::Database.open( "test.db", :driver=>driver )
-          db2.busy_timeout 300
-
-          t = Thread.new do
-            @db.transaction( :exclusive ) do
-              sleep 0.1
+        @db.busy_timeout 1000
+        busy = Mutex.new
+        busy.lock
+
+        t = Thread.new do
+          begin
+            db2 = SQLite3::Database.open( "test.db", :driver=>driver )
+            db2.transaction( :exclusive ) do
+              busy.lock
             end
+          ensure
+            db2.close if db2
           end
+        end
 
-          time = Benchmark.measure do
-            assert_raise( SQLite3::BusyException ) do
-              db2.execute "insert into foo (b) values ( 'from 2' )"
-            end
+        time = Benchmark.measure do
+          assert_raise( SQLite3::BusyException ) do
+            @db.execute "insert into foo (b) values ( 'from 2' )"
           end
-          assert time.real*1000 >= 300
-
-          t.join
-        ensure
-          db2.close if db2
         end
+
+        busy.unlock
+        t.join
+
+        assert time.real*1000 >= 1000
       end
 
       define_method( "test_create_function" ) do
@@ -679,7 +701,7 @@ module Integration
 
     # == TC_Statement =========================================================
 
-    test_case = Class.new( Test::Unit::TestCase ) do 
+    test_case = Class.new( Test::Unit::TestCase ) do
       define_method( "setup" ) do
         @db = SQLite3::Database.new( "test.db", :driver=>driver )
         @db.transaction do
@@ -876,7 +898,7 @@ module Integration
 
     # == TC_ResultSet =========================================================
 
-    test_case = Class.new( Test::Unit::TestCase ) do 
+    test_case = Class.new( Test::Unit::TestCase ) do
       define_method( "setup" ) do
         @db = SQLite3::Database.new( "test.db", :driver=>driver )
         @db.transaction do
@@ -948,6 +970,32 @@ module Integration
         end
       end
 
+      define_method( "test_type_translation_with_null_column" ) do
+        @db.type_translation = true
+        @db.execute "create table bar ( a integer, b time, c string )"
+        @db.execute "insert into bar (a, b, c) values (NULL, '1974-07-25 14:39:00', 'hello')"
+        @db.execute "insert into bar (a, b, c) values (1, NULL, 'hello')"
+        @db.execute "insert into bar (a, b, c) values (2, '1974-07-25 14:39:00', NULL)"
+        @db.query( "select * from bar" ) do |result|
+          assert_equal [nil, Time.local(1974, 7, 25, 14, 39, 0), 'hello'], result.next
+          assert_equal [1, nil, 'hello'], result.next
+          assert_equal [2, Time.local(1974, 7, 25, 14, 39, 0), nil], result.next
+        end
+      end
+
+      define_method( "test_date_and_time_translation" ) do
+        @db.type_translation = true
+        @db.execute "create table bar ( a date, b datetime, c time, d timestamp )"
+        @db.execute "insert into bar (a, b, c, d) values ('1999-01-08', '1997-12-17 07:37:16', '07:37:16', '2004-10-19 10:23:54')"
+        @db.query( "select * from bar" ) do |result|
+          result = result.next
+          assert result[0].is_a?(Date)
+          assert result[1].is_a?(DateTime)
+          assert result[2].is_a?(Time)
+          assert result[3].is_a?(Time)
+        end
+      end
+
       define_method( "test_next_results_as_hash" ) do
         @db.results_as_hash = true
         @result.reset( 1 )

data/test/tests.rb

@@ -1,36 +1,6 @@
-#--
-# =============================================================================
-# Copyright (c) 2004, Jamis Buck (jgb3@email.byu.edu)
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# 
-#     * Redistributions of source code must retain the above copyright notice,
-#       this list of conditions and the following disclaimer.
-# 
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-# 
-#     * The names of its contributors may not be used to endorse or promote
-#       products derived from this software without specific prior written
-#       permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-# =============================================================================
-#++
-
-
 Dir.chdir File.dirname( __FILE__ )
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../ext/sqlite3_api"
+p $LOAD_PATH
+
 Dir["**/tc_*.rb"].each { |file| load file }

metadata

@@ -1,33 +1,26 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: sqlite3-ruby
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
-date: 2007-02-03 00:00:00 -07:00
-summary: SQLite3/Ruby is a module to allow Ruby scripts to interface with a SQLite3 database.
-require_paths: 
-- lib
-email: jamis@37signals.com
-homepage: http://sqlite-ruby.rubyforge.org/sqlite3
-rubyforge_project: 
-description: 
-autorequire: sqlite3
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.8.0
-  version: 
+  version: 1.2.2
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Jamis Buck
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-05-31 00:00:00 -06:00
+default_executable: 
+dependencies: []
+
+description: 
+email: jamis@37signals.com
+executables: []
+
+extensions: 
+- ext/sqlite3_api/extconf.rb
+extra_rdoc_files: 
+- README.rdoc
 files: 
 - doc/faq
 - doc/faq/faq.html
@@ -35,17 +28,20 @@ files:
 - doc/faq/faq.yml
 - ext/sqlite3_api
 - ext/sqlite3_api/extconf.rb
-- ext/sqlite3_api/Makefile
 - ext/sqlite3_api/MANIFEST
 - ext/sqlite3_api/sqlite3_api.i
 - ext/sqlite3_api/sqlite3_api_wrap.c
 - ext/sqlite3_api/win32
 - ext/sqlite3_api/win32/build.bat
 - lib/sqlite3
-- lib/sqlite3.rb
 - lib/sqlite3/constants.rb
 - lib/sqlite3/database.rb
 - lib/sqlite3/driver
+- lib/sqlite3/driver/dl
+- lib/sqlite3/driver/dl/api.rb
+- lib/sqlite3/driver/dl/driver.rb
+- lib/sqlite3/driver/native
+- lib/sqlite3/driver/native/driver.rb
 - lib/sqlite3/errors.rb
 - lib/sqlite3/pragmas.rb
 - lib/sqlite3/resultset.rb
@@ -53,34 +49,44 @@ files:
 - lib/sqlite3/translator.rb
 - lib/sqlite3/value.rb
 - lib/sqlite3/version.rb
-- lib/sqlite3/driver/dl
-- lib/sqlite3/driver/native
-- lib/sqlite3/driver/dl/api.rb
-- lib/sqlite3/driver/dl/driver.rb
-- lib/sqlite3/driver/native/driver.rb
+- lib/sqlite3.rb
 - test/bm.rb
 - test/driver
+- test/driver/dl
+- test/driver/dl/tc_driver.rb
 - test/mocks.rb
 - test/native-vs-dl.rb
 - test/tc_database.rb
 - test/tc_errors.rb
 - test/tc_integration.rb
 - test/tests.rb
-- test/driver/dl
-- test/driver/dl/tc_driver.rb
-- README
-test_files: 
-- test/tests.rb
+- README.rdoc
+has_rdoc: true
+homepage: http://sqlite-ruby.rubyforge.org/sqlite3
+post_install_message: 
 rdoc_options: 
 - --main
-- README
-extra_rdoc_files: 
-- README
-executables: []
-
-extensions: 
-- ext/sqlite3_api/extconf.rb
+- README.rdoc
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: 1.8.0
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: 
+rubygems_version: 1.1.1
+signing_key: 
+specification_version: 2
+summary: SQLite3/Ruby is a module to allow Ruby scripts to interface with a SQLite3 database.
+test_files: 
+- test/tests.rb