rdbi-driver-sqlite3 0.9.0 → 0.9.1

data/Rakefile

@@ -17,7 +17,7 @@ begin
     gem.add_development_dependency 'rdoc'
 
     gem.add_dependency 'rdbi'
-    gem.add_dependency 'sqlite3-ruby', '= 1.3.1'
+    gem.add_dependency 'sqlite3-ruby', '~> 1.3'
     gem.add_dependency 'methlab'
     gem.add_dependency 'epoxy', '>= 0.3.1'
 

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.9.1

data/lib/rdbi-driver-sqlite3.rb

@@ -0,0 +1,2 @@
+require 'rdbi'
+require 'rdbi/driver/sqlite3'

data/lib/rdbi/driver/sqlite3.rb

@@ -2,7 +2,6 @@ require 'rdbi'
 require 'epoxy'
 require 'methlab'
 
-gem 'sqlite3-ruby', '= 1.3.1'
 require 'sqlite3'
 
 class RDBI::Driver::SQLite3 < RDBI::Driver
@@ -130,6 +129,7 @@ class RDBI::Driver::SQLite3 < RDBI::Driver
     end
 
     def result_count
+      return 0 unless rewindable_result
       coerce_to_array
       @array_handle.size
     end
@@ -153,14 +153,24 @@ class RDBI::Driver::SQLite3 < RDBI::Driver
     end
 
     def rest
-      coerce_to_array
-      oindex, @index = @index, @array_handle.size
-      @array_handle[oindex, @index]
+      if rewindable_result
+        rewind
+        coerce_to_array
+        oindex, @index = @index, @array_handle.size
+        @array_handle[oindex, @index]
+      else
+        @handle.to_a
+      end
     end
 
     def all
-      coerce_to_array
-      @array_handle.dup
+      if rewindable_result
+        rewind
+        coerce_to_array
+        @array_handle
+      else
+        @handle.to_a
+      end
     end
 
     def [](index)
@@ -177,6 +187,8 @@ class RDBI::Driver::SQLite3 < RDBI::Driver
     end
 
     def rewind
+      # FIXME better exception
+      raise StandardError, "rewindable_result is not true" unless rewindable_result
       @index = 0
       @handle.reset unless @handle.closed?
     end
@@ -191,8 +203,10 @@ class RDBI::Driver::SQLite3 < RDBI::Driver
     end
     
     def coerce_to_array
-      unless @array_handle
+      unless @coerced 
+        rewind
         @array_handle = @handle.to_a
+        @coerced = true
       end
     end
   end
@@ -202,6 +216,16 @@ class RDBI::Driver::SQLite3 < RDBI::Driver
 
     attr_accessor :handle
 
+    class << self
+      def input_type_map  
+        @input_type_map  ||= RDBI::Type.create_type_hash(RDBI::Type::In)
+      end
+
+      def output_type_map
+        @output_type_map ||= RDBI::Type.create_type_hash(RDBI::Type::Out)
+      end
+    end
+
     def initialize(query, dbh)
       super
 
@@ -214,25 +238,22 @@ class RDBI::Driver::SQLite3 < RDBI::Driver
       query = ep.quote(@index_map.compact.inject({}) { |x,y| x.merge({ y => nil }) }) { '?' }
 
       @handle = check_exception { dbh.handle.prepare(query) }
-      @input_type_map  = RDBI::Type.create_type_hash(RDBI::Type::In)
-      @output_type_map = RDBI::Type.create_type_hash(RDBI::Type::Out)
+      @input_type_map  = self.class.input_type_map 
+      @output_type_map = self.class.output_type_map
+
+      prep_finalizer { @handle.close unless @handle.closed? }
     end
 
-    def new_execution(*binds)
+    def new_modification(*binds)
+      binds = RDBI::Util.index_binds(binds, @index_map) 
 
-      # XXX is there a patron saint of being too clever? I don't like this
-      # code.
-      
-      # FIXME move to RDBI::Util or something.
-      hashes, binds = binds.partition { |x| x.kind_of?(Hash) }
-      hash = hashes.inject({}) { |x, y| x.merge(y) }
-      hash.keys.each do |key| 
-        if index = @index_map.index(key)
-          binds.insert(index, hash[key])
-        end
-      end
+      rs = check_exception { @handle.execute(*binds) }
 
-      # but this code is still ok.
+      return 0
+    end
+
+    def new_execution(*binds)
+      binds = RDBI::Util.index_binds(binds, @index_map)
 
       rs = check_exception { @handle.execute(*binds) }
 
@@ -252,11 +273,6 @@ class RDBI::Driver::SQLite3 < RDBI::Driver
       return Cursor.new(rs), this_schema, @output_type_map
     end
 
-    def finish
-      @handle.close rescue nil
-      super
-    end
-
     protected
 
     def check_exception(&block)

data/rdbi-driver-sqlite3.gemspec

@@ -1,41 +1,40 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rdbi-driver-sqlite3}
-  s.version = "0.9.0"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Erik Hollensbe"]
-  s.date = %q{2010-08-21}
+  s.date = %q{2010-12-10}
   s.description = %q{sqlite3 driver for RDBI}
   s.email = %q{erik@hollensbe.org}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/rdbi/driver/sqlite3.rb",
-     "rdbi-driver-sqlite3.gemspec",
-     "test/helper.rb",
-     "test/test_database.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/rdbi-driver-sqlite3.rb",
+    "lib/rdbi/driver/sqlite3.rb",
+    "rdbi-driver-sqlite3.gemspec",
+    "test/helper.rb",
+    "test/test_database.rb"
   ]
   s.homepage = %q{http://github.com/RDBI/rdbi-driver-sqlite3}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{sqlite3 driver for RDBI}
   s.test_files = [
     "test/helper.rb",
-     "test/test_database.rb"
+    "test/test_database.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -46,14 +45,14 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<test-unit>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_runtime_dependency(%q<rdbi>, [">= 0"])
-      s.add_runtime_dependency(%q<sqlite3-ruby>, ["= 1.3.1"])
+      s.add_runtime_dependency(%q<sqlite3-ruby>, ["~> 1.3"])
       s.add_runtime_dependency(%q<methlab>, [">= 0"])
       s.add_runtime_dependency(%q<epoxy>, [">= 0.3.1"])
     else
       s.add_dependency(%q<test-unit>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<rdbi>, [">= 0"])
-      s.add_dependency(%q<sqlite3-ruby>, ["= 1.3.1"])
+      s.add_dependency(%q<sqlite3-ruby>, ["~> 1.3"])
       s.add_dependency(%q<methlab>, [">= 0"])
       s.add_dependency(%q<epoxy>, [">= 0.3.1"])
     end
@@ -61,7 +60,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<test-unit>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<rdbi>, [">= 0"])
-    s.add_dependency(%q<sqlite3-ruby>, ["= 1.3.1"])
+    s.add_dependency(%q<sqlite3-ruby>, ["~> 1.3"])
     s.add_dependency(%q<methlab>, [">= 0"])
     s.add_dependency(%q<epoxy>, [">= 0.3.1"])
   end

data/test/test_database.rb

@@ -226,43 +226,7 @@ class TestDatabase < Test::Unit::TestCase
     sth.finish
   end
 
-  def test_12_multiple_fields
-    self.dbh = init_database
-    sth = dbh.prepare("insert into multi_fields (foo, bar) values (?, ?)")
-    sth.execute(1, "foo")
-    sth.execute(2, "bar")
-    sth.finish
-
-    sth = dbh.prepare("select foo, bar from multi_fields")
-    res = sth.execute
-
-    assert(res)
-
-    assert_equal(2, res.fetch(:all).length)
-    assert_equal(2, res.fetch(:all)[0].length)
-
-    assert_equal([1, "foo"], res.fetch(1)[0])
-    assert_equal([2, "bar"], res.fetch(1)[0])
-    sth.finish
-
-    res = dbh.execute("select foo, bar from multi_fields where foo = ? and bar = ?bar", 1, { :bar => "foo" })
-    assert(res)
-    assert_equal([[1, "foo"]], res.fetch(:all))
-    
-    res = dbh.execute("select foo, bar from multi_fields where foo = ? and bar = ?bar", { :bar => "foo" }, 1)
-    assert(res)
-    assert_equal([[1, "foo"]], res.fetch(:all))
-    
-    res = dbh.execute("select foo, bar from multi_fields where foo = ?foo and bar = ?bar", { :foo => 1, :bar => "foo" })
-    assert(res)
-    assert_equal([[1, "foo"]], res.fetch(:all))
-    
-    res = dbh.execute("select foo, bar from multi_fields where foo = ?foo and bar = ?", { :foo => 1 }, "foo")
-    assert(res)
-    assert_equal([[1, "foo"]], res.fetch(:all))
-  end
-
-  def test_13_reconnection
+  def test_12_reconnection
     self.dbh = init_database
 
     assert_nothing_raised do
@@ -272,13 +236,11 @@ class TestDatabase < Test::Unit::TestCase
     end
 
     sth = dbh.prepare("select 1")
-    $stderr.puts "You should see the next warning exactly once"
-    dbh.reconnect
-    dbh.disconnect
     dbh.reconnect
+    assert sth.finished?
   end
 
-  def test_14_aggregates
+  def test_13_aggregates
     self.dbh = init_database
 
     res = dbh.execute("select count(*) from multi_fields")

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rdbi-driver-sqlite3
 version: !ruby/object:Gem::Version 
-  hash: 59
   prerelease: false
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Erik Hollensbe
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-21 00:00:00 -04:00
+date: 2010-12-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -40,7 +38,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -54,7 +51,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -66,14 +62,12 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
         segments: 
         - 1
         - 3
-        - 1
-        version: 1.3.1
+        version: "1.3"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -84,7 +78,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -98,7 +91,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
         - 0
         - 3
@@ -117,11 +109,11 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
+- lib/rdbi-driver-sqlite3.rb
 - lib/rdbi/driver/sqlite3.rb
 - rdbi-driver-sqlite3.gemspec
 - test/helper.rb
@@ -131,8 +123,8 @@ homepage: http://github.com/RDBI/rdbi-driver-sqlite3
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -140,7 +132,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -149,7 +140,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"

data/.gitignore

@@ -1,24 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-doc
-.yardoc
-rdbi-dbd-sqlite3.gemspec
-
-## PROJECT::SPECIFIC