dbd-pg 0.3.6 → 0.3.7

data/lib/dbd/Pg.rb

@@ -49,7 +49,7 @@ module DBI
         # Only things that extend DBI's results are documented.
         #
         module Pg
-            VERSION          = "0.3.6"
+            VERSION          = "0.3.7"
             DESCRIPTION      = "PostgreSQL DBI DBD"
 
             #

data/lib/dbd/pg/database.rb

@@ -74,7 +74,7 @@ class DBI::DBD::Pg::Database < DBI::BaseDatabase
         @attr.each { |k,v| self[k] = v} 
         @attr["pg_native_binding"] = true unless @attr.has_key? "pg_native_binding"
 
-        @type_map = __types
+        load_type_map
 
         self['AutoCommit'] = true    # Postgres starts in unchained mode (AutoCommit=on) by default 
 
@@ -340,6 +340,7 @@ class DBI::DBD::Pg::Database < DBI::BaseDatabase
         when 'date'                      then DBI::Type::Timestamp
         when 'decimal', 'numeric'        then DBI::Type::Decimal
         when 'bytea'                     then DBI::DBD::Pg::Type::ByteA
+        when 'enum'                      then DBI::Type::Varchar
         end
     end
 
@@ -350,7 +351,7 @@ class DBI::DBD::Pg::Database < DBI::BaseDatabase
     def load_type_map
         @type_map = Hash.new
 
-        res = _exec("SELECT oid, typname, typelem FROM pg_type WHERE typtype = 'b'")
+        res = _exec("SELECT oid, typname, typelem FROM pg_type WHERE typtype IN ('b', 'e')")
 
         res.each do |row|
             rowtype = parse_type_name(row["typname"])

data/lib/dbd/pg/tuples.rb

@@ -8,7 +8,7 @@
 #
 class DBI::DBD::Pg::Tuples
 
-    def initialize(db,pg_result)
+    def initialize(db, pg_result)
         @db = db
         @pg_result = pg_result
         @index = -1
@@ -37,7 +37,8 @@ class DBI::DBD::Pg::Tuples
                 typeinfo = DBI::DBD::Pg.parse_type(res[0].values[0])
             end
 
-            h = { "name" => str }.merge(@db.type_map[@pg_result.ftype(i)])
+            map = @db.type_map[@pg_result.ftype(i)] || { }
+            h = { "name" => str }.merge(map)
 
             if typeinfo
                 h["precision"]     = typeinfo[:size]

data/test/dbd/general/test_database.rb

@@ -41,7 +41,7 @@
             end
 
             assert_equal(
-                DBI::Type::Varchar.object_id, 
+                DBI::Type::Varchar.object_id,
                 DBI::TypeUtil.type_name_to_module(cols[0]["type_name"]).object_id
             )
 
@@ -51,9 +51,9 @@
             assert(cols[1]["nullable"])
             assert_equal(1, cols[2]["scale"])
             assert_equal(2, cols[2]["precision"])
-            
+
             assert_equal(
-                DBI::Type::Integer.object_id, 
+                DBI::Type::Integer.object_id,
                 DBI::TypeUtil.type_name_to_module(cols[1]["type_name"]).object_id
             )
 
@@ -64,7 +64,7 @@
             assert_equal(1, cols[2]["scale"])
             assert_equal(2, cols[2]["precision"])
             assert_equal(
-                DBI::Type::Decimal.object_id, 
+                DBI::Type::Decimal.object_id,
                 DBI::TypeUtil.type_name_to_module(cols[2]["type_name"]).object_id
             )
 
@@ -75,7 +75,7 @@
             assert_equal(6, cols[3]["scale"])
             assert_equal(30, cols[3]["precision"])
             assert_equal(
-                DBI::Type::Decimal.object_id, 
+                DBI::Type::Decimal.object_id,
                 DBI::TypeUtil.type_name_to_module(cols[3]["type_name"]).object_id
             )
 
@@ -157,11 +157,13 @@
                 "views"
             ]
         end
-        
-        case dbtype 
+
+        case dbtype
         when "postgresql"
             tables.reject! { |x| x =~ /^pg_/ }
-            assert_equal %w(array_test bit_test blob_test boolean_test bytea_test db_specific_types_test field_types_test names precision_test time_test timestamp_test view_names), tables
+            assert_equal %w(array_test bit_test blob_test boolean_test bytea_test db_specific_types_test enum_type_test field_types_test names precision_test time_test timestamp_test view_names), tables
+        when 'sqlite3'
+            assert_equal %w(bit_test blob_test boolean_test db_specific_types_test field_types_test names names_defined_with_spaces precision_test time_test timestamp_test view_names), tables
         else
             assert_equal %w(bit_test blob_test boolean_test db_specific_types_test field_types_test names precision_test time_test timestamp_test view_names), tables
         end
@@ -176,13 +178,13 @@
         assert !@dbh["AutoCommit"]
 
         # test committing an outstanding transaction
-        
+
         @sth = @dbh.prepare("insert into names (name, age) values (?, ?)")
         @sth.execute("Billy", 22)
         @sth.finish
 
         assert @dbh["AutoCommit"] = true # should commit at this point
-        
+
         @sth = @dbh.prepare("select * from names where name = ?")
         @sth.execute("Billy")
         assert_equal [ "Billy", 22 ], @sth.fetch

data/test/dbd/postgresql/down.sql

@@ -22,6 +22,10 @@ drop table bytea_test;
 ---
 drop table precision_test;
 ---
+drop table enum_type_test;
+---
+drop type enum_test;
+---
 drop schema schema1 cascade;
 ---
 drop schema schema2 cascade;

data/test/dbd/postgresql/testdbipg.rb

@@ -25,6 +25,20 @@ class TestDbdPostgres < DBDConfig.testbase(:postgresql)
         end
     end
 
+    def test_enum_type
+        assert_nothing_raised do
+            assert(@dbh.convert_types)
+            @sth = @dbh.prepare("insert into enum_type_test values (?)")
+            @sth.execute("one")
+            @sth.finish
+
+            @sth = @dbh.prepare("select foo from enum_type_test")
+            @sth.execute
+            assert_equal(@sth.fetch, ['one'])
+            @sth.finish
+        end
+    end
+
     def test_statement_finish_deallocates_sth
         assert_nothing_raised do
             @sth = @dbh.prepare("select * from names")

data/test/dbd/postgresql/up.sql

@@ -30,6 +30,10 @@ create table bit_test (mybit bit);
 ---
 create table field_types_test (foo integer not null primary key default 1);
 ---
+create type enum_test as ENUM ('one', 'two', 'three');
+---
+create table enum_type_test (foo enum_test);
+---
 create table db_specific_types_test (foo integer);
 ---
 create table array_test (foo integer[], bar integer[3], baz integer[3][3], quux varchar[2]);

metadata

@@ -1,90 +1,99 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: dbd-pg
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
-date: 2008-11-28 00:00:00 -08:00
-summary: PostgreSQL DBI DBD
-require_paths: 
-- lib
-email: ruby-dbi-users@rubyforge.org
-homepage: http://www.rubyforge.org/projects/ruby-dbi
-rubyforge_project: ruby-dbi
-description: PostgreSQL DBI DBD
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.8.0
-  version: 
+  version: 0.3.7
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Erik Hollensbe
 - Christopher Maujean
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-12-15 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: dbi
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.4.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: pg
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: PostgreSQL DBI DBD
+email: ruby-dbi-users@rubyforge.org
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+- LICENSE
+- ChangeLog
 files: 
-- test/dbd/general/test_database.rb
-- test/dbd/general/test_statement.rb
 - test/dbd/general/test_types.rb
-- test/dbd/postgresql/test_timestamp.rb
-- test/dbd/postgresql/test_arrays.rb
+- test/dbd/general/test_statement.rb
+- test/dbd/general/test_database.rb
+- test/dbd/postgresql/test_ping.rb
 - test/dbd/postgresql/base.rb
-- test/dbd/postgresql/down.sql
-- test/dbd/postgresql/test_bytea.rb
-- test/dbd/postgresql/test_async.rb
+- test/dbd/postgresql/test_timestamp.rb
+- test/dbd/postgresql/base.rb.new
 - test/dbd/postgresql/test_blob.rb
+- test/dbd/postgresql/test_async.rb
+- test/dbd/postgresql/down.sql
 - test/dbd/postgresql/test_transactions.rb
-- test/dbd/postgresql/base.rb.new
-- test/dbd/postgresql/testdbipg.rb
 - test/dbd/postgresql/up.sql
-- test/dbd/postgresql/test_ping.rb
+- test/dbd/postgresql/test_arrays.rb
+- test/dbd/postgresql/testdbipg.rb
+- test/dbd/postgresql/test_bytea.rb
 - lib/dbd/Pg.rb
 - lib/dbd/pg/database.rb
 - lib/dbd/pg/tuples.rb
+- lib/dbd/pg/statement.rb
 - lib/dbd/pg/exec.rb
 - lib/dbd/pg/type.rb
-- lib/dbd/pg/statement.rb
 - test/DBD_TESTS
 - README
 - LICENSE
 - ChangeLog
-test_files: 
-- test/ts_dbd.rb
+has_rdoc: true
+homepage: http://www.rubyforge.org/projects/ruby-dbi
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: 
-- README
-- LICENSE
-- ChangeLog
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: 1.8.0
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: dbi
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.4.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: pg
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
+rubyforge_project: ruby-dbi
+rubygems_version: 1.3.1
+signing_key: 
+specification_version: 2
+summary: PostgreSQL DBI DBD
+test_files: 
+- test/ts_dbd.rb