rdbi-driver-mysql 0.9.1 → 0.9.2

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

data/lib/rdbi-driver-mysql.rb

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

data/lib/rdbi/driver/mysql.rb

@@ -144,11 +144,16 @@ class RDBI::Driver::MySQL < RDBI::Driver
     end
 
     def table_schema( table_name )
-      info_row = execute(
+      info_row = nil
+
+      execute(
         "SELECT table_type FROM information_schema.tables WHERE table_schema = ? and table_name = ?",
         self.database_name,
         table_name.to_s
-      ).fetch( :first )
+      ) do |res|
+        info_row = res.fetch(1)[0]
+      end
+
       if info_row.nil?
         return nil
       end
@@ -166,14 +171,16 @@ class RDBI::Driver::MySQL < RDBI::Driver
       execute( "SELECT column_name, data_type, is_nullable FROM information_schema.columns WHERE table_schema = ? and table_name = ?",
         self.database_name,
         table_name.to_s
-      ).fetch( :all ).each do |row|
-        col = RDBI::Column.new
-        col.name       = row[0].to_sym
-        col.type       = row[1].to_sym
-        # TODO: ensure this ruby_type is solid, especially re: dates and times
-        col.ruby_type  = row[1].to_sym
-        col.nullable   = row[2] == "YES"
-        sch.columns << col
+      ) do |res|
+          res.fetch( :all ).each do |row|
+            col = RDBI::Column.new
+            col.name       = row[0].to_sym
+            col.type       = row[1].to_sym
+            # TODO: ensure this ruby_type is solid, especially re: dates and times
+            col.ruby_type  = row[1].to_sym
+            col.nullable   = row[2] == "YES"
+            sch.columns << col
+          end
       end
 
       sch
@@ -181,10 +188,11 @@ class RDBI::Driver::MySQL < RDBI::Driver
 
     def schema
       schemata = []
-      execute( "SELECT table_name FROM information_schema.tables where table_schema = ?", self.database_name ).fetch( :all ).each do |row|
-        schemata << table_schema( row[0] )
+      execute( "SELECT table_name FROM information_schema.tables where table_schema = ?", self.database_name ) do |res| 
+        schemata = res.fetch( :all )
       end
-      schemata
+
+      schemata.collect { |x| table_schema(x[0]) }
     end
 
     def ping
@@ -249,11 +257,11 @@ class RDBI::Driver::MySQL < RDBI::Driver
       if @array_handle
         @array_handle.first
       else
-        cnt = @handle.row_tell
+        cur = @handle.row_tell
         @handle.data_seek(0)
         res = @handle.fetch
-        @handle.data_seek(cnt)
-        res
+        @handle.row_seek(cur)
+        return res
       end
     end
 
@@ -261,21 +269,33 @@ class RDBI::Driver::MySQL < RDBI::Driver
       if @array_handle
         @array_handle.last
       else
-        cnt = @handle.row_tell
-        @handle.data_seek(@handle.num_rows)
+        #raise RDBI::Cursor::NotRewindableError, "last requires a rewindable result in mysql"
+        cur = @handle.row_tell
+        @handle.data_seek(@handle.num_rows - 1)
         res = @handle.fetch
-        @handle.data_seek(cnt)
-        res
+        @handle.row_seek(cur)
+        return res
       end
     end
 
     def rest
-      oindex, @index = [@index, @handle.num_rows] rescue [@index, @array_handle.size]
+      oindex = nil
+
+      if @array_handle
+        oindex, @index = @index, @array_handle.size
+      else
+        oindex, @index = @index, @handle.num_rows
+      end
+
       fetch_range(oindex, @index)
     end
 
     def all
-      fetch_range(0, (@handle.num_rows rescue @array_handle.size))
+      if @array_handle
+        fetch_range(0, @array_handle.size)
+      else
+        fetch_range(0, @handle.num_rows)
+      end
     end
 
     def [](index)
@@ -286,7 +306,7 @@ class RDBI::Driver::MySQL < RDBI::Driver
       if @array_handle
         @index == @array_handle.size
       else
-        @handle.eof?
+        @index == @handle.num_rows
       end
     end
 
@@ -298,7 +318,11 @@ class RDBI::Driver::MySQL < RDBI::Driver
     end
 
     def empty?
-      @array_handle.empty?
+      if @array_handle
+        @array_handle.empty?
+      else
+        @handle.num_rows == 0
+      end
     end
 
     def finish
@@ -319,14 +343,16 @@ class RDBI::Driver::MySQL < RDBI::Driver
 
     def fetch_range(start, stop)
       if @array_handle
-        @array_handle[start, stop]
+        return @array_handle[start, stop]
       else
         ary = []
 
         @handle.data_seek(start)
         (stop - start).times do 
-          @handle.fetch
+          ary.push @handle.fetch
         end
+
+        return ary
       end
     end
   end
@@ -350,6 +376,23 @@ class RDBI::Driver::MySQL < RDBI::Driver
       @output_type_map = RDBI::Type.create_type_hash( RDBI::Type::Out )
 
       manipulate_type_maps
+
+      prep_finalizer { @my_query.close rescue nil }
+    end
+
+    def new_modification(*binds)
+      # 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
+
+      res = @my_query.execute(*binds)
+
+      return res.affected_rows
     end
 
     def new_execution(*binds)
@@ -384,11 +427,6 @@ class RDBI::Driver::MySQL < RDBI::Driver
       [ Cursor.new(res), schema, @output_type_map ]
     end
 
-    def finish
-      @my_query.close rescue nil
-      super
-    end
-
     protected
 
     def map_type(col)
@@ -405,23 +443,23 @@ class RDBI::Driver::MySQL < RDBI::Driver
       # XXX yep. slow as snot.
       datetime_conv  = proc { |x| DateTime.parse(x.to_s + " #{zone}") }
 
-      @output_type_map[:datetime] = RDBI::Type.filterlist(TypeLib::Filter.new(datetime_check, datetime_conv))
+      @output_type_map[:datetime] = [TypeLib::Filter.new(datetime_check, datetime_conv)]
 
-      @input_type_map[TrueClass] = TypeLib::Filter.new(
+      @input_type_map[TrueClass] = [TypeLib::Filter.new(
         RDBI::Type::Checks::IS_BOOLEAN,
         proc { |x| 1 }
-      )
+      )]
       
-      @input_type_map[FalseClass] = TypeLib::Filter.new(
+      @input_type_map[FalseClass] = [TypeLib::Filter.new(
         RDBI::Type::Checks::IS_BOOLEAN,
         proc { |x| 0 }
-      )
+      )]
 
       if dbh.cast_booleans
-        boolean_filter = TypeLib::Filter.new(
+        boolean_filter = [TypeLib::Filter.new(
           proc { |x| x == 1 or x == 0 }, 
           proc { |x| x == 1 }
-        )
+        )]
 
         @output_type_map[:boolean] = boolean_filter
       end

data/rdbi-driver-mysql.gemspec

@@ -0,0 +1,71 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{rdbi-driver-mysql}
+  s.version = "0.9.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Erik Hollensbe"]
+  s.date = %q{2010-12-10}
+  s.description = %q{mysql gem-based driver for RDBI}
+  s.email = %q{erik@hollensbe.org}
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/rdbi-driver-mysql.rb",
+    "lib/rdbi/driver/mysql.rb",
+    "rdbi-driver-mysql.gemspec",
+    "test/helper.rb",
+    "test/test_connect.rb",
+    "test/test_database.rb",
+    "test/test_statement.rb",
+    "test/test_types.rb"
+  ]
+  s.homepage = %q{http://github.com/RDBI/rdbi-driver-mysql}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{mysql gem-based driver for RDBI}
+  s.test_files = [
+    "test/helper.rb",
+    "test/test_connect.rb",
+    "test/test_database.rb",
+    "test/test_statement.rb",
+    "test/test_types.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rdbi>, [">= 0"])
+      s.add_runtime_dependency(%q<mysql>, [">= 2.8.1"])
+      s.add_development_dependency(%q<test-unit>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
+      s.add_development_dependency(%q<rdbi-dbrc>, [">= 0"])
+    else
+      s.add_dependency(%q<rdbi>, [">= 0"])
+      s.add_dependency(%q<mysql>, [">= 2.8.1"])
+      s.add_dependency(%q<test-unit>, [">= 0"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
+      s.add_dependency(%q<rdbi-dbrc>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rdbi>, [">= 0"])
+    s.add_dependency(%q<mysql>, [">= 2.8.1"])
+    s.add_dependency(%q<test-unit>, [">= 0"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
+    s.add_dependency(%q<rdbi-dbrc>, [">= 0"])
+  end
+end
+

data/test/test_database.rb

@@ -29,27 +29,26 @@ class TestDatabase < Test::Unit::TestCase
   
   def test_03_execute
     self.dbh = init_database
-    res = dbh.execute( "insert into foo (bar) values (?)", 1 )
-    assert res
-    assert_kind_of( RDBI::Result, res )
-    assert_equal( 1, res.affected_count )
+    assert_equal(1, dbh.execute_modification( "insert into foo (bar) values (?)", 1 ))
 
-    res = dbh.execute( "select * from foo" )
-    assert res
-    assert_kind_of( RDBI::Result, res )
-    assert_equal( [[1]], res.fetch(:all) )
+    dbh.execute( "select * from foo" ) do |res|
+      assert res
+      assert_kind_of( RDBI::Result, res )
+      assert_equal( [[1]], res.fetch(:all) )
 
-    rows = res.as( :Struct ).fetch( :all )
-    row = rows[ 0 ]
-    assert_equal( 1, row.bar )
+      rows = res.as( :Struct ).fetch( :all )
+      row = rows[ 0 ]
+      assert_equal( 1, row.bar )
+    end
   end
 
   def test_04_transaction
     self.dbh = init_database
+    dbh.rewindable_result = true
 
     dbh.transaction do
       assert dbh.in_transaction?
-      5.times { dbh.execute( "insert into foo (bar) values (?)", 1 ) }
+      5.times { dbh.execute_modification( "insert into foo (bar) values (?)", 1 ) }
       dbh.rollback
       assert ! dbh.in_transaction?
     end
@@ -60,7 +59,7 @@ class TestDatabase < Test::Unit::TestCase
 
     dbh.transaction do
       assert dbh.in_transaction?
-      5.times { dbh.execute("insert into foo (bar) values (?)", 1) }
+      5.times { dbh.execute_modification("insert into foo (bar) values (?)", 1) }
       assert_equal( [[1]] * 5, dbh.execute("select * from foo").fetch(:all) )
       dbh.commit
       assert ! dbh.in_transaction?
@@ -100,7 +99,7 @@ class TestDatabase < Test::Unit::TestCase
   def test_06_schema
     self.dbh = init_database
 
-    dbh.execute( "insert into bar (foo, bar) values (?, ?)", "foo", 1 )
+    dbh.execute_modification( "insert into bar (foo, bar) values (?, ?)", "foo", 1 )
     res = dbh.execute( "select * from bar" )
 
     assert res

data/test/test_statement.rb

@@ -17,6 +17,35 @@ class TestStatement < Test::Unit::TestCase
     sth.execute(1)
     # FIXME affected rows
     sth.finish
-    assert_equal([[1]], dbh.execute("select * from integer_test").fetch(:all))
+
+    dbh.execute("select * from integer_test") do |res|
+      assert_equal([[1]], res.fetch(:all))
+    end
+  end
+
+  def test_03_rewindables
+
+    dbh.execute("select * from integer_test") do |res|
+      assert(res.empty?)
+    end
+
+    sth = dbh.prepare("insert into integer_test (id) values (?)")
+    sth.execute(1)
+    sth.execute(2)
+    sth.finish
+
+    sth = dbh.prepare("select * from integer_test")
+    res = sth.execute
+
+    assert_equal([1], res.fetch(:first))
+    assert_equal([2], res.fetch(:last))
+    assert_equal([[1], [2]], res.fetch(:rest))
+    assert_equal([], res.fetch(:rest))
+
+    res.rewind
+    
+    assert_equal([[1], [2]], res.fetch(:rest))
+
+    sth.finish
   end
 end

data/test/test_types.rb

@@ -1,6 +1,12 @@
 require 'helper'
 
 class TestTypes < Test::Unit::TestCase
+
+  def setup
+    super
+    dbh.rewindable_result = true
+  end
+
   def test_01_booleans
     dbh.cast_booleans = true
     res = dbh.execute( "SELECT true" )

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rdbi-driver-mysql
 version: !ruby/object:Gem::Version 
-  hash: 57
   prerelease: false
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 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: 45
         segments: 
         - 2
         - 8
@@ -56,7 +53,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -70,7 +66,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -84,7 +79,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -101,12 +95,13 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
+- lib/rdbi-driver-mysql.rb
 - lib/rdbi/driver/mysql.rb
+- rdbi-driver-mysql.gemspec
 - test/helper.rb
 - test/test_connect.rb
 - test/test_database.rb
@@ -117,8 +112,8 @@ homepage: http://github.com/RDBI/rdbi-driver-mysql
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -126,7 +121,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -135,7 +129,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC