[Bast-commits] r9223 - in DBIx-Class-Journal/1.000/trunk/lib/DBIx/Class/Schema/Journal: . DB

[frew at dev.catalyst.perl.org]

Author: frew
Date: 2010-04-26 21:32:44 +0100 (Mon, 26 Apr 2010)
New Revision: 9223

Modified:
   DBIx-Class-Journal/1.000/trunk/lib/DBIx/Class/Schema/Journal/DB.pm
   DBIx-Class-Journal/1.000/trunk/lib/DBIx/Class/Schema/Journal/DB/ChangeSet.pm
Log:
various fixes from RT56920

Modified: DBIx-Class-Journal/1.000/trunk/lib/DBIx/Class/Schema/Journal/DB/ChangeSet.pm
===================================================================
--- DBIx-Class-Journal/1.000/trunk/lib/DBIx/Class/Schema/Journal/DB/ChangeSet.pm	2010-04-26 20:28:14 UTC (rev 9222)
+++ DBIx-Class-Journal/1.000/trunk/lib/DBIx/Class/Schema/Journal/DB/ChangeSet.pm	2010-04-26 20:32:44 UTC (rev 9223)
@@ -4,33 +4,33 @@
 
 sub journal_define_table {
     my ( $class, $schema_class, $prefix ) = @_;
-    
+
     $class->load_components(qw/InflateColumn::DateTime/);
     $class->table($prefix . 'changeset');
-    
+
     $class->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,
+      },
     );
-    
+
     $class->set_primary_key('ID');
 }
 
@@ -42,7 +42,7 @@
     # import?) to do it and retain backcompat I will.
     #
     # --fREW, 01-27-2010
-    $self->set_date(gmtime);
+    $self->set_date(scalar gmtime);
     return $self;
 }
 

Modified: DBIx-Class-Journal/1.000/trunk/lib/DBIx/Class/Schema/Journal/DB.pm
===================================================================
--- DBIx-Class-Journal/1.000/trunk/lib/DBIx/Class/Schema/Journal/DB.pm	2010-04-26 20:28:14 UTC (rev 9222)
+++ DBIx-Class-Journal/1.000/trunk/lib/DBIx/Class/Schema/Journal/DB.pm	2010-04-26 20:32:44 UTC (rev 9223)
@@ -38,7 +38,7 @@
 sub journal_create_changeset {
     my ( $self, @args ) = @_;
 
-    my %changesetdata = ( @args, ID => undef );
+    my %changesetdata = ( @args );
 
     delete $changesetdata{parent_id} unless $self->nested_changesets;