remove Base

[dbsrgits/DBIx-Class-Journal.git] / lib / DBIx / Class / Schema / Journal.pm

diff --git a/lib/DBIx/Class/Schema/Journal.pm b/lib/DBIx/Class/Schema/Journal.pm
index 8b50081..588e887 100644 (file)
--- a/lib/DBIx/Class/Schema/Journal.pm
+++ b/lib/DBIx/Class/Schema/Journal.pm
@@ -11,7 +11,6 @@ __PACKAGE__->mk_classdata('journal_deploy_on_connect');
 __PACKAGE__->mk_classdata('journal_sources'); ## [ source names ]
 __PACKAGE__->mk_classdata('journal_user'); ## [ class, field for user id ]
 __PACKAGE__->mk_classdata('_journal_schema'); ## schema object for journal
-__PACKAGE__->mk_classdata('_journal_internal_sources'); # the sources used to journal journal_sources
 __PACKAGE__->mk_classdata('journal_nested_changesets');
 
 our $VERSION = '0.01';
@@ -47,42 +46,35 @@ sub connection
 
 #   print STDERR join(":", $self->sources), "\n";
 
-    my $journal_schema;
-    if(!defined($self->journal_connection))
-    {
-        ## If no connection, use the same schema/storage etc as the user
-        DBIx::Class::Componentised->inject_base(ref $self, 'DBIx::Class::Schema::Journal::DB');
-          $journal_schema = $self;
-    }
-    else
+    my $journal_schema = DBIx::Class::Schema::Journal::DB->compose_namespace(blessed($self) . '::Journal');
+
+    if($self->journal_connection)
     {
-        $journal_schema = DBIx::Class::Schema::Journal::DB->connect(@{ $self->journal_connection });
         if($self->journal_storage_type)
         {
             $journal_schema->storage_type($self->journal_storage_type);
         }
+        $journal_schema->connection(@{ $self->journal_connection });
+    } else {
+        $journal_schema->storage( $schema->storage );
     }
 
-    ## get our own private version of the journaling sources
-    $self->_journal_schema($journal_schema->compose_namespace(blessed($self) . '::Journal'));
+    $self->_journal_schema($journal_schema);
+
 
     ## Create auditlog+history per table
     my %j_sources = map { $_ => 1 } $self->journal_sources
                                       ? @{$self->journal_sources}
                                       : $self->sources;
 
-    my @journal_sources = $journal_schema->sources; # not sources to journal, but sources used by the journal internally
-
     foreach my $s_name ($self->sources)
     {
         next unless($j_sources{$s_name});
-        push @journal_sources, $self->create_journal_for($s_name);
+        $self->create_journal_for($s_name);
         $self->class($s_name)->load_components('Journal');
 #        print STDERR "$s_name :", $self->class($s_name), "\n";
     }
 
-    $self->_journal_internal_sources(\@journal_sources);
-
     if ( $self->journal_nested_changesets ) {
         $self->_journal_schema->nested_changesets(1);
         die "FIXME nested changeset schema not yet supported... add parent_id to ChangeSet here";
@@ -110,8 +102,6 @@ sub deploy
 
     $self->next::method($sqlt_args, @args);
 
-    $sqlt_args ||= {};
-    local $sqlt_args->{sources} = $self->_journal_internal_sources;
     $self->journal_schema_deploy($sqlt_args, @args);
 }
 
@@ -119,51 +109,25 @@ sub journal_schema_deploy
 {
     my ( $self, $sqlt_args, @args ) = @_;
 
-    $sqlt_args ||= {};
-    $sqlt_args->{sources} = $self->_journal_internal_sources
-        unless exists $sqlt_args->{sources};
-
     $self->_journal_schema->deploy( $sqlt_args, @args );
 }
 
-sub get_audit_log_class_name
+sub create_journal_for
 {
-    my ($self, $sourcename) = @_;
+    my ($self, $s_name) = @_;
 
-    return blessed($self->_journal_schema) . "::${sourcename}AuditLog";
-}
+    my $source = $self->source($s_name);
 
-sub get_audit_history_class_name
-{
-    my ($self, $sourcename) = @_;
+    foreach my $audit (qw(AuditLog AuditHistory)) {
+        my $audit_source = join("", $s_name, $audit);
+        my $class = blessed($self->_journal_schema) . "::$audit_source";
 
-    return blessed($self->_journal_schema) . "::${sourcename}AuditHistory";
-}
+        DBIx::Class::Componentised->inject_base($class, "DBIx::Class::Schema::Journal::DB::$audit");
 
-sub create_journal_for
-{
-    my ($self, $s_name) = @_;
+        $class->journal_define_table($source);
 
-    my $source = $self->source($s_name);
-    my $newclass = $self->get_audit_log_class_name($s_name);
-    DBIx::Class::Componentised->inject_base($newclass, 'DBIx::Class::Schema::Journal::DB::AuditLog');
-    $newclass->table(lc($s_name) . "_audit_log");
-    my $log_source = "${s_name}AuditLog";
-    $self->_journal_schema->register_class($log_source, $newclass);
-                           
-
-    my $histclass = $self->get_audit_history_class_name($s_name);
-    DBIx::Class::Componentised->inject_base($histclass, 'DBIx::Class::Schema::Journal::DB::AuditHistory');
-    $histclass->table(lc($s_name) . "_audit_history");
-#    $histclass->result_source_instance->name(lc($s_name) . "_audit_hisory");
-    $histclass->add_columns(
-                            map { $_ => $source->column_info($_) } $source->columns
-                           );
-                           
-    my $hist_source = "${s_name}AuditHistory";
-    $self->_journal_schema->register_class($hist_source, $histclass);
-
-    return ( $log_source, $hist_source );
+        $self->_journal_schema->register_class($audit_source, $class);
+    }
 }
 
 sub txn_do
@@ -172,9 +136,9 @@ sub txn_do
 
     my $jschema = $self->_journal_schema;
 
-    my $code;
+    my $code = $user_code;
 
-    my $current_changeset = $jschema->current_changeset;
+    my $current_changeset = $jschema->_current_changeset;
     if ( !$current_changeset || $self->journal_nested_changesets )
     {
         my $current_changeset_ref = $jschema->_current_changeset_container;
@@ -188,12 +152,18 @@ sub txn_do
         # wrap the thunk with a new changeset creation
         $code = sub {
             my $changeset = $jschema->journal_create_changeset( parent_id => $current_changeset );
-            local $current_changeset_ref->{changeset} = $changeset->ID;
+            local $current_changeset_ref->{changeset} = $changeset->id;
             $user_code->(@_);
         };
+
+    }
+
+    if ( $jschema->storage != $self->storage ) {
+        my $inner_code = $code;
+        $code = sub { $jschema->txn_do($inner_code, @_) };
     }
 
-    $self->next::method($code || $user_code);
+    return $self->next::method($code, @args);
 }
 
 sub changeset_user