with 'DBIx::Class::DeploymentHandler::HandlesDeploy';
use Carp 'carp';
+has schema => (
+ isa => 'DBIx::Class::Schema',
+ is => 'ro',
+ required => 1,
+ handles => [qw( schema_version )],
+);
+
has storage => (
isa => 'DBIx::Class::Storage',
is => 'ro',
default => sub { [qw( MySQL SQLite PostgreSQL )] },
);
-has schema => (
- isa => 'DBIx::Class::Schema',
- is => 'ro',
- required => 1,
- handles => [qw( schema_version )],
-);
-
has _filedata => (
isa => 'ArrayRef[Str]',
is => 'rw',
);
-method _ddl_filename($type, $versions, $dir) {
+# these two methods should go away once we switch to
+# DBIx::Migration::Directories
+method _ddl_schema_filename($type, $version, $dir) {
+ my $filename = ref $self->schema;
+ $filename =~ s/::/-/g;
+
+ $filename = File::Spec->catfile(
+ $dir, "$filename-schema-$version-$type.sql"
+ );
+
+ return $filename;
+}
+
+method _ddl_schema_diff_filename($type, $versions, $dir) {
my $filename = ref $self->schema;
$filename =~ s/::/-/g;
$filename = File::Spec->catfile(
- $dir, "$filename-" . join( q(-), @{$versions} ) . "-$type.sql"
+ $dir, "$filename-diff-" . join( q(-), @{$versions} ) . "-$type.sql"
);
return $filename;
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);
+ my $filename = $self->_ddl_schema_filename($type, $version, $dir);
if(-f $filename) {
my $file;
open $file, q(<), $filename
my $databases = $self->databases;
my $dir = $self->upgrade_directory;
my $sqltargs = $self->sqltargs;
+ my $version = $schema->schema_version;
+
unless( -d $dir ) {
carp "Upgrade directory $dir does not exist, using ./\n";
- $dir = "./";
+ $dir = './';
}
- my $version = $schema->schema_version || '1.x';
- my $schema_version = $schema->schema_version || '1.x';
- $version ||= $schema_version;
- $sqltargs = {
- add_drop_table => 1,
+ my $sqlt = SQL::Translator->new({
+ add_drop_table => 1,
ignore_constraint_names => 1,
- ignore_index_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);
$sqlt->{schema} = $sqlt_schema;
$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
+ my $filename = $self->_ddl_schema_filename($db, $version, $dir);
+ if (-e $filename ) {
carp "Overwriting existing DDL file - $filename";
unlink $filename;
}
}
sub prepare_update {
- my ($self, $version, $preversion) = @_;
- # this should be:
- #
- # $from_version ||= $db_version
- # $to_version ||= $schema_version
- # $version_set ||= [$from_version, $to_version];
- #
+ 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;
$dir = "./";
}
- my $schema_version = $schema->schema_version || '1.x';
- $version ||= $schema_version;
+ my $schema_version = $schema->schema_version;
$sqltargs = {
add_drop_table => 1,
$sqlt->{schema} = $sqlt_schema;
$sqlt->producer($db);
- my $prefilename = $self->_ddl_filename($db, [ $preversion ], $dir);
+ my $prefilename = $self->_ddl_schema_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_schema_diff_filename($db, $version_set, $dir );
if(-e $diff_file) {
carp("Overwriting existing diff file - $diff_file");
unlink $diff_file;
$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_schema_filename($db, $to_version, $dir);
my $out = $t->translate( $filename )
or $self->throw_exception ($t->error);
sub _upgrade_single_step {
my $self = shift;
my @version_set = @{ shift @_ };
- my $upgrade_file = $self->_ddl_filename(
+ my $upgrade_file = $self->_ddl_schema_diff_filename(
$self->storage->sqlt_type,
\@version_set,
$self->upgrade_directory,