dbd-mysql 0.3.3 → 0.4.0

data/lib/dbd/Mysql.rb

@@ -49,7 +49,7 @@ module DBI
         # Only things that extend DBI's results are documented.
         #
         module Mysql
-            VERSION          = "0.3.3"
+            VERSION          = "0.4.0"
             DESCRIPTION      = "MySQL DBI DBD, Leverages 'mysql' low-level driver"
 
             MyError = ::MysqlError

data/lib/dbd/mysql/database.rb

@@ -181,7 +181,7 @@ module DBI::DBD::Mysql
             uniques = []
             dbh.execute("SHOW INDEX FROM #{table}") do |sth|
                 sth.each do |row|
-                    uniques << row[4] if row[1] == "0"
+                    uniques << row[4] if row[1] == 0
                 end
             end  
 

data/lib/dbd/mysql/statement.rb

@@ -128,7 +128,7 @@ module DBI::DBD::Mysql
             # is set only by mysql_list_fields()
 
             @res_handle.fetch_fields.each {|col| 
-                mysql_type_name = Database::TYPE_MAP[col.type][0] rescue nil
+                mysql_type_name, dbi_type = Database::TYPE_MAP[col.type] rescue [nil, nil]
                 xopen_info = Database::MYSQL_to_XOPEN[mysql_type_name] ||
                     Database::MYSQL_to_XOPEN[nil]
                 sql_type = xopen_info[0]
@@ -158,6 +158,8 @@ module DBI::DBD::Mysql
 
                 if retval[-1]['sql_type'] == DBI::SQL_TINYINT and retval[-1]['precision'] == 1
                     retval[-1]['dbi_type'] = DBI::Type::Boolean
+                elsif dbi_type
+                    retval[-1]['dbi_type'] = dbi_type
                 end
             }
             retval

data/test/dbd/general/test_statement.rb

@@ -1,4 +1,13 @@
 @class = Class.new(DBDConfig.testbase(DBDConfig.current_dbtype)) do
+
+    def test_execute
+        assert_nothing_raised do
+            @dbh.execute("select * from names order by age") do |sth|
+                assert_equal([["Joe", 19], ["Bob", 21], ["Jim", 30]], sth.fetch_all)
+            end
+        end
+    end
+
     def test_quoting # FIXME breaks sqlite-ruby to a segfault - research
         @sth = nil
 
@@ -114,7 +123,7 @@
         @sth.finish
     end
 
-    def test_execute
+    def test_prepare_execute
         assert_nothing_raised do 
             @sth = @dbh.prepare("select * from names")
             @sth.execute
@@ -134,7 +143,7 @@
         end
     end
 
-    def test_execute_with_transactions
+    def test_prepare_execute_with_transactions
         @dbh["AutoCommit"] = false 
         config = DBDConfig.get_config['sqlite3']
 

data/test/dbd/mysql/test_patches.rb

@@ -4,9 +4,13 @@ class TestMysqlPatches < DBDConfig.testbase(:mysql)
             sth = @dbh.prepare("select sum(age) from names")
             sth.execute
             row = sth.fetch 
-            # FIXME: this is BROKEN - should not be a string, should be fixnum
             assert_equal(70.0, row[0])
             sth.finish
+
+            sth = @dbh.prepare("select count(*) from names")
+            sth.execute
+            assert_equal([3], sth.fetch)
+            sth.finish
         end
     end
 
@@ -45,20 +49,21 @@ class TestMysqlPatches < DBDConfig.testbase(:mysql)
             assert_equal [2], row
             assert_equal [
                 {
-                      :name =>"foo",
-                      :mysql_type_name =>"INT",
-                      :mysql_max_length =>1,
-                      :primary =>true,
-                      :scale =>0,
-                      :mysql_flags =>49155,
-                      :sql_type =>4,
-                      :nullable =>false,
-                      :mysql_type =>3,
-                      :indexed =>true,
-                      :mysql_length =>11,
-                      :precision =>11,
-                      :type_name =>"INTEGER",
-                      :unique =>true
+                    :dbi_type => DBI::Type::Integer,
+                    :name =>"foo",
+                    :mysql_type_name =>"INT",
+                    :mysql_max_length =>1,
+                    :primary =>true,
+                    :scale =>0,
+                    :mysql_flags =>49155,
+                    :sql_type =>4,
+                    :nullable =>false,
+                    :mysql_type =>3,
+                    :indexed =>true,
+                    :mysql_length =>11,
+                    :precision =>11,
+                    :type_name =>"INTEGER",
+                    :unique =>true
                 }
             ], columns
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dbd-mysql
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors: 
 - Erik Hollensbe
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-23 00:00:00 -07:00
+date: 2008-09-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency