dbd-pg 0.3.4 → 0.3.5

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.4"
+            VERSION          = "0.3.5"
             DESCRIPTION      = "PostgreSQL DBI DBD"
 
             #

data/lib/dbd/pg/database.rb

@@ -338,6 +338,7 @@ class DBI::DBD::Pg::Database < DBI::BaseDatabase
         when 'time', 'timetz'            then DBI::Type::Timestamp
         when 'timestamp', 'timestamptz'  then DBI::Type::Timestamp
         when 'date'                      then DBI::Type::Timestamp
+        when 'decimal', 'numeric'        then DBI::Type::Decimal
         when 'bytea'                     then DBI::DBD::Pg::Type::ByteA
         end
     end

data/test/dbd/general/test_database.rb

@@ -11,7 +11,7 @@
 
             assert(cols)
             assert_kind_of(Array, cols)
-            assert_equal(2, cols.length)
+            assert_equal(4, cols.length)
 
             # the first column should always be "text_field" and have the following
             # properties:
@@ -30,19 +30,41 @@
             end
 
             assert_equal(
-                DBI::Type::Varchar, 
-                DBI::TypeUtil.type_name_to_module(cols[0]["type_name"])
+                DBI::Type::Varchar.object_id, 
+                DBI::TypeUtil.type_name_to_module(cols[0]["type_name"]).object_id
             )
 
             # the second column should always be "integer_field" and have the following
             # properties:
             assert_equal("integer_field", cols[1]["name"])
             assert(cols[1]["nullable"])
-            assert_equal(1, cols[1]["scale"])
-            assert_equal(2, cols[1]["precision"])
+            assert_equal(1, cols[2]["scale"])
+            assert_equal(2, cols[2]["precision"])
             assert_equal(
-                DBI::Type::Decimal, 
-                DBI::TypeUtil.type_name_to_module(cols[1]["type_name"])
+                DBI::Type::Integer.object_id, 
+                DBI::TypeUtil.type_name_to_module(cols[1]["type_name"]).object_id
+            )
+
+            # the second column should always be "integer_field" and have the following
+            # properties:
+            assert_equal("decimal_field", cols[2]["name"])
+            assert(cols[2]["nullable"])
+            assert_equal(1, cols[2]["scale"])
+            assert_equal(2, cols[2]["precision"])
+            assert_equal(
+                DBI::Type::Decimal.object_id, 
+                DBI::TypeUtil.type_name_to_module(cols[2]["type_name"]).object_id
+            )
+
+            # the second column should always be "numeric_field" and have the following
+            # properties:
+            assert_equal("numeric_field", cols[3]["name"])
+            assert(cols[3]["nullable"])
+            assert_equal(6, cols[3]["scale"])
+            assert_equal(30, cols[3]["precision"])
+            assert_equal(
+                DBI::Type::Decimal.object_id, 
+                DBI::TypeUtil.type_name_to_module(cols[3]["type_name"]).object_id
             )
 
             # finally, we ensure that every column in the array is a ColumnInfo
@@ -127,9 +149,9 @@
         case dbtype 
         when "postgresql"
             tables.reject! { |x| x =~ /^pg_/ }
-            assert_equal %w(array_test bit_test blob_test boolean_test bytea_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 field_types_test names precision_test time_test timestamp_test view_names), tables
         else
-            assert_equal %w(bit_test blob_test boolean_test field_types_test names precision_test time_test timestamp_test view_names), tables
+            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
     end
 

data/test/dbd/general/test_statement.rb

@@ -44,7 +44,7 @@
 
             assert(cols)
             assert_kind_of(Array, cols)
-            assert_equal(2, cols.length)
+            assert_equal(4, cols.length)
             
             # the first column should always be "text_field" and have the following
             # properties:
@@ -61,18 +61,49 @@
             end
                 
             assert_equal(
-                DBI::Type::Varchar, 
-                DBI::TypeUtil.type_name_to_module(cols[0]["type_name"])
+                DBI::Type::Varchar.object_id, 
+                DBI::TypeUtil.type_name_to_module(cols[0]["type_name"]).object_id
             )
 
             # the second column should always be "integer_field" and have the following
             # properties:
             assert_equal("integer_field", cols[1]["name"])
-            assert_equal(1, cols[1]["scale"])
-            assert_equal(2, cols[1]["precision"])
+            # if these aren't set on the field, they should not exist
+            # FIXME mysql does not follow this rule, neither does ODBC
+            if dbtype == "mysql" 
+                assert_equal(0, cols[1]["scale"])
+                assert_equal(11, cols[1]["precision"])
+            elsif dbtype == "odbc"
+                assert_equal(0, cols[1]["scale"])
+                assert_equal(10, cols[1]["precision"])
+            else
+                assert(!cols[1]["scale"])
+                assert(!cols[1]["precision"])
+            end
+
+            assert_equal(
+                DBI::Type::Integer.object_id, 
+                DBI::TypeUtil.type_name_to_module(cols[1]["type_name"]).object_id
+            )
+
+            # the second column should always be "integer_field" and have the following
+            # properties:
+            assert_equal("decimal_field", cols[2]["name"])
+            assert_equal(1, cols[2]["scale"])
+            assert_equal(2, cols[2]["precision"])
+            assert_equal(
+                DBI::Type::Decimal.object_id, 
+                DBI::TypeUtil.type_name_to_module(cols[2]["type_name"]).object_id
+            )
+
+            # the second column should always be "numeric_field" and have the following
+            # properties:
+            assert_equal("numeric_field", cols[3]["name"])
+            assert_equal(6, cols[3]["scale"])
+            assert_equal(30, cols[3]["precision"])
             assert_equal(
-                DBI::Type::Decimal, 
-                DBI::TypeUtil.type_name_to_module(cols[1]["type_name"])
+                DBI::Type::Decimal.object_id, 
+                DBI::TypeUtil.type_name_to_module(cols[3]["type_name"]).object_id
             )
 
             cols.each { |col| assert_kind_of(DBI::ColumnInfo, col) }

data/test/dbd/general/test_types.rb

@@ -25,6 +25,34 @@
         end
     end
 
+    def test_numeric_types
+        assert(@dbh.convert_types)
+
+        @sth = @dbh.prepare("insert into precision_test (text_field, integer_field, decimal_field, numeric_field) values (?, ?, ?, ?)")
+        assert(@sth.convert_types)
+        1.step(5) do |x|
+            @sth.execute("poop#{x}", x, x + 0.123, x + 0.234)
+        end
+
+        @sth.finish
+
+        @sth = @dbh.prepare("select integer_field, decimal_field, numeric_field from precision_test")
+        @sth.execute
+        col_info = @sth.column_info
+        1.step(5) do |x|
+            row = @sth.fetch
+
+            assert_kind_of(Integer, row[0])
+            assert_kind_of(BigDecimal, row[1])
+            assert_kind_of(BigDecimal, row[2])
+
+            # FIXME BigDecimal requires a string and some databases will pad
+            # decimal/numeric with constrained precision. We should account for
+            # this, but I'm not quite sure how yet.
+        end
+        @sth.finish
+    end
+
     # FIXME
     # Ideally, this test should be split across the DBI tests and DBD, but for
     # now testing against the DBDs really doesn't cost us anything other than

data/test/dbd/postgresql/down.sql

@@ -14,6 +14,8 @@ drop table bit_test;
 ---
 drop table field_types_test;
 ---
+drop table db_specific_types_test;
+---
 drop table array_test;
 ---
 drop table bytea_test;

data/test/dbd/postgresql/testdbipg.rb

@@ -91,23 +91,6 @@ class TestDbdPostgres < DBDConfig.testbase(:postgresql)
         @sth.finish
     end
 
-    def test_tables
-        assert_equal(
-        [
-            "array_test",
-            "bit_test",
-            "blob_test",
-            "boolean_test",
-            "bytea_test",
-            "field_types_test",
-            "names",
-            "precision_test",
-            "time_test",
-            "timestamp_test",
-            "view_names"
-        ], @dbh.tables.reject { |x| x =~ /^pg_/ }.sort)
-    end
-
     def test_columns
         assert_equal(
             [

data/test/dbd/postgresql/up.sql

@@ -9,7 +9,7 @@ insert into names (name, age) values ('Jim', 30);
 ---
 insert into names (name, age) values ('Bob', 21);
 ---
-create table precision_test (text_field varchar(20) primary key not null, integer_field decimal(2,1));
+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 TABLE blob_test (name VARCHAR(30), data OID);
 ---
@@ -30,6 +30,8 @@ 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 (foo integer);
+---
 create table array_test (foo integer[], bar integer[3], baz integer[3][3], quux varchar[2]);
 ---
 create table bytea_test (foo bytea);

metadata

@@ -1,98 +1,89 @@
 --- !ruby/object:Gem::Specification 
+rubygems_version: 0.9.4
+specification_version: 1
 name: dbd-pg
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.3.5
+date: 2008-11-09 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: 
 platform: ruby
+signing_key: 
+cert_chain: 
+post_install_message: 
 authors: 
 - Erik Hollensbe
 - Christopher Maujean
-autorequire: 
-bindir: bin
-cert_chain: []
-
-date: 2008-09-02 00:00:00 -07: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_types.rb
 - test/dbd/general/test_database.rb
 - test/dbd/general/test_statement.rb
-- test/dbd/postgresql/test_bytea.rb
-- test/dbd/postgresql/test_transactions.rb
-- test/dbd/postgresql/test_ping.rb
-- test/dbd/postgresql/down.sql
+- test/dbd/general/test_types.rb
+- test/dbd/postgresql/test_timestamp.rb
 - test/dbd/postgresql/test_arrays.rb
-- test/dbd/postgresql/testdbipg.rb
-- test/dbd/postgresql/up.sql
 - test/dbd/postgresql/base.rb
-- test/dbd/postgresql/test_timestamp.rb
+- test/dbd/postgresql/down.sql
+- test/dbd/postgresql/test_bytea.rb
 - test/dbd/postgresql/test_async.rb
 - test/dbd/postgresql/test_blob.rb
+- test/dbd/postgresql/test_transactions.rb
+- test/dbd/postgresql/testdbipg.rb
+- test/dbd/postgresql/up.sql
+- test/dbd/postgresql/test_ping.rb
 - lib/dbd/Pg.rb
-- lib/dbd/pg/exec.rb
+- lib/dbd/pg/database.rb
 - lib/dbd/pg/tuples.rb
+- lib/dbd/pg/exec.rb
 - lib/dbd/pg/type.rb
-- lib/dbd/pg/database.rb
 - lib/dbd/pg/statement.rb
 - test/DBD_TESTS
 - README
 - LICENSE
 - ChangeLog
-has_rdoc: true
-homepage: http://www.rubyforge.org/projects/ruby-dbi
-post_install_message: 
+test_files: 
+- test/ts_dbd.rb
 rdoc_options: []
 
-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: 
+extra_rdoc_files: 
+- README
+- LICENSE
+- ChangeLog
+executables: []
+
+extensions: []
+
 requirements: []
 
-rubyforge_project: ruby-dbi
-rubygems_version: 1.2.0
-signing_key: 
-specification_version: 2
-summary: PostgreSQL DBI DBD
-test_files: 
-- test/ts_dbd.rb
+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: