general cleanup for slightly more reasonable api

[dbsrgits/DBIx-Class-DeploymentHandler.git] / lib / DBIx / Class / DeploymentHandler / DeployMethod / SQL / Translator.pm

diff --git a/lib/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator.pm b/lib/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator.pm
index 2591006..d2d08c0 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator.pm
+++ b/lib/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator.pm
@@ -33,18 +33,6 @@ has upgrade_directory => (
   default  => 'sql',
 );
 
-has version_rs => (
-  isa        => 'DBIx::Class::ResultSet',
-  is         => 'ro',
-  lazy_build => 1,
-  handles    => [qw( is_installed db_version )],
-);
-
-method _build_version_rs {
-   $self->schema->set_us_up_the_bomb;
-   $self->schema->resultset('__VERSION')
-}
-
 has databases => (
   coerce  => 1,
   isa     => 'DBIx::Class::DeploymentHandler::Databases',
@@ -80,7 +68,7 @@ method _deployment_statements {
   my $schema   = $self->schema;
   my $type     = $self->storage->sqlt_type;
   my $sqltargs = $self->sqltargs;
-  my $version  = $self->schema_version || '1.x';
+  my $version  = $self->schema_version;
 
   my $filename = $self->_ddl_filename($type, [ $version ], $dir);
   if(-f $filename) {
@@ -161,20 +149,16 @@ sub prepare_install {
     $dir = "./";
   }
 
-  my $version = $schema->schema_version || '1.x';
-  my $schema_version = $schema->schema_version || '1.x';
-  $version ||= $schema_version;
+  my $version = $schema->schema_version;
 
-  $sqltargs = {
+  my $sqlt = SQL::Translator->new({
     add_drop_table => 1,
     ignore_constraint_names => 1,
     ignore_index_names => 1,
+    parser => 'SQL::Translator::Parser::DBIx::Class',
     %{$sqltargs || {}}
-  };
-
-  my $sqlt = SQL::Translator->new( $sqltargs );
+  });
 
-  $sqlt->parser('SQL::Translator::Parser::DBIx::Class');
   my $sqlt_schema = $sqlt->translate({ data => $schema })
     or $self->throw_exception ($sqlt->error);
 
@@ -184,8 +168,7 @@ sub prepare_install {
     $sqlt->producer($db);
 
     my $filename = $self->_ddl_filename($db, [ $version ], $dir);
-    if (-e $filename && ($version eq $schema_version )) {
-      # if we are dumping the current version, overwrite the DDL
+    if (-e $filename ) {
       carp "Overwriting existing DDL file - $filename";
       unlink $filename;
     }
@@ -206,7 +189,15 @@ sub prepare_install {
 }
 
 sub prepare_update {
-  my ($self, $version, $preversion) = @_;
+  my ($self, $from_version, $to_version, $version_set) = @_;
+
+  $from_version ||= $self->db_version;
+  $to_version   ||= $self->schema_version;
+
+  # for updates prepared automatically (rob's stuff)
+  # one would want to explicitly set $version_set to
+  # [$to_version]
+  $version_set  ||= [$from_version, $to_version];
   my $schema    = $self->schema;
   my $databases = $self->databases;
   my $dir       = $self->upgrade_directory;
@@ -217,8 +208,7 @@ sub prepare_update {
     $dir = "./";
   }
 
-  my $schema_version = $schema->schema_version || '1.x';
-  $version ||= $schema_version;
+  my $schema_version = $schema->schema_version;
 
   $sqltargs = {
     add_drop_table => 1,
@@ -238,13 +228,13 @@ sub prepare_update {
     $sqlt->{schema} = $sqlt_schema;
     $sqlt->producer($db);
 
-    my $prefilename = $self->_ddl_filename($db, [ $preversion ], $dir);
+    my $prefilename = $self->_ddl_filename($db, [ $from_version ], $dir);
     unless(-e $prefilename) {
       carp("No previous schema file found ($prefilename)");
       next;
     }
 
-    my $diff_file = $self->_ddl_filename($db, [ $preversion, $version ], $dir );
+    my $diff_file = $self->_ddl_filename($db, $version_set, $dir );
     if(-e $diff_file) {
       carp("Overwriting existing diff file - $diff_file");
       unlink $diff_file;
@@ -285,7 +275,7 @@ sub prepare_update {
       $t->parser( $db ) # could this really throw an exception?
         or $self->throw_exception ($t->error);
 
-      my $filename = $self->_ddl_filename($db, [ $version ], $dir);
+      my $filename = $self->_ddl_filename($db, [ $to_version ], $dir);
       my $out = $t->translate( $filename )
         or $self->throw_exception ($t->error);
 
@@ -330,7 +320,6 @@ method _read_sql_file($file) {
 sub _upgrade_single_step {
   my $self = shift;
   my @version_set = @{ shift @_ };
-  my $db_version = $self->db_version;
   my $upgrade_file = $self->_ddl_filename(
     $self->storage->sqlt_type,
     \@version_set,
@@ -343,16 +332,8 @@ sub _upgrade_single_step {
     return;
   }
 
-  carp "DB version ($db_version) is lower than the schema version (".$self->schema_version."). Attempting upgrade.\n";
-
   $self->_filedata($self->_read_sql_file($upgrade_file)); # I don't like this --fREW 2010-02-22
   $self->schema->txn_do(sub { $self->_do_upgrade });
-
-  $self->version_rs->create({
-    version     => $version_set[-1],
-    # ddl         => $ddl,
-    # upgrade_sql => $upgrade_sql,
-  });
 }
 
 method _do_upgrade { $self->_run_upgrade(qr/.*?/) }