X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FJournal.pm;h=e20f72c977f5bba32358a910a5842646c027c685;hb=1d09727da140af581226bb64bcca01b8d25a060d;hp=4a0a506189911585a0668a58d1181f1715f3c27a;hpb=aa873584bacf0e0ea54f2aa1df20971efe4c2cf5;p=dbsrgits%2FDBIx-Class-Journal.git

diff --git a/lib/DBIx/Class/Schema/Journal.pm b/lib/DBIx/Class/Schema/Journal.pm
index 4a0a506..e20f72c 100644
--- a/lib/DBIx/Class/Schema/Journal.pm
+++ b/lib/DBIx/Class/Schema/Journal.pm
@@ -4,86 +4,97 @@ use base qw/DBIx::Class/;
 
 use Scalar::Util 'blessed';
 use DBIx::Class::Schema::Journal::DB;
+use Class::C3::Componentised ();
 
 __PACKAGE__->mk_classdata('journal_storage_type');
 __PACKAGE__->mk_classdata('journal_connection');
-__PACKAGE__->mk_classdata('journal_no_automatic_deploy');
+__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_copy_sources');
+__PACKAGE__->mk_classdata('__journal_schema_prototype');
 __PACKAGE__->mk_classdata('_journal_schema'); ## schema object for journal
-
-our $VERSION = '0.01';
+__PACKAGE__->mk_classdata('journal_component');
+__PACKAGE__->mk_classdata('journal_components');
+__PACKAGE__->mk_classdata('journal_nested_changesets');
+__PACKAGE__->mk_classdata('journal_prefix');
 
 use strict;
 use warnings;
 
-# sub throw_exception
-# {
-# }
-
-# sub exception_action
-# {
-#     my $self = shift;
-# #    print STDERR Carp::longmess;
-    
-#     $self->next::method(@_);
-# }
 
-# sub load_classes
-# {
-#     my $class = shift;
+sub _journal_schema_prototype {
+    my $self = shift;
+    if (my $proto = $self->__journal_schema_prototype) {
+          return $proto;
+    }
+    my $c = blessed($self)||$self;
+    my $journal_schema_class = "${c}::_JOURNAL";
+    Class::C3::Componentised->inject_base($journal_schema_class, 'DBIx::Class::Schema::Journal::DB');
+    $journal_schema_class->load_components($self->journal_components)
+        if $self->journal_components;
+    my $proto = $self->__journal_schema_prototype (
+        $journal_schema_class->compose_namespace( $c.'::Journal')
+    );
 
 
-#     $class->next::method(@_);
+    my $comp = $self->journal_component || "Journal";
     
-# }
+    my $prefix = $self->journal_prefix || '';
+    foreach my $audit (qw(ChangeSet ChangeLog)) {
+        my $class = blessed($proto) . "::$audit";
 
-sub connection
-{
-    my $self = shift;
-    my $schema = $self->next::method(@_);
+        Class::C3::Componentised->inject_base($class, "DBIx::Class::Schema::Journal::DB::$audit");
 
-#   print STDERR join(":", $self->sources), "\n";
+        $class->journal_define_table(blessed($proto), $prefix);
 
-    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
-    {
-        $journal_schema = DBIx::Class::Schema::Journal::DB->connect(@{ $self->journal_connection });
-        if($self->journal_storage_type)
-        {
-            $journal_schema->storage_type($self->journal_storage_type);
-        }
-    }
+        $proto->register_class($audit, $class);
 
-    ## get our own private version of the journaling sources
-   $self->_journal_schema($journal_schema->compose_namespace(blessed($self) . '::Journal'));
+        $self->register_class($audit, $class)
+            if $self->journal_copy_sources;
+    }
 
     ## Create auditlog+history per table
     my %j_sources = map { $_ => 1 } $self->journal_sources
-                                      ? @{$self->journal_sources}
-                                      : $self->sources;
-    foreach my $s_name ($self->sources)
-    {
+       ? @{$self->journal_sources}
+       : $self->sources;
+
+    foreach my $s_name ($self->sources) {
         next unless($j_sources{$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->create_journal_for($s_name => $proto);
+        $self->class($s_name)->load_components($comp);
     }
+    return $proto;
+}
+
+sub connection {
+    my $self = shift;
+    my $schema = $self->next::method(@_);
+
+    my $journal_schema = (ref $self||$self)->_journal_schema_prototype->clone;
 
+    if($self->journal_connection) {
+        $journal_schema->storage_type($self->journal_storage_type)
+            if $self->journal_storage_type;
+        $journal_schema->connection(@{ $self->journal_connection });
+    } else {
+        $journal_schema->storage( $schema->storage );
+    }
+
+    $self->_journal_schema($journal_schema);
+
+
+    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';
+    }
 
     $self->journal_schema_deploy()
-        unless $self->journal_no_automatic_deploy;
+        if $self->journal_deploy_on_connect;
 
     ## Set up relationship between changeset->user_id and this schema's user
-    if(!@{$self->journal_user || []})
-    {
-        warn "No Journal User set!";
+    if(!@{$self->journal_user || []}) {
+        #warn "No Journal User set!"; # no need to warn, user_id is useful even without a rel
         return $schema;
     }
 
@@ -93,101 +104,145 @@ sub connection
     return $schema;
 }
 
-sub journal_schema_deploy
-{
-    my ( $self, @args ) = @_;
-    $self->_journal_schema->deploy( @args );
-}
+sub deploy {
+    my $self = shift;
 
-sub get_audit_log_class_name
-{
-    my ($self, $sourcename) = @_;
+    $self->next::method(@_);
 
-    return blessed($self->_journal_schema) . "::${sourcename}AuditLog";
+    $self->journal_schema_deploy(@_);
 }
 
-sub get_audit_history_class_name
-{
-    my ($self, $sourcename) = @_;
+sub journal_schema_deploy {
+    my $self = shift;
 
-    return blessed($self->_journal_schema) . "::${sourcename}AuditHistory";
+    $self->_journal_schema->deploy(@_);
 }
 
-sub create_journal_for
-{
-    my ($self, $s_name) = @_;
+sub create_journal_for {
+    my ($self, $s_name, $journal_schema) = @_;
 
     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");
-    $self->_journal_schema->register_class("${s_name}AuditLog", $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
-                           );
-                           
-    $self->_journal_schema->register_class("${s_name}AuditHistory", $histclass);
-}
 
-sub txn_do
-{
-    my ($self, $code) = @_;
+    foreach my $audit (qw(AuditLog AuditHistory)) {
+        my $audit_source = $s_name.$audit;
+        my $class = blessed($journal_schema) . "::$audit_source";
+
+        Class::C3::Componentised->inject_base($class, "DBIx::Class::Schema::Journal::DB::$audit");
+
+        $class->journal_define_table($source, blessed($journal_schema));
 
-    ## Create a new changeset, then run $code as a transaction
-    my $cs = $self->_journal_schema->resultset('ChangeSet');
+        $journal_schema->register_class($audit_source, $class);
 
-    $self->txn_begin;
-    my %changesetdata;
-    if( defined $self->_journal_schema->current_user() )
-    {
-        $changesetdata{user_id} = $self->_journal_schema->current_user();
+        $self->register_class($audit_source, $class)
+            if $self->journal_copy_sources;
     }
-    if( defined $self->_journal_schema->current_session() )
-    {
-        $changesetdata{session_id} = $self->_journal_schema->current_session();
+}
+
+sub prepopulate_journal {
+    my $self = shift;
+
+    my %j_sources = map { $_ => 1 } $self->journal_sources
+       ? @{$self->journal_sources}
+       : $self->sources;
+
+    my $schema = $self;
+    my $j_schema = $self->_journal_schema;
+    my $changelog_rs = $j_schema->resultset('ChangeLog');
+
+    # using our own overridden txn_do (see below) will create a changeset
+    $schema->txn_do( sub {
+        my $chs_id = $j_schema->current_changeset;
+
+        foreach my $s_name ($self->sources) {
+            next unless $j_sources{$s_name};
+
+            my $from_rs = $schema->resultset($s_name);
+            my ($pk) = $from_rs->result_source->primary_columns;
+            $from_rs->result_class('DBIx::Class::ResultClass::HashRefInflator');
+
+            my $to_rs  = $j_schema->resultset("${s_name}AuditHistory");
+            my $log_rs = $j_schema->resultset("${s_name}AuditLog");
+
+            my $page = 1;
+            while (
+                my @x = $from_rs->search(undef, {
+                    rows => 1_000,
+                    page => $page++,
+                })
+            ) {
+                # get some number of change log IDs to be generated for this page
+                my @log_ids = map { $_->id }
+                            $changelog_rs->populate([
+                                map {{ changeset_id => $chs_id }} (0 .. $#x)
+                            ]);
+
+                # create the audit log entries for the rows in this page
+                $log_rs->populate([
+                    map {{ create_id => $log_ids[$_], id => $x[$_]->{$pk} }} (0 .. $#x)
+                ]);
+
+                # now populate the audit history
+                $to_rs->populate([
+                    map +{
+                        %{$x[$_]},
+                        audit_change_id => $log_ids[$_],
+                    }, (0 .. $#x)
+                ]);
+            }
+        }
+    });
+}
+
+sub txn_do {
+    my ($self, $user_code, @args) = @_;
+
+    my $jschema = $self->_journal_schema;
+
+    my $code = $user_code;
+
+    my $current_changeset = $jschema->_current_changeset;
+    if ( !$current_changeset || $self->journal_nested_changesets ) {
+        my $current_changeset_ref = $jschema->_current_changeset_container;
+
+        unless ( $current_changeset_ref ) {
+            # this is a hash because scalar refs can't be localized
+            $current_changeset_ref = { };
+            $jschema->_current_changeset_container($current_changeset_ref);
+        }
+
+        # 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;
+            $user_code->(@_);
+        };
+
     }
 
-#         ( 
-#           $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 );
+    if ( $jschema->storage != $self->storage ) {
+        my $inner_code = $code;
+        $code = sub { $jschema->txn_do($inner_code, @_) };
     }
-    my $changeset = $cs->create({ %changesetdata });
-    $self->_journal_schema->current_changeset($changeset->ID);
 
-    $self->next::method($code);
+    return $self->next::method($code, @args);
 }
 
-sub changeset_user
-{
+sub changeset_user {
     my ($self, $userid) = @_;
 
-    return $self->_journal_schema->current_user() if(@_ == 1);
+    return $self->_journal_schema->current_user()
+       if @_ == 1;
 
     $self->_journal_schema->current_user($userid);
 }
 
-sub changeset_session
-{
+sub changeset_session {
     my ($self, $sessionid) = @_;
 
-    return $self->_journal_schema->current_session() if(@_ == 1);
+    return $self->_journal_schema->current_session()
+       if @_ == 1;
 
     $self->_journal_schema->current_session($sessionid);
 }
 
-
 1;