make deploy's 'sources' arg default to just the journal related sources

[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 ea342f2..64185bd 100644 (file)
--- a/lib/DBIx/Class/Schema/Journal.pm
+++ b/lib/DBIx/Class/Schema/Journal.pm
@@ -7,59 +7,106 @@ use DBIx::Class::Schema::Journal::DB;
 
 __PACKAGE__->mk_classdata('journal_storage_type');
 __PACKAGE__->mk_classdata('journal_connection');
+__PACKAGE__->mk_classdata('journal_no_automatic_deploy');
 __PACKAGE__->mk_classdata('journal_sources'); ## [ source names ]
 __PACKAGE__->mk_classdata('journal_user'); ## [ class, field for user id ]
-__PACKAGE__->mk_classdata('_journal_schema');
+__PACKAGE__->mk_classdata('_journal_schema'); ## schema object for journal
+__PACKAGE__->mk_classdata('_journal_internal_sources'); # the sources used to journal journal_sources
 
-sub throw_exception
-{
-}
+our $VERSION = '0.01';
 
-sub exception_action
-{
-    my $self = shift;
-    print STDERR Carp::longmess;
+use strict;
+use warnings;
+
+# sub throw_exception
+# {
+# }
+
+# sub exception_action
+# {
+#     my $self = shift;
+# #    print STDERR Carp::longmess;
     
-    $self->next::method(@_);
-}
+#     $self->next::method(@_);
+# }
+
+# sub load_classes
+# {
+#     my $class = shift;
+
+
+#     $class->next::method(@_);
+    
+# }
 
 sub connection
 {
     my $self = shift;
-    $self->next::method(@_);
+    my $schema = $self->next::method(@_);
 
-   print STDERR join(":", $self->sources), "\n";
+#   print STDERR join(":", $self->sources), "\n";
 
-    my $journal_schema = DBIx::Class::Schema::Journal::DB->connect(@{ $self->journal_connection || $self->storage->connect_info });
-#    print STDERR "conn", $journal_schema->storage->connect_info;
-    if($self->journal_storage_type)
+    my $journal_schema;
+    if(!defined($self->journal_connection))
     {
-        $journal_schema->storage_type($self->journal_storage_type);
+        ## 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
+    {
+        $journal_schema = DBIx::Class::Schema::Journal::DB->connect(@{ $self->journal_connection });
+        if($self->journal_storage_type)
+        {
+            $journal_schema->storage_type($self->journal_storage_type);
+        }
     }
 
     ## get our own private version of the journaling sources
    $self->_journal_schema($journal_schema->compose_namespace(blessed($self) . '::Journal'));
 
     ## Create auditlog+history per table
-    my %j_sources = @{$self->journal_sources} ? map { $_ => 1 } @{$self->journal_sources} : map { $_ => 1 } $self->sources;
+    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});
-        $self->create_journal_for($s_name);
+        push @journal_sources, $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);
+
+    $self->journal_schema_deploy()
+        unless $self->journal_no_automatic_deploy;
+
     ## Set up relationship between changeset->user_id and this schema's user
-    if(!@{$self->journal_user})
+    if(!@{$self->journal_user || []})
     {
         warn "No Journal User set!";
-        return;
+        return $schema;
     }
 
-    $self->_journal_schema->deploy();
     $self->_journal_schema->class('ChangeSet')->belongs_to('user', @{$self->journal_user});
     $self->_journal_schema->storage->disconnect();
+
+    return $schema;
+}
+
+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
@@ -84,7 +131,8 @@ sub create_journal_for
     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");
-    $self->_journal_schema->register_class("${s_name}AuditLog", $newclass);
+    my $log_source = "${s_name}AuditLog";
+    $self->_journal_schema->register_class($log_source, $newclass);
                            
 
     my $histclass = $self->get_audit_history_class_name($s_name);
@@ -95,7 +143,10 @@ sub create_journal_for
                             map { $_ => $source->column_info($_) } $source->columns
                            );
                            
-    $self->_journal_schema->register_class("${s_name}AuditHistory", $histclass);
+    my $hist_source = "${s_name}AuditHistory";
+    $self->_journal_schema->register_class($hist_source, $histclass);
+
+    return ( $log_source, $hist_source );
 }
 
 sub txn_do
@@ -104,13 +155,53 @@ sub txn_do
 
     ## Create a new changeset, then run $code as a transaction
     my $cs = $self->_journal_schema->resultset('ChangeSet');
-    my $changeset = $cs->create({ ( $self->_journal_schema->current_user() ? ( user_id => $self->_journal_schema->current_user()) : () ),
-#        user_id => $self->_journal_schema->current_user(),
-        session_id => $self->_journal_schema->current_session(),
-    });
+
+    $self->txn_begin;
+    my %changesetdata;
+    if( defined $self->_journal_schema->current_user() )
+    {
+        $changesetdata{user_id} = $self->_journal_schema->current_user();
+    }
+    if( defined $self->_journal_schema->current_session() )
+    {
+        $changesetdata{session_id} = $self->_journal_schema->current_session();
+    }
+
+#         ( 
+#           $self->_journal_schema->current_user() 
+#           ? ( user_id => $self->_journal_schema->current_user()) 
+#           : (),
+#           $self->_journal_schema->current_session() 
+#           ? ( session_id => $self->_journal_schema->current_session() ) 
+#           : () 
+#         );
+    if(!%changesetdata)
+    {
+        %changesetdata = ( ID => undef );
+    }
+    my $changeset = $cs->create({ %changesetdata });
     $self->_journal_schema->current_changeset($changeset->ID);
 
     $self->next::method($code);
 }
 
+sub changeset_user
+{
+    my ($self, $userid) = @_;
+
+    return $self->_journal_schema->current_user() if(@_ == 1);
+
+    $self->_journal_schema->current_user($userid);
+}
+
+sub changeset_session
+{
+    my ($self, $sessionid) = @_;
+
+    return $self->_journal_schema->current_session() if(@_ == 1);
+
+    $self->_journal_schema->current_session($sessionid);
+}
+
+
 1;