X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F15sybase_common.t;h=178885786c9ec29c97ea54d45ad9ba4876acea5d;hb=6ecee5848ca2824f1b8263c5e1e4fff032537085;hp=847b253817439bc3ec77cc2589b55d1658fd1d24;hpb=de82711a0abb69a8f67fc81e5e27f627d7053bf2;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/t/15sybase_common.t b/t/15sybase_common.t
index 847b253..1788857 100644
--- a/t/15sybase_common.t
+++ b/t/15sybase_common.t
@@ -2,6 +2,8 @@ use strict;
 use lib qw(t/lib);
 use dbixcsl_common_tests;
 use Test::More;
+use Test::Exception;
+use List::MoreUtils 'apply';
 
 my $dsn      = $ENV{DBICTEST_SYBASE_DSN} || '';
 my $user     = $ENV{DBICTEST_SYBASE_USER} || '';
@@ -23,9 +25,45 @@ my $tester = dbixcsl_common_tests->new(
                     computed_dt AS getdate()
                 )
             },
+# Test data types, see http://ispirer.com/wiki/sqlways/sybase/data-types
+# XXX handle FLOAT(P) at some point
+            q{
+                CREATE TABLE sybase_loader_test2 (
+                    id INTEGER IDENTITY NOT NULL PRIMARY KEY,
+                    a_text TEXT,
+                    a_unitext UNITEXT,
+                    an_image IMAGE,
+                    a_bigint BIGINT,
+                    an_int INT,
+                    an_integer INTEGER,
+                    a_smallint SMALLINT,
+                    a_tinyint TINYINT,
+                    a_real REAL,
+                    a_double_precision DOUBLE PRECISION,
+                    a_date DATE,
+                    a_time TIME,
+                    a_datetime DATETIME,
+                    a_smalldatetime SMALLDATETIME,
+                    a_money MONEY,
+                    a_smallmoney SMALLMONEY,
+                    a_timestamp timestamp,
+                    a_bit BIT,
+                    a_char_with_precision CHAR(2),
+                    an_nchar_with_precision NCHAR(2),
+                    a_unichar_with_precision UNICHAR(2),
+                    a_varchar_with_precision VARCHAR(2),
+                    an_nvarchar_with_precision NVARCHAR(2),
+                    a_univarchar_with_precision UNIVARCHAR(2),
+                    a_float FLOAT,
+                    a_binary_with_precision BINARY(2),
+                    a_varbinary_with_precision VARBINARY(2),
+                    the_numeric NUMERIC(6,3),
+                    the_decimal DECIMAL(6,3)
+                )
+            },
         ],
-        drop  => [ qw/ sybase_loader_test1 / ],
-        count => 7,
+        drop  => [ qw/ sybase_loader_test1 sybase_loader_test2 / ],
+        count => 38,
         run   => sub {
             my ($schema, $monikers, $classes) = @_;
 
@@ -33,47 +71,84 @@ my $tester = dbixcsl_common_tests->new(
             my $rsrc = $rs->result_source;
 
             is $rsrc->column_info('id')->{data_type},
-                'numeric',
+                'int',
                 'INTEGER IDENTITY data_type is correct';
 
             is $rsrc->column_info('id')->{is_auto_increment},
                 1,
                 'INTEGER IDENTITY is_auto_increment => 1';
 
-            {
-                local $TODO = 'timestamp introspection broken';
-
-                is $rsrc->column_info('ts')->{data_type},
-                   'timestamp',
-                   'timestamps have the correct data_type';
-            }
+            is $rsrc->column_info('ts')->{data_type},
+               'timestamp',
+               'timestamps have the correct data_type';
 
             is $rsrc->column_info('charfield')->{data_type},
                 'varchar',
                 'VARCHAR has correct data_type';
 
-            {
-                local $TODO = 'constant DEFAULT introspection';
-
-                is $rsrc->column_info('charfield')->{default},
-                    'foo',
-                    'constant DEFAULT is correct';
-            }
+            is $rsrc->column_info('charfield')->{default_value},
+                'foo',
+                'constant DEFAULT is correct';
 
             is $rsrc->column_info('charfield')->{size},
                 10,
                 'VARCHAR(10) has correct size';
 
-            {
-                local $TODO = 'data_type for computed columns';
+            ok ((exists $rsrc->column_info('computed_dt')->{data_type}
+              && (not defined $rsrc->column_info('computed_dt')->{data_type})),
+                'data_type for computed column exists and is undef')
+            or diag "Data type is: ",
+                $rsrc->column_info('computed_dt')->{data_type}
+            ;
+
+            my $computed_dt_default =
+                $rsrc->column_info('computed_dt')->{default_value};
+
+            ok ((ref $computed_dt_default eq 'SCALAR'),
+                'default_value for computed column is a scalar ref')
+            or diag "default_value is: ", $computed_dt_default
+            ;
 
-                ok ((exists $rsrc->column_info('computed_dt')->{data_type}
-                  && (not defined $rsrc->column_info('computed_dt')->{data_type})),
-                    'data_type for computed column exists and is undef')
-#               or diag "Data type is: ",
-#                   $rsrc->column_info('computed_dt')->{data_type}
-                ;
+            eval { is $$computed_dt_default,
+                'getdate()',
+                'default_value for computed column is correct' };
+
+            $rsrc = $schema->resultset($monikers->{sybase_loader_test2})
+                ->result_source;
+            my @type_columns = grep /^a/, $rsrc->columns;
+            my @without_precision = grep !/_with_precision\z/, @type_columns;
+            my @with_precision    = grep  /_with_precision\z/, @type_columns;
+            my %with_precision;
+            @with_precision{
+                apply { s/_with_precision\z// } @with_precision
+            } = ();
+
+            for my $col (@without_precision) {
+                my ($data_type) = $col =~ /^an?_(.*)/;
+                $data_type =~ s/_/ /g;
+
+                ok((not exists $rsrc->column_info($col)->{size}),
+                    "$data_type " .
+                    (exists $with_precision{$col} ? 'without precision ' : '') .
+                    "has no 'size' column_info")
+                or diag "size is ".$rsrc->column_info($col)->{size}."\n";
             }
+
+            for my $col (@with_precision) {
+                my ($data_type) = $col =~ /^an?_(.*)_with_precision\z/;
+                ($data_type = uc $data_type) =~ s/_/ /g;
+                my $size = $rsrc->column_info($col)->{size};
+
+                is $size, 2,
+                  "$data_type with precision has a correct 'size' column_info";
+            }
+
+            is_deeply $rsrc->column_info('the_numeric')->{size}, [6,3],
+                'size for NUMERIC(precision, scale) is correct';
+
+            is_deeply $rsrc->column_info('the_decimal')->{size}, [6,3],
+                'size for DECIMAL(precision, scale) is correct';
+
         },
     },
 );