ydbi 0.5.3 → 0.5.8

data/lib/dbi.rb

@@ -9,16 +9,16 @@ module DBI; end
 #
 # Copyright (c) 2001, 2002, 2003 Michael Neumann <mneumann@ntecs.de>
 # Copyright (c) 2008 Erik Hollensbe <erik@hollensbe.org>
-# 
+#
 # All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without 
-# modification, are permitted provided that the following conditions 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
 # are met:
-# 1. Redistributions of source code must retain the above copyright 
+# 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright 
-#    notice, this list of conditions and the following disclaimer in the 
+# 2. 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.
 # 3. The name of the author may not be used to endorse or promote products
 #    derived from this software without specific prior written permission.
@@ -128,7 +128,7 @@ module DBI
 
     class << self
 
-        # Establish a database connection.  
+        # Establish a database connection.
         #
         # Format goes as such: "dbi:Driver:database_conn_args"
         #
@@ -179,7 +179,7 @@ module DBI
         # Return a list (of String) of the available drivers.
         #
         # NOTE:: This is non-functional for gem installations, due to the
-        #        nature of how it currently works. A better solution for 
+        #        nature of how it currently works. A better solution for
         #        this will be provided in DBI 0.6.0.
         def collect_drivers
             drivers = { }
@@ -204,7 +204,7 @@ module DBI
             drivers = []
             collect_drivers.each do |key, value|
                 drivers.push("dbi:#{key}:")
-            end 
+            end
             return drivers
         end
 
@@ -252,7 +252,7 @@ module DBI
                     rescue LoadError => e1
                         # see if you can find it in the path
                         unless @@caseless_driver_name_map
-                            @@caseless_driver_name_map = { } 
+                            @@caseless_driver_name_map = { }
                             collect_drivers.each do |key, value|
                                 @@caseless_driver_name_map[key.downcase] = value
                             end
@@ -306,17 +306,13 @@ module DBI
                     # FIXME trace
                     # drh.trace(@@trace_mode, @@trace_output)
                     @@driver_map[driver_name] = [drh, dbd_dr]
-                    return driver_name 
+                    return driver_name
                 else
                     return driver_name
                 end
             end
         rescue LoadError, NameError
-            if $SAFE >= 1
-                raise InterfaceError, "Could not load driver (#{$!.message}). Note that in SAFE mode >= 1, driver URLs have to be case sensitive!"
-            else
-                raise InterfaceError, "Could not load driver (#{$!.message})"
-            end
+          raise InterfaceError, "Could not load driver (#{$!.message})"
         end
 
         # Splits a DBI URL into two components - the database driver name
@@ -327,7 +323,7 @@ module DBI
         # the proper format for the URL.  If it isn't correct, an Interface
         # error is raised.
         def parse_url(driver_url)
-            if driver_url =~ /^(DBI|dbi):([^:]+)(:(.*))$/ 
+            if driver_url =~ /^(DBI|dbi):([^:]+)(:(.*))$/
                 [$2, $4]
             else
                 raise InterfaceError, "Invalid Data Source Name"

data/lib/dbi/utils/date.rb

@@ -1,3 +1,7 @@
+require 'deprecated'
+require 'dbi/types'
+require 'dbi/binary'
+require 'dbi/typeutil'
 module DBI
     #
     # Represents a Date.
@@ -30,7 +34,7 @@ module DBI
             sprintf("%04d-%02d-%02d", @year, @month, @day)
         end
 
-        private 
+        private
 
         # DBI::Date.new(year = 0, month = 0, day = 0)
         # DBI::Date.new(Date)
@@ -42,10 +46,10 @@ module DBI
         def initialize(year=0, month=0, day=0)
             case year
             when ::Date
-                @year, @month, @day = year.year, year.month, year.day 
+                @year, @month, @day = year.year, year.month, year.day
                 @original_date = year
             when ::Time
-                @year, @month, @day = year.year, year.month, year.day 
+                @year, @month, @day = year.year, year.month, year.day
                 @original_time = year
             else
                 @year, @month, @day = year, month, day

data/lib/dbi/version.rb

@@ -1,3 +1,3 @@
 module DBI
-  VERSION = "0.5.3"
+  VERSION = "0.5.8"
 end

data/readme.md

@@ -1,3 +1,10 @@
+# Release a new ydbi gem
+
+* bundle exec rake test test_dbd test_dbi
+* rake ydbd-pg:clobber_package; rake ydbd-pg:clobber_package; rake ydbi:gem ydbd-pg:gem
+* bundle exec gem push pkg/ydbd-*.gem
+* bundle exec gem push pkg/ydbi-*.gem
+
 # Description
     The DBI package is a vendor independent interface for accessing databases.
     It is similar, but not identical to, Perl's DBI module.
@@ -75,6 +82,15 @@
     gem install dbd-sqlite3
     gem install dbd-sqlite
 
+If you have a non standard path of postgres use something like
+
+    gem install pg -- --with-pg-config=/usr/local/pgsql-10.1/bin/pg_config
+
+Or if you are using bundler
+
+    bundle config build.pg --with-pg-config=/usr/local/pgsql-10.1/bin/pg_config
+    bundle install
+
 ## Without rubygems:
 
     ruby setup.rb config

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.2", DBI::VERSION)
+        assert_equal("0.5.8", 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