X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F11mysql_common.t;h=34ae23bcc0ff730916a843da87a23a3a63ba20b0;hb=26334ec166bf25d77c0342c85efebe853303ff41;hp=44924ebf92e9fc91a728aa9e740c281a13d4df3d;hpb=d05d0f449e9354c9c4f1d96952572c8864fa1079;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/t/11mysql_common.t b/t/11mysql_common.t
index 44924eb..34ae23b 100644
--- a/t/11mysql_common.t
+++ b/t/11mysql_common.t
@@ -1,14 +1,14 @@
 use strict;
+use Test::More;
 use lib qw(t/lib);
 use dbixcsl_common_tests;
-use Test::More;
 
 my $dsn         = $ENV{DBICTEST_MYSQL_DSN} || '';
 my $user        = $ENV{DBICTEST_MYSQL_USER} || '';
 my $password    = $ENV{DBICTEST_MYSQL_PASS} || '';
 my $test_innodb = $ENV{DBICTEST_MYSQL_INNODB} || 0;
 
-my $skip_rels_msg = 'You need to set the DBICTEST_MYSQL_INNODB environment variable to test relationships';
+my $skip_rels_msg = 'You need to set the DBICTEST_MYSQL_INNODB environment variable to test relationships.';
 
 my $tester = dbixcsl_common_tests->new(
     vendor           => 'Mysql',
@@ -18,92 +18,117 @@ my $tester = dbixcsl_common_tests->new(
     user             => $user,
     password         => $password,
     connect_info_opts=> { on_connect_call => 'set_strict_mode' },
-    skip_rels        => $test_innodb ? 0 : $skip_rels_msg,
+    skip_rels        => $test_innodb ? 0 : 1,
     no_inline_rels   => 1,
     no_implicit_rels => 1,
     data_types  => {
         # http://dev.mysql.com/doc/refman/5.5/en/data-type-overview.html
         # Numeric Types
-        'smallint '    => { data_type => 'SMALLINT',  size => 6  },   # Space in key makes column name smallint_
-        'mediumint '   => { data_type => 'MEDIUMINT', size => 9  },   # to avoid MySQL reserved word.
-        'int '         => { data_type => 'INT',       size => 11 },
-        'integer '     => { data_type => 'INT',       size => 11 },
-        'bigint '      => { data_type => 'BIGINT',    size => 20 },
-        'serial '      => { data_type => 'BIGINT',    size => 20, is_auto_increment => 1, extra => {unsigned => 1} },
-        'float '       => { data_type => 'FLOAT',     size => 32 },
-        'double '      => { data_type => 'DOUBLE',    size => 64 },
+        'bit'         => { data_type => 'bit', size => 1 },
+        'bit(11)'     => { data_type => 'bit', size => 11 },
+
+        'bool'        => { data_type => 'tinyint' },
+        'boolean'     => { data_type => 'tinyint' },
+        'tinyint'     => { data_type => 'tinyint' },
+        'tinyint unsigned'
+                      => { data_type => 'tinyint',   extra => { unsigned => 1 } },
+        'smallint'    => { data_type => 'smallint' },
+        'smallint unsigned'
+                      => { data_type => 'smallint',  extra => { unsigned => 1 } },
+        'mediumint'   => { data_type => 'mediumint' },
+        'mediumint unsigned'
+                      => { data_type => 'mediumint', extra => { unsigned => 1 } },
+        'int'         => { data_type => 'integer' },
+        'int unsigned'
+                      => { data_type => 'integer',   extra => { unsigned => 1 } },
+        'integer'     => { data_type => 'integer' },
+        'integer unsigned'
+                      => { data_type => 'integer',   extra => { unsigned => 1 } },
+        'bigint'      => { data_type => 'bigint' },
+        'bigint unsigned'
+                      => { data_type => 'bigint',    extra => { unsigned => 1 } },
+
+        'serial'      => { data_type => 'bigint', is_auto_increment => 1, extra => { unsigned => 1 } },
+
+        'float'       => { data_type => 'float' },
+        'float unsigned'
+                      => { data_type => 'float',     extra => { unsigned => 1 } },
+        'double'      => { data_type => 'double precision' },
+        'double unsigned'
+                      => { data_type => 'double precision', extra => { unsigned => 1 } },
         'double precision' =>
-                          { data_type => 'DOUBLE',    size => 64 },
-        'decimal '     => { data_type => 'DECIMAL',   size => 10 },
-        'dec '         => { data_type => 'DECIMAL',   size => 10 },
-        'fixed '       => { data_type => 'DECIMAL',   size => 10 },
+                         { data_type => 'double precision' },
+        'double precision unsigned'
+                      => { data_type => 'double precision', extra => { unsigned => 1 } },
+
+        # we skip 'real' because its alias depends on the 'REAL AS FLOAT' setting
+
+        'float(2)'    => { data_type => 'float' },
+        'float(24)'   => { data_type => 'float' },
+        'float(25)'   => { data_type => 'double precision' },
+
+        'float(3,3)'  => { data_type => 'float', size => [3,3] },
+        'double(3,3)' => { data_type => 'double precision', size => [3,3] },
+        'double precision(3,3)'
+                      => { data_type => 'double precision', size => [3,3] },
+
+        'decimal'     => { data_type => 'decimal' },
+        'decimal unsigned'
+                      => { data_type => 'decimal', extra => { unsigned => 1 } },
+        'dec'         => { data_type => 'decimal' },
+        'numeric'     => { data_type => 'decimal' },
+        'fixed'       => { data_type => 'decimal' },
+
+        'decimal(3)'   => { data_type => 'decimal', size => [3,0] },
+
+        'decimal(3,3)' => { data_type => 'decimal', size => [3,3] },
+        'dec(3,3)'     => { data_type => 'decimal', size => [3,3] },
+        'numeric(3,3)' => { data_type => 'decimal', size => [3,3] },
+        'fixed(3,3)'   => { data_type => 'decimal', size => [3,3] },
+
         # Date and Time Types
-        'date '        => { data_type => 'DATE',      size => 10 },
-        'datetime '    => { data_type => 'DATETIME',  size => 19 },
-        'timestamp '   => { data_type => 'TIMESTAMP', size => 14, default_value => \"CURRENT_TIMESTAMP" },
-        'time '        => { data_type => 'TIME',      size => 8  },
-        'year '        => { data_type => 'YEAR',      size => 4  },
+        'date'        => { data_type => 'date' },
+        'datetime'    => { data_type => 'datetime' },
+        'timestamp DEFAULT current_timestamp'
+                      => { data_type => 'timestamp', default_value => \"CURRENT_TIMESTAMP" },
+        'time'        => { data_type => 'time' },
+        'year'        => { data_type => 'year' },
+        'year(4)'     => { data_type => 'year' },
+        'year(2)'     => { data_type => 'year', size => 2 },
+
         # String Types
-        'char '        => { data_type => 'CHAR',      size => 1  },
-        'varchar(20)'  => { data_type => 'VARCHAR',   size => 20 },
-        'binary(1)'    => { data_type => 'BINARY',    size => 1 },
-        'varbinary(1)' => { data_type => 'VARBINARY', size => 1 },
-        'tinytext '    => { data_type => 'TINYTEXT',  size => 255 },
-        'text '        => { data_type => 'TEXT',      size => 65535 },
-        'longtext '    => { data_type => 'LONGTEXT',  size => 4294967295 },
-        'tinyblob '    => { data_type => 'TINYBLOB',  size => 255 },
-        'blob '        => { data_type => 'BLOB',      size => 65535 },
-        'mediumblob '  => { data_type => 'MEDIUMBLOB',size => 16777215 },
-        'longblob '    => { data_type => 'LONGBLOB',  size => 4294967295 },
-        # Hmm... need some t/lib/dbixcsl_common_tests.pm hackery to get these working I think...
-        # 'enum(1,2,3)'  => { data_type => 'ENUM',  size => 1 },
-        # 'set(1,2,3)'   => { data_type => 'SET',  size => 1 },
+        'char'         => { data_type => 'char',      size => 1  },
+        'char(11)'     => { data_type => 'char',      size => 11 },
+        'varchar(20)'  => { data_type => 'varchar',   size => 20 },
+        'binary'       => { data_type => 'binary',    size => 1  },
+        'binary(11)'   => { data_type => 'binary',    size => 11 },
+        'varbinary(20)'=> { data_type => 'varbinary', size => 20 },
+
+        'tinyblob'    => { data_type => 'tinyblob' },
+        'tinytext'    => { data_type => 'tinytext' },
+        'blob'        => { data_type => 'blob' },
+
+        # text(M) types will map to the appropriate type, length is not stored
+        'text'        => { data_type => 'text' },
+
+        'mediumblob'  => { data_type => 'mediumblob' },
+        'mediumtext'  => { data_type => 'mediumtext' },
+        'longblob'    => { data_type => 'longblob' },
+        'longtext'    => { data_type => 'longtext' },
+
+        "enum('foo', 'bar', 'baz')"
+                      => { data_type => 'enum', extra => { list => [qw/foo bar baz/] } },
+        "set('foo', 'bar', 'baz')"
+                      => { data_type => 'set',  extra => { list => [qw/foo bar baz/] } },
     },
-    extra            => {
-        create => [
-            qq{
-                CREATE TABLE mysql_loader_test1 (
-                    id INTEGER UNSIGNED NOT NULL PRIMARY KEY,
-                    value ENUM('foo', 'bar', 'baz')
-                )
-            },
-            qq{
-                CREATE TABLE mysql_loader_test2 (
-                  id INTEGER UNSIGNED NOT NULL PRIMARY KEY,
-                  somets TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
-                )
-            },
-        ],
-        drop   => [ qw/ mysql_loader_test1 mysql_loader_test2 / ],
-        count  => 5,
-        run    => sub {
-            my ($schema, $monikers, $classes) = @_;
-        
-            my $rs = $schema->resultset($monikers->{mysql_loader_test1});
-            my $column_info = $rs->result_source->column_info('id');
-            
-            is($column_info->{extra}->{unsigned}, 1, 'Unsigned MySQL columns');
-
-            $column_info = $rs->result_source->column_info('value');
-
-            like($column_info->{data_type}, qr/^enum$/i, 'MySQL ENUM type');
-            is_deeply($column_info->{extra}->{list}, [qw/foo bar baz/],
-                      'MySQL ENUM values');
-
-            $rs = $schema->resultset($monikers->{mysql_loader_test2});
-            $column_info = $rs->result_source->column_info('somets');
-            my $default  = $column_info->{default_value};
-            ok ((ref($default) eq 'SCALAR'),
-                'CURRENT_TIMESTAMP default_value is a scalar ref');
-            like $$default, qr/^CURRENT_TIMESTAMP\z/i,
-                'CURRENT_TIMESTAMP default eq "CURRENT_TIMESTAMP"';
-        },
-    }
 );
 
 if( !$dsn || !$user ) {
     $tester->skip_tests('You need to set the DBICTEST_MYSQL_DSN, _USER, and _PASS environment variables');
 }
 else {
+    diag $skip_rels_msg if not $test_innodb;
     $tester->run_tests();
 }
+
+# vim:et sts=4 sw=4 tw=0: