cleanup modelines

diff --git a/lib/DBIx/Class/DeploymentHandler/Dad.pm b/lib/DBIx/Class/DeploymentHandler/Dad.pm
index 2051cd2..8b6b8c4 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/Dad.pm
+++ b/lib/DBIx/Class/DeploymentHandler/Dad.pm
@@ -66,6 +66,10 @@ __PACKAGE__->meta->make_immutable;
 
 1;
 
+# vim: ts=2 sw=2 expandtab
+
+__END__
+
 =pod
 
 =attr schema
@@ -199,6 +203,3 @@ L<DBIx::Class::DeploymentHandler::HandlesDeploy>,
 L<DBIx::Class::DeploymentHandler::HandlesVersioning>, and
 L<DBIx::Class::DeploymentHandler::HandlesVersionStorage>.
 
-__END__
-
-vim: ts=2 sw=2 expandtab

diff --git a/lib/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator.pm b/lib/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator.pm
index 5084bf8..29a9e27 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator.pm
+++ b/lib/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator.pm
@@ -424,6 +424,8 @@ __PACKAGE__->meta->make_immutable;
 
 1;
 
+# vim: ts=2 sw=2 expandtab
+
 __END__
 
 =attr schema
@@ -485,4 +487,3 @@ generate files for
 
 =method downgrade_single_step
 
-vim: ts=2 sw=2 expandtab

diff --git a/lib/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator/Deprecated.pm b/lib/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator/Deprecated.pm
index 72a4939..d8cf072 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator/Deprecated.pm
+++ b/lib/DBIx/Class/DeploymentHandler/DeployMethod/SQL/Translator/Deprecated.pm
@@ -40,6 +40,8 @@ __PACKAGE__->meta->make_immutable;
 
 1;
 
+# vim: ts=2 sw=2 expandtab
+
 __END__
 
 =head1 THIS SUCKS
@@ -61,4 +63,3 @@ totally switch!  Here's how:
   }
  }
 
-vim: ts=2 sw=2 expandtab

diff --git a/lib/DBIx/Class/DeploymentHandler/Deprecated.pm b/lib/DBIx/Class/DeploymentHandler/Deprecated.pm
index 268546f..935ca74 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/Deprecated.pm
+++ b/lib/DBIx/Class/DeploymentHandler/Deprecated.pm
@@ -30,6 +30,8 @@ __PACKAGE__->meta->make_immutable;
 
 1;
 
+# vim: ts=2 sw=2 expandtab
+
 __END__
 
-vim: ts=2 sw=2 expandtab
+

diff --git a/lib/DBIx/Class/DeploymentHandler/Deprecated/WithDeprecatedSqltDeployMethod.pm b/lib/DBIx/Class/DeploymentHandler/Deprecated/WithDeprecatedSqltDeployMethod.pm
index 99912cd..4eb2dba 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/Deprecated/WithDeprecatedSqltDeployMethod.pm
+++ b/lib/DBIx/Class/DeploymentHandler/Deprecated/WithDeprecatedSqltDeployMethod.pm
@@ -42,6 +42,7 @@ sub _build_deploy_method {
 
 1;
 
+# vim: ts=2 sw=2 expandtab
+
 __END__
 
-vim: ts=2 sw=2 expandtab

diff --git a/lib/DBIx/Class/DeploymentHandler/Deprecated/WithDeprecatedVersionStorage.pm b/lib/DBIx/Class/DeploymentHandler/Deprecated/WithDeprecatedVersionStorage.pm
index 7ead82a..bbbe7bd 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/Deprecated/WithDeprecatedVersionStorage.pm
+++ b/lib/DBIx/Class/DeploymentHandler/Deprecated/WithDeprecatedVersionStorage.pm
@@ -17,6 +17,6 @@ sub _build_version_storage {
 
 1;
 
-__END__
+# vim: ts=2 sw=2 expandtab
 
-vim: ts=2 sw=2 expandtab
+__END__

diff --git a/lib/DBIx/Class/DeploymentHandler/HandlesVersioning.pm b/lib/DBIx/Class/DeploymentHandler/HandlesVersioning.pm
index 47690e6..c8d4e79 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/HandlesVersioning.pm
+++ b/lib/DBIx/Class/DeploymentHandler/HandlesVersioning.pm
@@ -7,6 +7,8 @@ requires 'previous_version_set';
 
 1;
 
+# vim: ts=2 sw=2 expandtab
+
 __END__
 
 =head1 DESCRIPTION
@@ -126,6 +128,3 @@ L<DBIx::Class::DeploymentHandler::VersionHandler::ExplicitVersions>
 
 =back
 
-__END__
-
-vim: ts=2 sw=2 expandtab

diff --git a/lib/DBIx/Class/DeploymentHandler/Types.pm b/lib/DBIx/Class/DeploymentHandler/Types.pm
index 3878c9f..c4946c9 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/Types.pm
+++ b/lib/DBIx/Class/DeploymentHandler/Types.pm
@@ -12,3 +12,8 @@ coerce 'DBIx::Class::DeploymentHandler::Databases'
 no Moose::Util::TypeConstraints;
 
 1;
+
+# vim: ts=2 sw=2 expandtab
+
+__END__
+

diff --git a/lib/DBIx/Class/DeploymentHandler/VersionHandler/DatabaseToSchemaVersions.pm b/lib/DBIx/Class/DeploymentHandler/VersionHandler/DatabaseToSchemaVersions.pm
index 2a2e5fc..f37a53b 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/VersionHandler/DatabaseToSchemaVersions.pm
+++ b/lib/DBIx/Class/DeploymentHandler/VersionHandler/DatabaseToSchemaVersions.pm
@@ -57,6 +57,8 @@ __PACKAGE__->meta->make_immutable;
 
 1;
 
+# vim: ts=2 sw=2 expandtab
+
 __END__
 
-vim: ts=2 sw=2 expandtab
+

diff --git a/lib/DBIx/Class/DeploymentHandler/VersionHandler/ExplicitVersions.pm b/lib/DBIx/Class/DeploymentHandler/VersionHandler/ExplicitVersions.pm
index 4cf5472..60b01ff 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/VersionHandler/ExplicitVersions.pm
+++ b/lib/DBIx/Class/DeploymentHandler/VersionHandler/ExplicitVersions.pm
@@ -100,6 +100,7 @@ __PACKAGE__->meta->make_immutable;
 
 1;
 
+# vim: ts=2 sw=2 expandtab
+
 __END__
 
-vim: ts=2 sw=2 expandtab

diff --git a/lib/DBIx/Class/DeploymentHandler/VersionHandler/Monotonic.pm b/lib/DBIx/Class/DeploymentHandler/VersionHandler/Monotonic.pm
index 707e9fe..4028404 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/VersionHandler/Monotonic.pm
+++ b/lib/DBIx/Class/DeploymentHandler/VersionHandler/Monotonic.pm
@@ -67,6 +67,7 @@ __PACKAGE__->meta->make_immutable;
 
 1;
 
+# vim: ts=2 sw=2 expandtab
+
 __END__
 
-vim: ts=2 sw=2 expandtab

diff --git a/lib/DBIx/Class/DeploymentHandler/VersionStorage/Deprecated.pm b/lib/DBIx/Class/DeploymentHandler/VersionStorage/Deprecated.pm
index 44c7a3d..f39460b 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/VersionStorage/Deprecated.pm
+++ b/lib/DBIx/Class/DeploymentHandler/VersionStorage/Deprecated.pm
@@ -39,6 +39,8 @@ __PACKAGE__->meta->make_immutable;
 
 1;
 
+# vim: ts=2 sw=2 expandtab
+
 __END__
 
 =head1 THIS SUCKS
@@ -61,4 +63,3 @@ new Standard VersionStorage:
  $dh->version_storage->add_database_vesion({ version => $_ })
    for @versions;
 
-vim: ts=2 sw=2 expandtab

diff --git a/lib/DBIx/Class/DeploymentHandler/VersionStorage/Deprecated/Component.pm b/lib/DBIx/Class/DeploymentHandler/VersionStorage/Deprecated/Component.pm
index bfd96dc..36e1acc 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/VersionStorage/Deprecated/Component.pm
+++ b/lib/DBIx/Class/DeploymentHandler/VersionStorage/Deprecated/Component.pm
@@ -35,3 +35,8 @@ sub connection  {
 }
 
 1;
+
+# vim: ts=2 sw=2 expandtab
+
+__END__
+

diff --git a/lib/DBIx/Class/DeploymentHandler/VersionStorage/Deprecated/VersionResult.pm b/lib/DBIx/Class/DeploymentHandler/VersionStorage/Deprecated/VersionResult.pm
index 14d6268..7c316c3 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/VersionStorage/Deprecated/VersionResult.pm
+++ b/lib/DBIx/Class/DeploymentHandler/VersionStorage/Deprecated/VersionResult.pm
@@ -26,3 +26,7 @@ __PACKAGE__->resultset_class('DBIx::Class::DeploymentHandler::VersionStorage::De
 
 1;
 
+# vim: ts=2 sw=2 expandtab
+
+__END__
+

diff --git a/lib/DBIx/Class/DeploymentHandler/VersionStorage/Deprecated/VersionResultSet.pm b/lib/DBIx/Class/DeploymentHandler/VersionStorage/Deprecated/VersionResultSet.pm
index cff502c..75fc74f 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/VersionStorage/Deprecated/VersionResultSet.pm
+++ b/lib/DBIx/Class/DeploymentHandler/VersionStorage/Deprecated/VersionResultSet.pm
@@ -45,6 +45,7 @@ sub create {
 
 1;
 
+# vim: ts=2 sw=2 expandtab
+
 __END__
 
-vim: ts=2 sw=2 expandtab

diff --git a/lib/DBIx/Class/DeploymentHandler/VersionStorage/Standard.pm b/lib/DBIx/Class/DeploymentHandler/VersionStorage/Standard.pm
index 8acb6a8..2151714 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/VersionStorage/Standard.pm
+++ b/lib/DBIx/Class/DeploymentHandler/VersionStorage/Standard.pm
@@ -35,6 +35,7 @@ __PACKAGE__->meta->make_immutable;
 
 1;
 
+# vim: ts=2 sw=2 expandtab
+
 __END__
 
-vim: ts=2 sw=2 expandtab

diff --git a/lib/DBIx/Class/DeploymentHandler/VersionStorage/Standard/Component.pm b/lib/DBIx/Class/DeploymentHandler/VersionStorage/Standard/Component.pm
index a226dd8..a26ed81 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/VersionStorage/Standard/Component.pm
+++ b/lib/DBIx/Class/DeploymentHandler/VersionStorage/Standard/Component.pm
@@ -7,9 +7,9 @@ use Carp 'carp';
 use DBIx::Class::DeploymentHandler::VersionStorage::Standard::VersionResult;
 
 sub attach_version_storage {
-       $_[0]->register_class(
-               __VERSION => 'DBIx::Class::DeploymentHandler::VersionStorage::Standard::VersionResult'
-       );
+   $_[0]->register_class(
+      __VERSION => 'DBIx::Class::DeploymentHandler::VersionStorage::Standard::VersionResult'
+   );
 }
 
 sub connection  {
@@ -21,17 +21,22 @@ sub connection  {
   my $args = $_[3] || {};
 
   unless ( $args->{ignore_version} || $ENV{DBIC_NO_VERSION_CHECK}) {
-        my $versions = $self->resultset('__VERSION');
-
-        if (!$versions->version_storage_is_installed) {
-                carp "Your DB is currently unversioned. Please call upgrade on your schema to sync the DB.\n";
-        } elsif ($versions->database_version ne $self->schema_version) {
-               carp 'Versions out of sync. This is ' . $self->schema_version .
-                 ', your database contains version ' . $versions->database_version . ", please call upgrade on your Schema.\n";
-        }
+    my $versions = $self->resultset('__VERSION');
+
+    if (!$versions->version_storage_is_installed) {
+       carp "Your DB is currently unversioned. Please call upgrade on your schema to sync the DB.\n";
+    } elsif ($versions->database_version ne $self->schema_version) {
+      carp 'Versions out of sync. This is ' . $self->schema_version .
+        ', your database contains version ' . $versions->database_version . ", please call upgrade on your Schema.\n";
+    }
   }
 
   return $self;
 }
 
 1;
+
+# vim: ts=2 sw=2 expandtab
+
+__END__
+

diff --git a/lib/DBIx/Class/DeploymentHandler/VersionStorage/Standard/VersionResult.pm b/lib/DBIx/Class/DeploymentHandler/VersionStorage/Standard/VersionResult.pm
index be31c7e..6e15abc 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/VersionStorage/Standard/VersionResult.pm
+++ b/lib/DBIx/Class/DeploymentHandler/VersionStorage/Standard/VersionResult.pm
@@ -33,3 +33,8 @@ __PACKAGE__->add_unique_constraint(['version']);
 __PACKAGE__->resultset_class('DBIx::Class::DeploymentHandler::VersionStorage::Standard::VersionResultSet');
 
 1;
+
+# vim: ts=2 sw=2 expandtab
+
+__END__
+

diff --git a/lib/DBIx/Class/DeploymentHandler/VersionStorage/Standard/VersionResultSet.pm b/lib/DBIx/Class/DeploymentHandler/VersionStorage/Standard/VersionResultSet.pm
index 82d5e1e..29f4003 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/VersionStorage/Standard/VersionResultSet.pm
+++ b/lib/DBIx/Class/DeploymentHandler/VersionStorage/Standard/VersionResultSet.pm
@@ -22,6 +22,7 @@ sub database_version {
 
 1;
 
+# vim: ts=2 sw=2 expandtab
+
 __END__
 
-vim: ts=2 sw=2 expandtab

diff --git a/lib/DBIx/Class/DeploymentHandler/WithDatabaseToSchemaVersions.pm b/lib/DBIx/Class/DeploymentHandler/WithDatabaseToSchemaVersions.pm
index 6c086c1..f76ded6 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/WithDatabaseToSchemaVersions.pm
+++ b/lib/DBIx/Class/DeploymentHandler/WithDatabaseToSchemaVersions.pm
@@ -26,6 +26,7 @@ sub _build_version_handler {
 
 1;
 
+# vim: ts=2 sw=2 expandtab
+
 __END__
 
-vim: ts=2 sw=2 expandtab

diff --git a/lib/DBIx/Class/DeploymentHandler/WithExplicitVersions.pm b/lib/DBIx/Class/DeploymentHandler/WithExplicitVersions.pm
index bc89112..b04ba26 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/WithExplicitVersions.pm
+++ b/lib/DBIx/Class/DeploymentHandler/WithExplicitVersions.pm
@@ -26,6 +26,7 @@ sub _build_version_handler {
 
 1;
 
+# vim: ts=2 sw=2 expandtab
+
 __END__
 
-vim: ts=2 sw=2 expandtab

diff --git a/lib/DBIx/Class/DeploymentHandler/WithMonotonicVersions.pm b/lib/DBIx/Class/DeploymentHandler/WithMonotonicVersions.pm
index c62dabf..704c8a3 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/WithMonotonicVersions.pm
+++ b/lib/DBIx/Class/DeploymentHandler/WithMonotonicVersions.pm
@@ -24,6 +24,6 @@ sub _build_version_handler {
 
 1;
 
-__END__
+# vim: ts=2 sw=2 expandtab
 
-vim: ts=2 sw=2 expandtab
+__END__

diff --git a/lib/DBIx/Class/DeploymentHandler/WithSqltDeployMethod.pm b/lib/DBIx/Class/DeploymentHandler/WithSqltDeployMethod.pm
index b0bf914..9bee8e8 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/WithSqltDeployMethod.pm
+++ b/lib/DBIx/Class/DeploymentHandler/WithSqltDeployMethod.pm
@@ -42,6 +42,6 @@ sub _build_deploy_method {
 
 1;
 
-__END__
+# vim: ts=2 sw=2 expandtab
 
-vim: ts=2 sw=2 expandtab
+__END__

diff --git a/lib/DBIx/Class/DeploymentHandler/WithStandardVersionStorage.pm b/lib/DBIx/Class/DeploymentHandler/WithStandardVersionStorage.pm
index 7abe9cf..83aa886 100644 (file)
--- a/lib/DBIx/Class/DeploymentHandler/WithStandardVersionStorage.pm
+++ b/lib/DBIx/Class/DeploymentHandler/WithStandardVersionStorage.pm
@@ -17,6 +17,6 @@ sub _build_version_storage {
 
 1;
 
-__END__
+# vim: ts=2 sw=2 expandtab
 
-vim: ts=2 sw=2 expandtab
+__END__