X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FVersioned.pm;h=e5493ce7c2870ed1dc0f05672d10c1eca8885cf2;hb=da153fe5d87ebbede9bd350afbd33e52be2f703e;hp=da1afbc66c6ad8989d5105eae2c98c9e924bb2a1;hpb=94e3913829c86d9276b060dc1b37338978bfb2cd;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/Schema/Versioned.pm b/lib/DBIx/Class/Schema/Versioned.pm
index da1afbc..e5493ce 100644
--- a/lib/DBIx/Class/Schema/Versioned.pm
+++ b/lib/DBIx/Class/Schema/Versioned.pm
@@ -184,7 +184,7 @@ sub upgrade
 
       my $diff = SQL::Translator::Diff::schema_diff($db_tr->schema, $db, 
                                                     $dbic_tr->schema, $db,
-                                                    { ignore_constraint_names => 1, ignore_index_names => 1, caseopt => 1 });
+                                                    { caseopt => 1 });
 
       my $filename = $self->ddl_filename(
                                  $db,
@@ -226,7 +226,9 @@ sub upgrade
 
       my $fh;
       open $fh, "<$file" or warn("Can't open upgrade file, $file ($!)");
-      my @data = split(/[;\n]/, join('', <$fh>));
+      my @data = split(/\n/, join('', <$fh>));
+      @data = grep(!/^--/, @data);
+      @data = split(/;/, join('', @data));
       close($fh);
       @data = grep { $_ && $_ !~ /^-- / } @data;
       @data = grep { $_ !~ /^(BEGIN TRANACTION|COMMIT)/m } @data;