X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F94versioning.t;h=674a855317527949ca1ae72b2971ca88cfe684d2;hb=2ad89bf5245096ebf2f9a9df53525c323dd6e44b;hp=0538f84edb6911b380489ada8a2a6c86d4fd41b5;hpb=99a74c4ad4029a2fde7665d47cd444c041737c58;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/94versioning.t b/t/94versioning.t
index 0538f84..674a855 100644
--- a/t/94versioning.t
+++ b/t/94versioning.t
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+
 use strict;
 use warnings;
 use Test::More;
@@ -14,45 +15,69 @@ BEGIN {
   plan skip_all => 'Set $ENV{DBICTEST_MYSQL_DSN}, _USER and _PASS to run this test'
     unless ($dsn);
 
+  eval { require Time::HiRes }
+    || plan skip_all => 'Test needs Time::HiRes';
+  Time::HiRes->import(qw/time sleep/);
 
-    eval "use DBD::mysql; use SQL::Translator 0.09;";
-    plan $@
-        ? ( skip_all => 'needs DBD::mysql and SQL::Translator 0.09 for testing' )
-        : ( tests => 17 );
+  require DBIx::Class::Storage::DBI;
+  plan skip_all =>
+      'Test needs SQL::Translator ' . DBIx::Class::Storage::DBI->_sqlt_minimum_version
+    if not DBIx::Class::Storage::DBI->_sqlt_version_ok;
 }
 
 my $version_table_name = 'dbix_class_schema_versions';
 my $old_table_name = 'SchemaVersions';
 
+my $ddl_dir = File::Spec->catdir ('t', 'var');
+my $fn = {
+    v1 => File::Spec->catfile($ddl_dir, 'DBICVersion-Schema-1.0-MySQL.sql'),
+    v2 => File::Spec->catfile($ddl_dir, 'DBICVersion-Schema-2.0-MySQL.sql'),
+    trans => File::Spec->catfile($ddl_dir, 'DBICVersion-Schema-1.0-2.0-MySQL.sql'),
+};
+
 use lib qw(t/lib);
+use DBICTest; # do not remove even though it is not used
+
 use_ok('DBICVersionOrig');
 
 my $schema_orig = DBICVersion::Schema->connect($dsn, $user, $pass, { ignore_version => 1 });
 eval { $schema_orig->storage->dbh->do('drop table ' . $version_table_name) };
 eval { $schema_orig->storage->dbh->do('drop table ' . $old_table_name) };
 
-is($schema_orig->ddl_filename('MySQL', '1.0', 't/var'), File::Spec->catfile('t', 'var', 'DBICVersion-Schema-1.0-MySQL.sql'), 'Filename creation working');
-unlink('t/var/DBICVersion-Schema-1.0-MySQL.sql') if (-e 't/var/DBICVersion-Schema-1.0-MySQL.sql');
-$schema_orig->create_ddl_dir('MySQL', undef, 't/var');
+is($schema_orig->ddl_filename('MySQL', '1.0', $ddl_dir), $fn->{v1}, 'Filename creation working');
+unlink( $fn->{v1} ) if ( -e $fn->{v1} );
+$schema_orig->create_ddl_dir('MySQL', undef, $ddl_dir);
 
-ok(-f 't/var/DBICVersion-Schema-1.0-MySQL.sql', 'Created DDL file');
+ok(-f $fn->{v1}, 'Created DDL file');
 $schema_orig->deploy({ add_drop_table => 1 });
-$schema_orig->upgrade();
 
 my $tvrs = $schema_orig->{vschema}->resultset('Table');
 is($schema_orig->_source_exists($tvrs), 1, 'Created schema from DDL file');
 
+# loading a new module defining a new version of the same table
+DBICVersion::Schema->_unregister_source ('Table');
 eval "use DBICVersionNew";
+
+my $schema_upgrade = DBICVersion::Schema->connect($dsn, $user, $pass, { ignore_version => 1 });
 {
-  unlink('t/var/DBICVersion-Schema-2.0-MySQL.sql');
-  unlink('t/var/DBICVersion-Schema-1.0-2.0-MySQL.sql');
+  unlink($fn->{v2});
+  unlink($fn->{trans});
 
-  my $schema_upgrade = DBICVersion::Schema->connect($dsn, $user, $pass, { ignore_version => 1 });
   is($schema_upgrade->get_db_version(), '1.0', 'get_db_version ok');
   is($schema_upgrade->schema_version, '2.0', 'schema version ok');
-  $schema_upgrade->create_ddl_dir('MySQL', '2.0', 't/var', '1.0');
-  ok(-f 't/var/DBICVersion-Schema-1.0-2.0-MySQL.sql', 'Created DDL file');
-  $schema_upgrade->upgrade();
+  $schema_upgrade->create_ddl_dir('MySQL', '2.0', $ddl_dir, '1.0');
+  ok(-f $fn->{trans}, 'Created DDL file');
+
+  {
+    my $w;
+    local $SIG{__WARN__} = sub { $w = shift };
+
+    sleep 1;    # remove this when TODO below is completed
+
+    $schema_upgrade->upgrade();
+    like ($w, qr/Attempting upgrade\.$/, 'Warn before upgrade');
+  }
+
   is($schema_upgrade->get_db_version(), '2.0', 'db version number upgraded');
 
   eval {
@@ -60,8 +85,21 @@ eval "use DBICVersionNew";
   };
   is($@, '', 'new column created');
 
-  # should overwrite files
-  $schema_upgrade->create_ddl_dir('MySQL', '2.0', 't/var', '1.0');
+  # should overwrite files and warn about it
+  my @w;
+  local $SIG{__WARN__} = sub { 
+    if ($_[0] =~ /Overwriting existing/) {
+      push @w, $_[0];
+    }
+    else {
+      warn @_;
+    }
+  };
+  $schema_upgrade->create_ddl_dir('MySQL', '2.0', $ddl_dir, '1.0');
+
+  is (2, @w, 'A warning generated for both the DDL and the diff');
+  like ($w[0], qr/Overwriting existing DDL file - $fn->{v2}/, 'New version DDL overwrite warning');
+  like ($w[1], qr/Overwriting existing diff file - $fn->{trans}/, 'Upgrade diff overwrite warning');
 }
 
 {
@@ -96,7 +134,7 @@ eval "use DBICVersionNew";
 
 
   my $warn = '';
-  $SIG{__WARN__} = sub { $warn = shift };
+  local $SIG{__WARN__} = sub { $warn = shift };
   $schema_version = DBICVersion::Schema->connect($dsn, $user, $pass);
   like($warn, qr/Your DB is currently unversioned/, 'warning detected without env var or attr');
 
@@ -107,7 +145,7 @@ eval "use DBICVersionNew";
   is($warn, '', 'warning not detected with attr set');
   # should not warn
 
-  $ENV{DBIC_NO_VERSION_CHECK} = 1;
+  local $ENV{DBIC_NO_VERSION_CHECK} = 1;
   $warn = '';
   $schema_version = DBICVersion::Schema->connect($dsn, $user, $pass);
   is($warn, '', 'warning not detected with env var set');
@@ -118,3 +156,34 @@ eval "use DBICVersionNew";
   like($warn, qr/Your DB is currently unversioned/, 'warning detected without env var or attr');
   # should warn
 }
+
+# attempt a deploy/upgrade cycle within one second
+TODO: {
+
+  local $TODO = 'To fix this properly the table must be extended with an autoinc column, mst will not accept anything less';
+
+  eval { $schema_orig->storage->dbh->do('drop table ' . $version_table_name) };
+  eval { $schema_orig->storage->dbh->do('drop table ' . $old_table_name) };
+  eval { $schema_orig->storage->dbh->do('drop table TestVersion') };
+
+  # this attempts to sleep until the turn of the second
+  my $t = time();
+  sleep (int ($t) + 1 - $t);
+  diag ('Fast deploy/upgrade start: ', time() );
+
+  {
+    local $DBICVersion::Schema::VERSION = '1.0';
+    $schema_orig->deploy;
+  }
+
+  local $SIG{__WARN__} = sub { warn if $_[0] !~ /Attempting upgrade\.$/ };
+  $schema_upgrade->upgrade();
+
+  is($schema_upgrade->get_db_version(), '2.0', 'Fast deploy/upgrade');
+};
+
+unless ($ENV{DBICTEST_KEEP_VERSIONING_DDL}) {
+    unlink $_ for (values %$fn);
+}
+
+done_testing;