[0.0.8] Migration work

Author: rawleyfowler

examples/multi-file/app.pl

@@ -7,7 +7,13 @@
 my $slick = Slick->new;
 
 $slick->helper( item_validator => sub { return exists shift->{name} } );
-$slick->database( items_db => 'sqlite://db.db' );
+$slick->database( items_db => 'sqlite://db.db', auto_migrate => 1 );
+$slick->items_db->migration(
+    'create_items_table',
+    'CREATE TABLE items ( id INT, name TEXT )',
+    'DROP TABLE items'
+);
+$slick->items_db->migrate_up;
 
 $slick->register( MyApp::ItemRouter->router );
 

lib/Slick.pm

@@ -314,20 +314,20 @@ has a migration, and also serves some JSON.
     $s->database(my_db => 'postgresql://user:[email protected]:5432/schema');
     $s->database(corporate_db => 'mysql://corporate:[email protected]:3306/schema');
 
-    $s->database('my_db')->migration(
+    $s->my_db->migration(
         'create_user_table', # id
         'CREATE TABLE user ( id SERIAL PRIMARY KEY AUTOINCREMENT, name TEXT, age INT );', #up
         'DROP TABLE user;' # down
     );
 
-    $s->database('my_db')->migrate_up; # Migrates all pending migrations
+    $s->my_db->migrate_up; # Migrates all pending migrations
 
     $s->get('/users/{id}' => sub {
         my $app = shift;
         my $context = shift;
 
         # Queries follow SQL::Abstract's notations
-        my $user = $app->database('my_db')->select_one('user', { id => $context->params('id') });
+        my $user = $app->my_db->select_one('user', { id => $context->params('id') });
 
         # Render the user hashref as JSON.
         $context->json($user);

lib/Slick/Database.pm

@@ -79,18 +79,7 @@ sub BUILD {
         croak q{Unknown scheme or un-supported database: } . $uri->scheme;
     }
 
-    try {
-        no warnings;
-        $self->dbi->do( $first_migration->{up} );
-        $self->insert(
-            'slick_migrations',
-            {
-                id   => 'create_slick_migrations_table',
-                up   => $first_migration->{up},
-                down => $first_migration->{down}
-            }
-        );
-    }
+    $self->migrate_up if $self->auto_migrate;
 
     return $self;
 }
@@ -99,6 +88,8 @@ sub migrate_up {
     my $self = shift;
     my $id   = shift;
 
+    eval { $self->dbi->do( $first_migration->{up} ); };
+
     my $run_migrations = $self->select( 'slick_migrations', ['id'] );
 
     if ($id) {

lib/Slick/DatabaseExecutor.pm

@@ -51,17 +51,17 @@ has dbi_options => (
 );
 
 sub dbi {
-    my ($self) = @_;
+    my $self = shift;
     return $self->dbh->dbh;
 }
 
 sub do {
-    my ($self) = @_;
+    my $self = shift;
     return $self->dbi->do(@_);
 }
 
 sub prepare {
-    my ($self) = @_;
+    my $self = shift;
     return $self->dbi->prepare(@_);
 }