X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FVersioned.pm;h=6ab73e42959a617dd83084ead945139ae50e709e;hb=e2c0df8e0b707050eb005ac6f68548f857a36acf;hp=d98b024c6422247aa21e229c6b1aa6b6e4286c33;hpb=0d6f11f10031c112775076275f53fbcad1ed67ff;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/Schema/Versioned.pm b/lib/DBIx/Class/Schema/Versioned.pm
index d98b024..6ab73e4 100644
--- a/lib/DBIx/Class/Schema/Versioned.pm
+++ b/lib/DBIx/Class/Schema/Versioned.pm
@@ -44,7 +44,6 @@ use warnings;
 use base 'DBIx::Class';
 use POSIX 'strftime';
 use Data::Dumper;
-# use DBIx::Class::Version;
 
 __PACKAGE__->mk_classdata('_filedata');
 __PACKAGE__->mk_classdata('upgrade_directory');
@@ -52,15 +51,14 @@ __PACKAGE__->mk_classdata('upgrade_directory');
 sub on_connect
 {
     my ($self) = @_;
-#    print "on_connect\n";
     my $vschema = DBIx::Class::Version->connect(@{$self->storage->connect_info()});
     my $vtable = $vschema->resultset('Table');
     my $pversion;
+
     if(!$self->exists($vtable))
     {
-#        print "deploying.. \n";
-        $vschema->storage->debug(1);
-#        print "Debugging is: ", $vschema->storage->debug, "\n";
+#        $vschema->storage->debug(1);
+        $vschema->storage->ensure_connected();
         $vschema->deploy();
         $pversion = 0;
     }
@@ -83,21 +81,22 @@ sub on_connect
         return 1;
     }
 
-    
-    $vtable->create({ Version => $self->VERSION,
-                      Installed => strftime("%Y-%m-%d %H:%M:%S", gmtime())
-                      });
+## use IC::DT?    
 
     if(!$pversion)
     {
-        warn "No previous version found, skipping upgrade\n";
+        $vtable->create({ Version => $self->VERSION,
+                          Installed => strftime("%Y-%m-%d %H:%M:%S", gmtime())
+                          });
+        ## If we let the user do this, where does the Version table get updated?
+        warn "No previous version found, calling deploy to install this version.\n";
+        $self->deploy();
         return 1;
     }
 
-#    $self->create_upgrades($self->upgrade_directoy, $pversion, $self->VERSION);
-
-    my $file = $self->ddl_filename($self->upgrade_directory,
+    my $file = $self->ddl_filename(
                                    $self->storage->sqlt_type,
+                                   $self->upgrade_directory,
                                    $self->VERSION
                                    );
     if(!$file)
@@ -106,35 +105,43 @@ sub on_connect
         return 1;
     }
 
-    $file =~ s/@{[ $self->VERSION ]}/"${pversion}-" . $self->VERSION/e;
+     $file = $self->ddl_filename(
+                                 $self->storage->sqlt_type,
+                                 $self->upgrade_directory,
+                                 $self->VERSION,
+                                 $pversion,
+                                 );
+#    $file =~ s/@{[ $self->VERSION ]}/"${pversion}-" . $self->VERSION/e;
     if(!-f $file)
     {
         warn "Upgrade not possible, no upgrade file found ($file)\n";
         return;
     }
-#    print "Found Upgrade file: $file\n";
+
     my $fh;
     open $fh, "<$file" or warn("Can't open upgrade file, $file ($!)");
     my @data = split(/;\n/, join('', <$fh>));
     close($fh);
     @data = grep { $_ && $_ !~ /^-- / } @data;
     @data = grep { $_ !~ /^(BEGIN TRANACTION|COMMIT)/m } @data;
-#    print "Commands: ", join("\n", @data), "\n";
-    $self->_filedata(\@data);
 
-    $self->backup();
-    $self->upgrade($pversion, $self->VERSION);
+    $self->_filedata(\@data);
 
+    ## Don't do this yet, do only on command?
+    ## If we do this later, where does the Version table get updated??
+    warn "Versions out of sync. This is " . $self->VERSION . 
+        ", your database contains version $pversion, please call upgrade on your Schema.\n";
+#    $self->upgrade($pversion, $self->VERSION);
 }
 
 sub exists
 {
     my ($self, $rs) = @_;
 
-    eval {
+    my $c = eval {
         $rs->search({ 1, 0 })->count;
     };
-    return 0 if $@;
+    return 0 if $@ || !defined $c;
 
     return 1;
 }
@@ -152,12 +159,20 @@ sub upgrade
 
     ## overridable sub, per default just run all the commands.
 
+    $self->backup();
+
     $self->run_upgrade(qr/create/i);
     $self->run_upgrade(qr/alter table .*? add/i);
     $self->run_upgrade(qr/alter table .*? (?!drop)/i);
     $self->run_upgrade(qr/alter table .*? drop/i);
     $self->run_upgrade(qr/drop/i);
-    $self->run_upgrade(qr//i);
+#    $self->run_upgrade(qr//i);
+
+    my $vschema = DBIx::Class::Version->connect(@{$self->storage->connect_info()});
+    my $vtable = $vschema->resultset('Table');
+    $vtable->create({ Version => $self->VERSION,
+                      Installed => strftime("%Y-%m-%d %H:%M:%S", gmtime())
+                      });
 }
 
 
@@ -179,6 +194,8 @@ sub run_upgrade
     return 1;
 }
 
+1;
+
 =head1 NAME
 
 DBIx::Class::Versioning - DBIx::Class::Schema plugin for Schema upgrades
@@ -245,6 +262,9 @@ database type.
 
 This method should return the name of the backup file, if appropriate.
 
+C<backup> is called from C<upgrade>, make sure you call it, if you write your
+own <upgrade> method.
+
 =head2 upgrade
 
 This is an overwritable method used to run your upgrade. The freeform method