ydbi 0.5.6 → 0.5.7

data/test/dbd/sqlite3/test_statement.rb

@@ -0,0 +1,88 @@
+class TestStatement < DBDConfig.testbase(:sqlite3)
+    def test_constructor
+        sth = DBI::DBD::SQLite3::Statement.new("select * from names", @dbh.instance_variable_get("@handle").instance_variable_get("@db"))
+
+        assert_kind_of DBI::DBD::SQLite3::Statement, sth
+        assert sth.instance_variable_get("@db")
+        assert_kind_of ::SQLite3::Database, sth.instance_variable_get("@db")
+        assert_equal(@dbh.instance_variable_get("@handle").instance_variable_get("@db"), sth.instance_variable_get("@db"))
+        assert_kind_of ::SQLite3::Statement, sth.instance_variable_get("@stmt")
+        assert_nil(@sth.instance_variable_get("@result"))
+
+        sth.finish
+
+        sth = @dbh.prepare("select * from names")
+
+        assert_kind_of DBI::StatementHandle, sth
+        sth.finish
+    end
+
+    def test_bind_param
+        sth = DBI::DBD::SQLite3::Statement.new("select * from names", @dbh.instance_variable_get("@handle").instance_variable_get("@db"))
+
+        assert_raises(DBI::InterfaceError) do
+            sth.bind_param(:foo, "monkeys")
+        end
+
+        sth.finish
+    end
+    
+    def test_column_info
+        @sth = nil
+        
+        assert_nothing_raised do 
+            @sth = @dbh.prepare("select * from names")
+            @sth.execute
+        end
+
+        assert_kind_of Array, @sth.column_info 
+        assert_kind_of DBI::ColumnInfo, @sth.column_info[0]
+        assert_kind_of DBI::ColumnInfo, @sth.column_info[1]
+        assert_equal [ 
+            { 
+                :name  => "name",
+                :sql_type  => 12,
+                :precision  => 255,
+                :type_name  => "varchar"
+            }, 
+            { 
+                :name  => "age",
+                :sql_type  => 4,
+                :type_name  => "integer"
+            } 
+        ], @sth.column_info
+
+        @sth.finish
+    end
+    
+    def test_specific_types
+        assert_nothing_raised do
+            @sth = @dbh.prepare("insert into db_specific_types_test (dbl) values (?)")
+            @sth.execute(11111111.111111)
+            @sth.execute(22)
+            @sth.finish
+        end
+
+        assert_nothing_raised do
+            @sth = @dbh.prepare("select * from db_specific_types_test")
+            @sth.execute
+            assert_equal([11111111.111111], @sth.fetch)
+            assert_equal([22], @sth.fetch)
+            @sth.finish
+
+            assert_equal([[11111111.111111], [22]], @dbh.select_all("select * from db_specific_types_test"))
+        end
+
+        assert_nothing_raised do
+            @sth = @dbh.prepare("insert into names (name, age) values (?, ?)")
+            @sth.execute(:joseph, 20)
+            @sth.finish
+
+            @sth = @dbh.prepare("select name, age from names where name=?")
+            @sth.execute("joseph")
+            rows = @sth.fetch_all
+            @sth.finish
+            assert_equal(rows, [["joseph", 20]])
+        end
+    end
+end

data/test/dbd/sqlite3/up.sql

@@ -0,0 +1,33 @@
+create table names (name varchar(255), age integer);
+---
+insert into names (name, age) values ("Bob", 21);
+---
+insert into names (name, age) values ("Joe", 19);
+---
+insert into names (name, age) values ("Jim", 30);
+---
+create table precision_test (text_field varchar(20) primary key not null, integer_field integer, decimal_field decimal(2,1), numeric_field numeric(30,6));
+---
+create view view_names as select * from names;
+---
+create table blob_test (name varchar(255));
+---
+create table boolean_test (num integer, mybool boolean);
+---
+create table time_test (mytime time);
+---
+create table timestamp_test (mytimestamp timestamp);
+---
+create table bit_test (mybit bit);
+---
+create table field_types_test (foo integer not null primary key default 1);
+---
+create table db_specific_types_test (dbl double);
+---
+create table names_defined_with_spaces ( name varchar( 255 ), age integer );
+---
+insert into names_defined_with_spaces (name, age) values ("Bob", 21);
+---
+insert into names_defined_with_spaces (name, age) values ("Joe", 19);
+---
+insert into names_defined_with_spaces (name, age) values ("Jim", 30);

data/test/dbi/tc_columninfo.rb

@@ -3,17 +3,12 @@
 #
 # Test case for the DBI::ColumnInfo class.
 ############################################################
-$LOAD_PATH.unshift(Dir.pwd)
-$LOAD_PATH.unshift(File.dirname(Dir.pwd))
-$LOAD_PATH.unshift("../../lib")
-$LOAD_PATH.unshift("../../lib/dbi")
-$LOAD_PATH.unshift("lib")
-
-require "dbi/columninfo"
 require "test/unit"
+require_relative "../../lib/dbi/columninfo"
 
 class TC_DBI_ColumnInfo < Test::Unit::TestCase
    def setup
+     super
       @colinfo = DBI::ColumnInfo.new(
          "name"      => "test",
          "sql_type"  => "numeric",
@@ -30,7 +25,7 @@ class TC_DBI_ColumnInfo < Test::Unit::TestCase
          indexed primary unique
       /
    end
-   
+
    def test_constructor
       assert_nothing_raised{ DBI::ColumnInfo.new }
 
@@ -81,7 +76,7 @@ class TC_DBI_ColumnInfo < Test::Unit::TestCase
       assert_respond_to(@colinfo, :keys)
       assert_equal(@keys.sort, @colinfo.keys.collect { |x| x.to_s }.sort)
    end
-   
+
    def test_respond_to_hash_methods
       assert_respond_to(@colinfo, :each)
       assert_respond_to(@colinfo, :empty?)

data/test/dbi/tc_date.rb

@@ -3,15 +3,8 @@
 #
 # Test case for the DBI::Date class (currently) located in the utils.rb file.
 ##############################################################################
-$LOAD_PATH.unshift(Dir.pwd)
-$LOAD_PATH.unshift(File.dirname(Dir.pwd))
-$LOAD_PATH.unshift("../../lib")
-$LOAD_PATH.unshift("../../lib/dbi")
-$LOAD_PATH.unshift("lib")
-
-require 'date'
-require 'dbi'
-require 'test/unit'
+require "test/unit"
+require_relative "../../lib/dbi"
 
 Deprecate.set_action(proc { })
 

data/test/dbi/tc_dbi.rb

@@ -3,14 +3,8 @@
 #
 # Test case for the DBI module (dbi.rb).
 ######################################################################
-$LOAD_PATH.unshift(Dir.pwd)
-$LOAD_PATH.unshift(File.dirname(Dir.pwd))
-$LOAD_PATH.unshift("../../lib")
-$LOAD_PATH.unshift("../../lib/dbi")
-$LOAD_PATH.unshift("lib")
-
-require 'dbi'
-require 'test/unit'
+require "test/unit"
+require_relative "../../lib/dbi"
 
 class TC_DBI < Test::Unit::TestCase
     def setup
@@ -22,7 +16,7 @@ class TC_DBI < Test::Unit::TestCase
     end
 
     def test_dbi_version
-        assert_equal("0.5.5", DBI::VERSION)
+        assert_equal("0.5.7", DBI::VERSION)
     end
 
     def test_dbd_module

data/test/dbi/tc_row.rb

@@ -1,16 +1,10 @@
 ######################################################################
 # tc_row.rb
 #
-# Test case for the DBI::Row class. 
+# Test case for the DBI::Row class.
 ######################################################################
-$LOAD_PATH.unshift(Dir.pwd)
-$LOAD_PATH.unshift(File.dirname(Dir.pwd))
-$LOAD_PATH.unshift("../../lib")
-$LOAD_PATH.unshift("../../lib/dbi")
-$LOAD_PATH.unshift("lib")
-
-require 'test/unit'
-require 'dbi'
+require "test/unit"
+require_relative "../../lib/dbi"
 
 class TC_DBI_Row < Test::Unit::TestCase
    def setup
@@ -18,7 +12,7 @@ class TC_DBI_Row < Test::Unit::TestCase
       @cols = %w/first last age/
       @coltypes = [DBI::Type::Varchar, DBI::Type::Varchar, DBI::Type::Integer]
       @row  = DBI::Row.new(@cols, @coltypes, @data.clone)
-      @row_noconv = DBI::Row.new(@cols, @coltypes, @data.clone, false) 
+      @row_noconv = DBI::Row.new(@cols, @coltypes, @data.clone, false)
    end
 
    def teardown
@@ -46,7 +40,7 @@ class TC_DBI_Row < Test::Unit::TestCase
            assert_equal(@data, @row_noconv)
        end
    end
-   
+
    # Ensure that constructor only allows Integers or Arrays (or nil)
    def test_row_constructor
       assert_nothing_raised{ DBI::Row.new(@cols, @coltypes) }
@@ -67,14 +61,14 @@ class TC_DBI_Row < Test::Unit::TestCase
       assert_equal(@data[2].to_s, @row.at(2).to_s)
       assert_equal(@data[99].to_s, @row.at(99).to_s)
    end
-   
+
    # Should respond to Array and Enumerable methods
    def test_row_delegate
       assert_respond_to(@row, :length)
       assert_respond_to(@row, :each)
       assert_respond_to(@row, :grep)
    end
-   
+
    def test_row_length
       assert_equal(3, @row.length)
       assert_equal(3, DBI::Row.new(@cols, @coltypes).length)
@@ -86,14 +80,14 @@ class TC_DBI_Row < Test::Unit::TestCase
       assert_equal(@data[2], @row.by_index(2).to_s)
       assert_nil(@row.by_index(3))
    end
-   
+
    def test_row_data_by_field
       assert_equal @data[0], @row.by_field('first')
       assert_equal @data[1], @row.by_field('last')
       assert_equal @data[2], @row.by_field('age').to_s
       assert_equal nil, @row.by_field('unknown')
    end
-   
+
    def test_row_set_values
       assert_respond_to(@row, :set_values)
       assert_nothing_raised{ @row.set_values(["John", "Doe", 23]) }
@@ -101,14 +95,14 @@ class TC_DBI_Row < Test::Unit::TestCase
       assert_equal("Doe", @row.by_index(1))
       assert_equal(23, @row.by_index(2))
    end
-   
+
    def test_row_to_h
       assert_respond_to(@row, :to_h)
       assert_nothing_raised{ @row.to_h }
       assert_kind_of(Hash, @row.to_h)
       assert_equal({"first"=>"Daniel", "last"=>"Berger", "age"=>36}, @row.to_h)
    end
-   
+
    def test_row_column_names
       assert_respond_to(@row, :column_names)
       assert_nothing_raised{ @row.column_names }
@@ -123,13 +117,13 @@ class TC_DBI_Row < Test::Unit::TestCase
       assert_kind_of(Array, @row.column_names)
       assert_equal(["first", "last", "age"], @row.column_names)
    end
-   
+
    def test_indexing_numeric
-      assert_equal(@data[0], @row[0])   
-      assert_equal(@data[1], @row[1])  
-      assert_equal(@data[2], @row[2].to_s)      
+      assert_equal(@data[0], @row[0])
+      assert_equal(@data[1], @row[1])
+      assert_equal(@data[2], @row[2].to_s)
    end
-   
+
    def test_indexing_string_or_symbol
       assert_equal(@data[0], @row['first'])
       assert_equal(@data[0], @row[:first])
@@ -137,7 +131,7 @@ class TC_DBI_Row < Test::Unit::TestCase
       assert_equal(@data[2], @row['age'].to_s)
       assert_equal(nil, @row['unknown'])
    end
-   
+
    def test_indexing_regexp
       assert_equal(["Daniel"], @row[/first/])
       assert_equal(["Berger"], @row[/last/])

data/test/dbi/tc_sqlbind.rb

@@ -1,6 +1,5 @@
-$: << 'lib'
-require 'test/unit'
-require "dbi/sql"
+require "test/unit"
+require_relative "../../lib/dbi/sql"
 
 # ====================================================================
 class TestSqlBind < Test::Unit::TestCase
@@ -60,18 +59,18 @@ class TestSqlBind < Test::Unit::TestCase
   def test_minus_bug
     sql = "SELECT 1 - 3"
     res = "SELECT 1 - 3"
-    assert_equal res, bind(self, sql, []) 
+    assert_equal res, bind(self, sql, [])
   end
 
   def test_minus2
-    sql = "SELECT * from test --Dan's query" 
-    assert_equal sql, bind(self, sql, []) 
+    sql = "SELECT * from test --Dan's query"
+    assert_equal sql, bind(self, sql, [])
   end
 
   def test_slash
     sql = "SELECT 5 / 4"
     res = "SELECT 5 / 4"
-    assert_equal res, bind(self, sql, []) 
+    assert_equal res, bind(self, sql, [])
   end
 
   def test_much

data/test/dbi/tc_statementhandle.rb

@@ -1,6 +1,5 @@
-$: << 'lib'
-require 'test/unit'
-require 'dbi'
+require "test/unit"
+require_relative "../../lib/dbi"
 
 class TC_DBI_StatementHandle < Test::Unit::TestCase
     def test_fetch
@@ -9,7 +8,7 @@ class TC_DBI_StatementHandle < Test::Unit::TestCase
         def mock_handle.column_info; {}; end
         def mock_handle.fetch; nil; end
         sth = DBI::StatementHandle.new( mock_handle, true, true, false, true)
-        
+
         10.times do
             assert_nil sth.fetch
         end

data/test/dbi/tc_time.rb

@@ -3,14 +3,8 @@
 #
 # Test case for the DBI::Time class (currently) located in the utils.rb file.
 ##############################################################################
-$LOAD_PATH.unshift(Dir.pwd)
-$LOAD_PATH.unshift(File.dirname(Dir.pwd))
-$LOAD_PATH.unshift("../../lib")
-$LOAD_PATH.unshift("../../lib/dbi")
-$LOAD_PATH.unshift("lib")
-
-require 'dbi'
-require 'test/unit'
+require "test/unit"
+require_relative "../../lib/dbi"
 
 Deprecate.set_action(proc { })
 

data/test/dbi/tc_timestamp.rb

@@ -4,17 +4,8 @@
 # Test case for the DBI::Timestamp class (currently) located in the
 # utils.rb file.
 ##############################################################################
-$LOAD_PATH.unshift(Dir.pwd)
-$LOAD_PATH.unshift(File.dirname(Dir.pwd))
-$LOAD_PATH.unshift("../../lib")
-$LOAD_PATH.unshift("../../lib/dbi")
-$LOAD_PATH.unshift("lib")
-
-require 'date'
-require 'dbi'
-require 'test/unit'
-
-Deprecate.set_action(proc { })
+require "test/unit"
+require_relative "../../lib/dbi"
 
 class TC_DBI_Date < Test::Unit::TestCase
    def setup
@@ -134,9 +125,4 @@ class TC_DBI_Date < Test::Unit::TestCase
       assert_equal(2006, @dbi_ts.year)
    end
 
-   def teardown
-      @date = nil
-      @time = nil
-      @dbi_ts = nil
-   end
 end

data/test/dbi/tc_types.rb

@@ -1,11 +1,5 @@
-$LOAD_PATH.unshift(Dir.pwd)
-$LOAD_PATH.unshift(File.dirname(Dir.pwd))
-$LOAD_PATH.unshift("../../lib")
-$LOAD_PATH.unshift("../../lib/dbi")
-$LOAD_PATH.unshift("lib")
-
-require "dbi"
 require "test/unit"
+require_relative "../../lib/dbi"
 
 class MyType
     def initialize(obj)
@@ -107,7 +101,7 @@ class TC_DBI_Type < Test::Unit::TestCase
         # string coercion
         dt = DateTime.now
         assert_equal(dt.to_s, klass.parse(dt).to_s)
-        
+
         t = Time.now
         assert_equal(DateTime.parse(t.to_s).to_s, klass.parse(t).to_s)
 
@@ -137,7 +131,7 @@ class TC_DBI_Type < Test::Unit::TestCase
         )
 
         # precision tests, related to ticket #27182
-      
+
         # iso8601 (bypasses regex)
         [
             '2009-09-27T19:41:00-05:00',
@@ -158,7 +152,7 @@ class TC_DBI_Type < Test::Unit::TestCase
         )
 
         # unix convention (uses regex)
-        
+
         [
             '2009-09-27 19:41:00 -05:00',
             '2009-09-27 19:41:00.123 -05:00'
@@ -208,7 +202,7 @@ class TC_DBI_TypeUtil < Test::Unit::TestCase
         assert_kind_of(String, cast(Time.now))
         assert_kind_of(String, cast(Date.today))
         assert_kind_of(String, cast(DateTime.now))
-      
+
         obj = Time.now
         assert_equal(datecast(obj), cast(obj))
         obj = Date.today