whitespace, use base Core, and an idea on backcompat

diff --git a/lib/DBIx/Class/Schema/Journal/DB/AuditHistory.pm b/lib/DBIx/Class/Schema/Journal/DB/AuditHistory.pm
index 708ab40..b5664e9 100644 (file)
--- a/lib/DBIx/Class/Schema/Journal/DB/AuditHistory.pm
+++ b/lib/DBIx/Class/Schema/Journal/DB/AuditHistory.pm
@@ -1,14 +1,12 @@
 package DBIx::Class::Schema::Journal::DB::AuditHistory;
 
-use base 'DBIx::Class';
+use base 'DBIx::Class::Core';
 
 sub journal_define_table {
     my ( $class, $source ) = @_;
 
-    $class->load_components(qw(Core));
+    $class->table($source->name . '_audit_history');
 
-    $class->table($source->name . "_audit_history");
-    
     $class->add_columns(
         audit_history_id => {
             data_type => 'integer',
@@ -23,7 +21,7 @@ sub journal_define_table {
         },
     );
 
-    $class->set_primary_key("audit_history_id");
+    $class->set_primary_key('audit_history_id');
 
     foreach my $column ( $source->columns ) {
         my $info = $source->column_info($column);
@@ -36,13 +34,13 @@ sub journal_define_table {
             is_auto_increment
             default_value
         );
-        
+
         $hist_info{is_nullable} = 1;
 
         $class->add_column($column => \%hist_info);
     }
-                           
-    $class->belongs_to('change', 'DBIx::Class::Schema::Journal::DB::ChangeLog', 'audit_change_id');
+
+    $class->belongs_to(change => 'DBIx::Class::Schema::Journal::DB::ChangeLog', 'audit_change_id');
 }
 
 1;

diff --git a/lib/DBIx/Class/Schema/Journal/DB/AuditLog.pm b/lib/DBIx/Class/Schema/Journal/DB/AuditLog.pm
index 83a1a90..5498d0f 100644 (file)
--- a/lib/DBIx/Class/Schema/Journal/DB/AuditLog.pm
+++ b/lib/DBIx/Class/Schema/Journal/DB/AuditLog.pm
@@ -1,13 +1,11 @@
 package DBIx::Class::Schema::Journal::DB::AuditLog;
 
-use base 'DBIx::Class';
+use base 'DBIx::Class::Core';
 
 sub journal_define_table {
     my ( $class, $source ) = @_;
 
-    $class->load_components(qw(Core));
-
-    $class->table($source->name . "_audit_log");
+    $class->table($source->name . '_audit_log');
 
     $class->add_columns(
         create_id => {
@@ -28,8 +26,8 @@ sub journal_define_table {
 
     $class->set_primary_key( $source->primary_columns );
 
-    $class->belongs_to('created', 'DBIx::Class::Schema::Journal::DB::ChangeLog', 'create_id');
-    $class->belongs_to('deleted', 'DBIx::Class::Schema::Journal::DB::ChangeLog', 'delete_id');
+    $class->belongs_to(created => 'DBIx::Class::Schema::Journal::DB::ChangeLog', 'create_id');
+    $class->belongs_to(deleted => 'DBIx::Class::Schema::Journal::DB::ChangeLog', 'delete_id');
 }
 
 1;

diff --git a/lib/DBIx/Class/Schema/Journal/DB/ChangeLog.pm b/lib/DBIx/Class/Schema/Journal/DB/ChangeLog.pm
index 2bc9b01..1b3dc24 100644 (file)
--- a/lib/DBIx/Class/Schema/Journal/DB/ChangeLog.pm
+++ b/lib/DBIx/Class/Schema/Journal/DB/ChangeLog.pm
@@ -1,27 +1,27 @@
 package DBIx::Class::Schema::Journal::DB::ChangeLog;
 
-use base 'DBIx::Class';
+use base 'DBIx::Class::Core';
 
-__PACKAGE__->load_components(qw/Ordered Core/);
+__PACKAGE__->load_components(qw/Ordered/);
 __PACKAGE__->table('changelog');
 
 __PACKAGE__->add_columns(
-                         ID => {
-                             data_type => 'integer',
-                             is_auto_increment => 1,
-                             is_primary_key => 1,
-                             is_nullable => 0,
-                         },
-                         changeset_id => {
-                             data_type => 'integer',
-                             is_nullable => 0,
-                             is_foreign_key => 1,
-                         },
-                         order_in => {
-                             data_type => 'integer',
-                             is_nullable => 0,
-                         },
-                         );
+       ID => {
+               data_type => 'integer',
+               is_auto_increment => 1,
+               is_primary_key => 1,
+               is_nullable => 0,
+       },
+               changeset_id => {
+               data_type => 'integer',
+               is_nullable => 0,
+               is_foreign_key => 1,
+       },
+       order_in => {
+               data_type => 'integer',
+               is_nullable => 0,
+       },
+);
 
 
 __PACKAGE__->set_primary_key('ID');
@@ -30,4 +30,5 @@ __PACKAGE__->belongs_to('changeset', 'DBIx::Class::Schema::Journal::DB::ChangeSe
 
  __PACKAGE__->position_column('order_in');
  __PACKAGE__->grouping_column('changeset_id');
+
 1;

diff --git a/lib/DBIx/Class/Schema/Journal/DB/ChangeSet.pm b/lib/DBIx/Class/Schema/Journal/DB/ChangeSet.pm
index 688949a..05bb248 100644 (file)
--- a/lib/DBIx/Class/Schema/Journal/DB/ChangeSet.pm
+++ b/lib/DBIx/Class/Schema/Journal/DB/ChangeSet.pm
@@ -1,35 +1,41 @@
 package DBIx::Class::Schema::Journal::DB::ChangeSet;
 
-use base 'DBIx::Class';
+use base 'DBIx::Class::Core';
 
-__PACKAGE__->load_components(qw/InflateColumn::DateTime Core/);
+__PACKAGE__->load_components(qw/InflateColumn::DateTime/);
 __PACKAGE__->table('changeset');
 
 __PACKAGE__->add_columns(
-                         ID => {
-                             data_type => 'integer',
-                             is_auto_increment => 1,
-                             is_primary_key => 1,
-                             is_nullable => 0,
-                         },
-                         user_id => {
-                             data_type => 'integer',
-                             is_nullable => 1,
-                             is_foreign_key => 1,
-                         },
-                         set_date => {
-                             data_type => 'timestamp',
-                             is_nullable => 0,
-                         },
-                         session_id => {
-                             data_type => 'varchar',
-                             size => 255,
-                             is_nullable => 1,
-                         },
-                         );
+       ID => {
+               data_type => 'integer',
+               is_auto_increment => 1,
+               is_primary_key => 1,
+               is_nullable => 0,
+       },
+       user_id => {
+               data_type => 'integer',
+               is_nullable => 1,
+               is_foreign_key => 1,
+       },
+       set_date => {
+               data_type => 'timestamp',
+               is_nullable => 0,
+       },
+       session_id => {
+               data_type => 'varchar',
+               size => 255,
+               is_nullable => 1,
+       },
+);
 
 sub new {
     my $self = shift->next::method(@_);
+        # I think we should not do the following and
+        # instead use DBIx::Class::TimeStamp.  If I
+        # can think of a good way (passing a version on
+        # import?) to do it and retain backcompat I will.
+        #
+        # --fREW, 01-27-2010
     $self->set_date(gmtime);
     return $self;
 }