sqlpostgres 1.2.6 → 1.3.0

data/spec/spec_helper.rb

@@ -0,0 +1,10 @@
+require File.expand_path('../lib/sqlpostgres.rb', File.dirname(__FILE__))
+
+[
+  'support/**/*.rb',
+].each do |relative_glob|
+  absolute_glob = File.expand_path(relative_glob, File.dirname(__FILE__))
+  Dir[absolute_glob].each do |path|
+    require path
+  end
+end

data/spec/support/all_characters.rb

@@ -0,0 +1,18 @@
+
+shared_context "AllCharacters" do
+
+  def self.allCharactersExceptNull
+    allCharacters(1)
+  end
+
+  def self.allCharacters(floor = 0)
+    s = (floor..255).to_a.collect do |i|
+      i.chr
+    end.join
+    if s.respond_to?(:force_encoding)
+      s = s.force_encoding('ASCII-8BIT')
+    end
+    s
+  end
+
+end

data/spec/support/clear_default_connection.rb

@@ -0,0 +1,5 @@
+RSpec.configure do |config|
+  config.after(:each) do
+    SqlPostgres::Connection.default = nil
+  end
+end

data/spec/support/temporary_table.rb

@@ -0,0 +1,24 @@
+require File.expand_path('../lib/temporary_table',
+                         File.dirname(__FILE__))
+
+RSpec.configure do |config|
+
+  shared_context 'temporary table' do |args|
+
+    def set_message_level(level)
+      prior = connection.exec("show client_min_messages").first['client_min_messages']
+      connection.exec("set client_min_messages = '#{level}'")
+    ensure
+      connection.exec("set client_min_messages = '#{prior}'")
+    end
+
+    around(:each) do |block|
+      args = args.merge(:connection => connection)
+      set_message_level('warning') do
+        TestSupport::TemporaryTable.create(args, &block)
+      end
+    end
+
+  end
+
+end

data/spec/support/test_connections.rb

@@ -0,0 +1,10 @@
+require File.expand_path('../lib/target_database_servers',
+                         File.dirname(__FILE__))
+
+def test_connections
+  TestSupport::TargetDatabaseServers.instance.test_connections
+end
+
+def test_connection
+  TestSupport::TargetDatabaseServers.instance.test_connection
+end

data/sqlpostgres.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sqlpostgres"
-  s.version = "1.2.6"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne Conrad"]
-  s.date = "2013-02-18"
+  s.date = "2013-02-26"
   s.description = "A mini-language for building and executing SQL statements against a postgresql database.  This is a very old library, pre-dating active record and lacking many of its refinments.  New projects will probably not want to use it."
   s.email = "wconrad@yagni.com"
   s.extra_rdoc_files = [
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
     "README.rdoc"
   ]
   s.files = [
+    "Changelog.md",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.md",
@@ -121,6 +122,32 @@ Gem::Specification.new do |s|
     "lib/sqlpostgres/Transaction.rb",
     "lib/sqlpostgres/Translate.rb",
     "lib/sqlpostgres/Update.rb",
+    "rake_tasks/db.rake",
+    "rake_tasks/default.rake",
+    "rake_tasks/jeweler.rake",
+    "rake_tasks/test.rake",
+    "rake_tasks/test_spec.rake",
+    "rake_tasks/test_unit.rake",
+    "spec/Translate_spec.rb",
+    "spec/config/.gitignore",
+    "spec/config/config.yml",
+    "spec/config/database.yml.template",
+    "spec/connection_spec.rb",
+    "spec/cursor_spec.rb",
+    "spec/lib/database_config.rb",
+    "spec/lib/database_server.rb",
+    "spec/lib/postgres_template.rb",
+    "spec/lib/target_database_servers.rb",
+    "spec/lib/temporary_table.rb",
+    "spec/lib/test_config.rb",
+    "spec/lib/test_connection.rb",
+    "spec/lib/test_database.rb",
+    "spec/roundtrip_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/support/all_characters.rb",
+    "spec/support/clear_default_connection.rb",
+    "spec/support/temporary_table.rb",
+    "spec/support/test_connections.rb",
     "sqlpostgres.gemspec",
     "test/Assert.rb",
     "test/Connection.test.rb",
@@ -151,9 +178,7 @@ Gem::Specification.new do |s|
     "test/TestSetup.rb",
     "test/TestUtil.rb",
     "test/Transaction.test.rb",
-    "test/Translate.test.rb",
     "test/Update.test.rb",
-    "test/roundtrip.test.rb",
     "test/test",
     "tools/exampleinserter/ExampleInserter.rb",
     "tools/rdoc/ChangeLog",
@@ -237,16 +262,22 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<pg>, ["~> 0.13.2"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<memoizer>, ["~> 1.0.1"])
       s.add_development_dependency(%q<rake>, ["~> 10.0.3"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.12.0"])
     else
       s.add_dependency(%q<pg>, ["~> 0.13.2"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<memoizer>, ["~> 1.0.1"])
       s.add_dependency(%q<rake>, ["~> 10.0.3"])
+      s.add_dependency(%q<rspec>, ["~> 2.12.0"])
     end
   else
     s.add_dependency(%q<pg>, ["~> 0.13.2"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<memoizer>, ["~> 1.0.1"])
     s.add_dependency(%q<rake>, ["~> 10.0.3"])
+    s.add_dependency(%q<rspec>, ["~> 2.12.0"])
   end
 end
 

data/test/Connection.test.rb

@@ -18,9 +18,8 @@ class ConnectionTest < Test
   def test_ConnectionNewWrap
     Connection.mockPgClass do
       rawConnection = MockPGconn.new
-      assertEquals(MockPGconn.state[:encoding], nil)
       connection = Connection.new('connection'=>rawConnection)
-      assertEquals(rawConnection.state[:encoding], 'unicode')
+      assertEquals(connection.pgconn, rawConnection)
     end
   end
 
@@ -44,7 +43,8 @@ class ConnectionTest < Test
     Connection.open(testDbArgs) do |connection1|
       connection1.exec("create database #{dbName}")
       begin
-        Connection.open('db_name'=>dbName) do |connection2|
+        sleep(0.1)
+        Connection.open(testDbArgs.merge('db_name'=>dbName)) do |connection2|
            rows = connection2.query("select current_database();")
            assertEquals(rows[0][0], dbName)
         end
@@ -85,17 +85,19 @@ class ConnectionTest < Test
       password = randomString
       options = randomString
       tty = randomString
+      encoding = randomString
       connection = Connection.new('host_name'=>hostName,
                                   'port'=>port,
                                   'options'=>options,
                                   'tty'=>tty,
                                   'db_name'=>dbName,
                                   'login'=>login,
-                                  'password'=>password)
+                                  'password'=>password,
+                                  'encoding'=>encoding)
       assertEquals(MockPGconn.state[:open], true)
       assertEquals(MockPGconn.state[:openArgs], 
                    [hostName, port, options, tty, dbName, login, password])
-      assertEquals(MockPGconn.state[:encoding], 'unicode')
+      assertEquals(MockPGconn.state[:encoding], encoding)
     end
   end
 

data/test/Select.test.rb

@@ -231,7 +231,7 @@ class SelectTest < Test
   def testUserConversion
     makeTestConnection do |connection|
       select = Select.new(connection)
-      select.select(["%s", "abc"], 'letters') do |s|
+      select.select(["%s", "abc"], 'letters') do |s, server_version|
         s.scan(/./)
       end
       assertEquals(select.exec, [{'letters'=>['a', 'b', 'c']}])

data/test/TestConfig.rb

@@ -8,10 +8,19 @@ module TestConfig
 
   TEST_DB_NAME = "sqlpostgres_test"
 
+  # The database port to use for testing.
+
+  TEST_DB_PORT = ENV['PGPORT'] || 5432
+
   # The prefix for temporary database objects.
 
   TEST_DB_PREFIX = "SQLPOSTGRES_TEST_"
 
+  # Encodings
+
+  TEST_CLIENT_ENCODING = 'SQL_ASCII'
+  TEST_DB_ENCODING = 'SQL_ASCII'
+
 end
 
 # Local Variables:

data/test/TestUtil.rb

@@ -6,7 +6,11 @@ module TestUtil
   include SqlPostgres
 
   def testDbArgs
-    {'db_name'=>TEST_DB_NAME}
+    {
+      'db_name' => TEST_DB_NAME,
+      'port'=> TEST_DB_PORT,
+      'encoding' => TEST_CLIENT_ENCODING,
+    }
   end
 
   def testForTestDb
@@ -14,13 +18,23 @@ module TestUtil
       Connection.new(testDbArgs)
     rescue PGError => message
       puts "Creating test database"
-      system("psql -c 'create database #{TEST_DB_NAME}' template1 > /dev/null 2>&1")
+      run_psql "create database #{TEST_DB_NAME} with encoding '#{TEST_DB_ENCODING}' template template0"
     end
   end
 
   def removeTestDb
     puts "Removing test database"
-    system("psql -c 'drop database #{TEST_DB_NAME}' template1 > /dev/null 2>&1")
+    run_psql "drop database #{TEST_DB_NAME}"
+  end
+
+  def run_psql(command)
+    command = "psql -p #{TEST_DB_PORT} -c #{command.inspect} 2>&1"
+    output = `#{command}`
+    if $? != 0
+      $stderr.puts "Failed: #{command}"
+      $stderr.print output
+      exit(1)
+    end
   end
 
   def makeTestConnection

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sqlpostgres
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
-  - 6
-  version: 1.2.6
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Wayne Conrad
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-18 00:00:00 Z
+date: 2013-02-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: pg
@@ -50,10 +50,26 @@ dependencies:
         version: 1.8.4
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: memoizer
   prerelease: false
   type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -64,7 +80,23 @@ dependencies:
         - 0
         - 3
         version: 10.0.3
-  version_requirements: *id003
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 2
+        - 12
+        - 0
+        version: 2.12.0
+  version_requirements: *id005
 description: A mini-language for building and executing SQL statements against a postgresql database.  This is a very old library, pre-dating active record and lacking many of its refinments.  New projects will probably not want to use it.
 email: wconrad@yagni.com
 executables: []
@@ -75,6 +107,7 @@ extra_rdoc_files:
 - LICENSE.md
 - README.rdoc
 files: 
+- Changelog.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.md
@@ -179,6 +212,32 @@ files:
 - lib/sqlpostgres/Transaction.rb
 - lib/sqlpostgres/Translate.rb
 - lib/sqlpostgres/Update.rb
+- rake_tasks/db.rake
+- rake_tasks/default.rake
+- rake_tasks/jeweler.rake
+- rake_tasks/test.rake
+- rake_tasks/test_spec.rake
+- rake_tasks/test_unit.rake
+- spec/Translate_spec.rb
+- spec/config/.gitignore
+- spec/config/config.yml
+- spec/config/database.yml.template
+- spec/connection_spec.rb
+- spec/cursor_spec.rb
+- spec/lib/database_config.rb
+- spec/lib/database_server.rb
+- spec/lib/postgres_template.rb
+- spec/lib/target_database_servers.rb
+- spec/lib/temporary_table.rb
+- spec/lib/test_config.rb
+- spec/lib/test_connection.rb
+- spec/lib/test_database.rb
+- spec/roundtrip_spec.rb
+- spec/spec_helper.rb
+- spec/support/all_characters.rb
+- spec/support/clear_default_connection.rb
+- spec/support/temporary_table.rb
+- spec/support/test_connections.rb
 - sqlpostgres.gemspec
 - test/Assert.rb
 - test/Connection.test.rb
@@ -209,9 +268,7 @@ files:
 - test/TestSetup.rb
 - test/TestUtil.rb
 - test/Transaction.test.rb
-- test/Translate.test.rb
 - test/Update.test.rb
-- test/roundtrip.test.rb
 - test/test
 - tools/exampleinserter/ExampleInserter.rb
 - tools/rdoc/ChangeLog

data/test/Translate.test.rb

@@ -1,354 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'bundler/setup'
-$:.unshift(File.dirname(__FILE__))
-require 'TestSetup'
-
-class TranslateTest < Test
-
-  include SqlPostgres
-  include TestUtil
-
-  def testEscapeSql
-    pi = 3.1415926535897932384626433832795028841971693993751058209749445923
-    testCases = [
-      [nil, 'null'],
-      ["", "E''"],
-      ["foo", %q"E'foo'"],
-      ["fred's", %q"E'fred\\047s'"],
-      ['\\', %q"E'\\134'"],
-      [Time.local(2000, 1, 2, 3, 4, 5, 6), 
-        "timestamp '2000-01-02 03:04:05.000006'"],
-      [Time.local(1999, 12, 31, 23, 59, 59, 999999), 
-        "timestamp '1999-12-31 23:59:59.999999'"],
-      [1, '1'],
-      [-1, '-1'],
-      [1.0, "1"],
-      [-1.0, "-1"],
-      [pi, "3.1415926535898"],
-      [-pi, "-3.1415926535898"],
-      [1e100, "1e+100"],
-      [-1e-100, "-1e-100"],
-      [true, "true"],
-      [false, "false"],
-      [:default, "default"],
-      [['1 + %s', 1], '1 + 1'],
-      [[:in, 1, 2], '(1, 2)'],
-      [[:in, 'foo', 'bar'], "(E'foo', E'bar')"],
-      [BigDecimal('0'), '0.0'],
-      [BigDecimal('0.'), '0.0'],
-      [BigDecimal('1234567890.0987654321'), '1234567890.0987654321'],
-      [BigDecimal('0.000000000000000000000000000001'), '0.000000000000000000000000000001'],
-      [PgTime.new(0, 0, 0), "time '00:00:00'"],
-      [PgTime.new(23, 59, 59), "time '23:59:59'"],
-      [
-        PgTimeWithTimeZone.new,
-        "time with time zone '00:00:00+00:00'"
-      ],
-      [
-        PgTimeWithTimeZone.new(12, 0, 0, -8), 
-        "time with time zone '12:00:00-08:00'"
-      ],
-      [
-        PgTimeWithTimeZone.new(23, 59, 59, 8), 
-        "time with time zone '23:59:59+08:00'"
-      ],
-      [
-        DateTime.civil(2001, 1, 1, 0, 0, 0, Rational(7, 24)),
-        "timestamp with time zone '2001-01-01 00:00:00.000000000+0700'",
-      ],
-      [Date.civil(2001, 1, 1), "date '2001-01-01'"],
-      [
-        PgTimestamp.new(2001, 1, 2, 12, 0, 1),
-        "timestamp '2001-01-02 12:00:01.00000'"
-      ],
-      [PgInterval.new('hours'=>1), "interval '01:00'"],
-      [PgInterval.new('days'=>1), "interval '1 day'"],
-      [PgPoint.new(1, 2), "point '(1, 2)'"],
-      [PgPoint.new(3, 4), "point '(3, 4)'"],
-      [
-        PgLineSegment.new(PgPoint.new(1, 2), PgPoint.new(3, 4)), 
-        "lseg '((1, 2), (3, 4))'"
-      ],
-      [
-        PgBox.new(PgPoint.new(1, 2), PgPoint.new(3, 4)), 
-        "box '((1, 2), (3, 4))'"
-      ],
-      [
-        PgPath.new(true, PgPoint.new(1, 2), PgPoint.new(3, 4)), 
-        "path '((1, 2), (3, 4))'"
-      ],
-      [
-        PgPolygon.new(PgPoint.new(1, 2), PgPoint.new(3, 4)), 
-        "polygon '((1, 2), (3, 4))'"
-      ],
-      [["%s %s", 1, 'Fred'], "1 E'Fred'"],
-    ]
-    for testCase in testCases
-      assertInfo("For test case #{testCase.inspect}") do
-        raw, escaped = *testCase
-        assertEquals(Translate.escape_sql(raw), escaped)
-      end
-    end
-  end
-
-  def test_escape_array
-    testCases = [
-      [nil, "null"],
-      [[], %q"'{}'"],
-      [[1], %q"ARRAY[1]"],
-      [[1, 2], %q"ARRAY[1, 2]"],
-      [['foo'], %q"ARRAY[E'foo']"],
-      [['\\'], %q"ARRAY[E'\\134']"],
-      [["a,b,c"], %q"ARRAY[E'a,b,c']"],
-      [["a", "b", "c"], %q"ARRAY[E'a', E'b', E'c']"],
-      [["\"Hello\""], %q"ARRAY[E'\"Hello\"']"],
-      [
-        [[0, 0], [0, 1], [1, 0], [1, 1]],
-        "ARRAY[ARRAY[0, 0], ARRAY[0, 1], ARRAY[1, 0], ARRAY[1, 1]]"
-      ],
-    ]
-    for array, escaped in testCases
-      assertInfo("For array #{array.inspect}") do
-        assertEquals(Translate.escape_array(array), escaped)
-      end
-    end
-  end
-
-  def test_escape_bytea_array
-    testCases = [
-      [[], "'{}'"],
-      [["", "foo"], "'{\"\",\"foo\"}'"],
-      ["\000\037 ", "'{\"\\\\\\\\000\037 \"}'"],
-      [["'\\"], "'{\"\\'\\\\\\\\\\\\\\\\\"}'"],
-      [["~\177\377"], "'{\"~\177\377\"}'"],
-      [["\""], "'{\"\\\\\"\"}'"],
-      [nil, "null"],
-    ]
-    for array, escaped in testCases
-      assertInfo("For array #{array.inspect}") do
-        assertEquals(Translate.escape_bytea_array(array), escaped)
-      end
-    end
-  end
-
-  def test_sql_to_array
-    goodTestCases = [
-      ["{}", []],
-      ["{foo}", ["foo"]],
-      ["{foo,bar,\"fool's gold\"}", ["foo", "bar", "fool's gold"]],
-      ["{\"\\\\\"}", ["\\"]],
-      ["{\"\\\\\",fool's}", ["\\", "fool's"]],
-      ["{\"a,b,c\"}", ["a,b,c"]],
-      ["{\"\\\"Hello!\\\"\"}", ["\"Hello!\""]],
-      ["{\"\001\n\037\"}", ["\001\n\037"]],
-      [
-        "{{f,f},{f,t},{t,f},{t,t}}", 
-        [["f", "f"], ["f", "t"], ["t", "f"], ["t", "t"]],
-      ],
-    ]
-    for sql, array in goodTestCases
-      assertInfo("For sql #{sql.inspect}") do
-        assertEquals(Translate.sql_to_array(sql), array)
-      end
-    end
-    badTestCases = [
-      "",
-      "{",
-      "{foo",
-      "{foo}x",
-    ]
-    for sql in badTestCases
-      assertInfo("For sql #{sql.inspect}") do
-        assertException(ArgumentError, sql.inspect) do
-          Translate.sql_to_array(sql)
-        end
-      end
-    end
-  end
-
-  def test_escape_qchar
-    test_cases = [
-      [nil, 'null'],
-      ["\000", %q"E'\\000'"],
-      ["\001", %q"E'\\001'"],
-      ["\377", %q"E'\\377'"],
-      ["a", "E'\\141'"],
-    ]
-    for raw, escaped in test_cases
-      assertInfo("For raw=#{raw.inspect}") do
-        assertEquals(Translate.escape_qchar(raw), escaped)
-      end
-    end
-  end
-
-  def test_escape_bytea
-    testCases = [
-      [nil, 'null'],
-      [:default, "default"],
-      ["", "E''"],
-      ["foo", %q"E'foo'"],
-      ["\000\037 ", %q"E'\\\\000\\\\037 '"],
-      ["'\\", %q"E'''\\\\\\\\'"],
-      ["~\177\377", "E'~\\\\177\\\\377'"],
-    ]
-    for testCase in testCases
-      assertInfo("For test case #{testCase.inspect}") do
-        raw, escaped = *testCase
-        assertEquals(Translate.escape_bytea(raw), escaped)
-      end
-    end
-  end
-
-  def test_unescape_bytea
-    testCases = [
-      ["", ""],
-      ["abc", "abc"],
-      ["\\\\", "\\"],
-      ["\\001", "\001"],
-      ["\\037", "\037"],
-      ["\\177", "\177"],
-      ["\\200", "\200"],
-      ["\\377", "\377"],
-      ["\\477", "\\477"],
-      ["\\387", "\\387"],
-      ["\\378", "\\378"],
-      ["\\n", "\\n"],
-      ["abc\\", "abc\\"],
-    ]
-    for testCase in testCases
-      assertInfo("For test case #{testCase.inspect}") do
-        escaped, raw = *testCase
-        assertEquals(Translate.unescape_bytea(escaped), raw)
-      end
-    end
-  end
-
-  def test_unescape_qchar
-    testCases = [
-      ["", "\000"],
-      ["\001", "\001"],
-      ["\037", "\037"],
-      [" ", " "],
-      ["~", '~'],
-      ["\277", "\277"],
-      ["\300", "\300"],
-      ["\377", "\377"],
-    ]
-    for testCase in testCases
-      assertInfo("For test case #{testCase.inspect}") do
-        escaped, raw = *testCase
-        assertEquals(Translate.unescape_qchar(escaped), raw)
-      end
-    end
-  end
-
-  def testEscapeSql_Select
-    select = Object.new
-    def select.statement
-      "foo"
-    end
-    assertEquals(Translate.escape_sql(select), "(foo)")
-  end
-
-  def testEscapeSql_AllCharValues
-    tableName = testTableName("foo")
-    Connection.open(testDbArgs) do |connection|
-      connection.exec("begin transaction;")
-      connection.exec("create temporary table #{tableName} "\
-                      "(i int, t text);")
-      range = (1..255)
-      for i in range
-        assertInfo("For i=#{i.inspect}") do
-          statement = ("insert into #{tableName} (i, t) "\
-                       "values (#{i}, #{Translate.escape_sql(i.chr)});")
-          connection.query(statement)
-        end
-      end
-      connection.exec("end transaction;")
-      statement = "select i, t, length(t) from #{tableName} order by i;"
-      rows = connection.query(statement)
-      for i in range
-        assertInfo("for i = #{i}") do
-          row = rows.assoc(i.to_s)
-          char_number, text, length = *row
-          assertEquals(length.to_i, 1)
-          c = Translate.unescape_text(text)
-          assertEquals(c, i.chr)
-        end
-      end
-    end
-  end
-
-  def testSubstituteValues
-    assertEquals(Translate.substitute_values("foo"), "foo")
-    assertEquals(Translate.substitute_values(["bar %s", 1]), "bar 1")
-    assertEquals(Translate.substitute_values(["bar %s", "O'Malley"]), 
-                 "bar E'O\\047Malley'")
-    assertEquals(Translate.substitute_values(["%s %s", nil, 1.23]), "null 1.23")
-  end
-
-  def test_sql_to_datetime
-    testCases = [
-      [2003, 10, 18, 11, 30, 24, -7],
-      [2001, 1, 1, 0, 0, 0, 0],
-      [1970, 12, 31, 23, 59, 59, -11],
-    ]
-    for testCase in testCases
-      sql = "%04d-%02d-%02d %02d:%02d:%02d%+03d" % testCase
-      dateTime = DateTime.civil(*testCase[0..5] + 
-                                [Rational(testCase[6], 24)])
-      assertEquals(Translate.sql_to_datetime(sql), dateTime)
-    end
-  end
-
-  def test_datetime_to_sql
-    testCases = [
-      [2003, 10, 18, 11, 30, 24, -7],
-      [2001, 1, 1, 0, 0, 0, 0],
-      [1970, 12, 31, 23, 59, 59, -11],
-    ]
-    for testCase in testCases
-      sql = "%04d-%02d-%02d %02d:%02d:%02d.000000000%+03d00" % testCase
-      dateTime = DateTime.civil(*testCase[0..5] + 
-                                [Rational(testCase[6], 24)])
-      assertEquals(Translate.datetime_to_sql(dateTime), sql)
-    end
-  end
-
-  def test_sql_to_date
-    testCases = [
-      [2000, 1, 1],
-      [1899, 12, 31],
-    ]
-    for testCase in testCases
-      sql = "%04d-%02d-%02d" % testCase
-      date = Date.civil(*testCase)
-      assertEquals(Translate.sql_to_date(sql), date)
-    end
-  end
-
-  def test_deep_collect
-    testCases = [
-      ["1", 1],
-      [[], []],
-      [["1"], [1]],
-      [["1", "2"], [1, 2]],
-      [["1", ["2", "3"], []], [1, [2, 3], []]],
-    ]
-    for testCase in testCases
-      a, result = *testCase
-      assertEquals(Translate.deep_collect(a) do |e| e.to_i end, result)
-    end
-  end
-
-end
-
-TranslateTest.new.run if $0 == __FILE__
-
-# Local Variables:
-# tab-width: 2
-# ruby-indent-level: 2
-# indent-tabs-mode: nil
-# End: