Attachment 32300 Details for Bug 13068 – [COUNTERPATCH] Bug 13068: Counterpatch using atomicupdate directory

[patch] [COUNTERPATCH] Bug 13068: Counterpatch using atomicupdate directory

Bug-13068-Counterpatch-using-atomicupdate-director.patch (text/plain), 4.86 KB, created by Marcel de Rooy on 2014-10-14 13:15:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2014-10-14 13:15:39 UTC

Size: 4.86 KB

patch

obsolete

>From ee935c65d67cc18953c5dec776e48b941d0ba836 Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Tue, 14 Oct 2014 11:49:36 +0200
>Subject: [PATCH] Bug 13068: Counterpatch using atomicupdate directory
>Content-Type: text/plain; charset=utf-8
>
>This patch makes a distinction between atomicupdates belonging to an
>official db revision and development updates.
>It also keeps track of the dev updates since the last official db rev.
>(This is done via a local pref; so easily accessible if needed.)
>
>The db revs can be txt files, perl scripts or sql files.
>Sql files are run via the installer.
>
>A new db revision is now only a matter of dropping a file in atomicupdates
>for the developer. The RM only adds one line to updatedatabase like:
>    ExecDBRev( $aupd, '13068', 'Refined dbrev', '13068.pl', '3.17.00.028');
>
>I left two debuggings prints, helpful while testing this. When we are
>ready, they can be removed.
>---
> installer/data/mysql/updatedatabase.pl |   99 ++++++++++++++++++++++++++++++++
> 1 files changed, 99 insertions(+), 0 deletions(-)
>
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index d6b7d24..851e021 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -38,13 +38,24 @@ use C4::Context;
> use C4::Installer;
> use C4::Dates;
> 
>+use File::Slurp;
> use MARC::Record;
> use MARC::File::XML ( BinaryEncoding => 'utf8' );
> 
>+use constant ATOMICUPD_PREF => '_LocalAtomicUpdates';
>+
> # FIXME - The user might be installing a new database, so can't rely
> # on /etc/koha.conf anyway.
> 
> my $debug = 0;
>+my $aupd = { #hash for atomic updates
>+    location  => C4::Context->config('intranetdir')."/installer/data/mysql/atomicupdate",
>+    remember  => C4::Context->preference(ATOMICUPD_PREF)//'',
>+    skipfiles => {
>+        'Bug-4246-Talking-Tech-itiva-phone-notifications.pl' => 1,
>+        'oai_sets.sql' => 1,
>+    },
>+};
> 
> my (
>     $sth, $sti,
>@@ -8800,9 +8811,97 @@ if ( CheckVersion($DBversion) ) {
>     SetVersion($DBversion);
> }
> 
>+#FIXME Will be fixed with the first db rev new style
>+#The first dbrev should look like this:
>+#ExecDBRev( $aupd, '13068', 'Refined dbrev', '13068.pl', '3.17.00.028');
>+
>+# This point marks the end of the approved database revisions.
>+# The following line runs proposed patches found in atomicupdate. On a
>+# production system, it will [should] not find any.
>+RunRemainingAtomicUpdates( $aupd );
> 
> =head1 FUNCTIONS
> 
>+=head2 RunRemainingAtomicUpdates
>+
>+=cut
>+
>+sub RunRemainingAtomicUpdates {
>+    my ( $atomicupd ) = @_;
>+    my $loc = $atomicupd->{location};
>+    my @updates = glob( $loc .'/*');
>+    foreach my $upd ( @updates ) {
>+        $upd =~ s/$loc\///;
>+        if( exists $atomicupd->{skipfiles}->{$upd} ) {
>+        #Skip files that belong to official db revisions
>+print "Skipping $upd\n";
>+           next;
>+        }
>+        if( $atomicupd->{remember} =~ /(^|;)$upd;/ ) {
>+        #Skip files that have recently been applied
>+        #Note that an official db rev erases this list
>+print "Remember $upd\n";
>+           next;
>+        }
>+        if( $upd !~ /\.(txt|sql|pl)$/ ) {
>+            print "Unsupported file format: $upd\n";
>+            next;
>+        }
>+        ExecDBRev( $atomicupd, '', '', $upd, 'XXX' );
>+   }
>+}
>+
>+=head2 ExecDBRev
>+
>+=cut
>+
>+sub ExecDBRev {
>+    my ( $atomicupd, $bugno, $descr, $file, $version ) = @_;
>+
>+    my $devrun = $version=~/XXX$/;
>+    $atomicupd->{skipfiles}->{$file} = 1 if !$devrun && $file;
>+    return 0 if !CheckVersion($version);
>+
>+    my $rv;
>+    if( $file =~ /\.txt$/ ) {
>+    #This dbrev prints some warning
>+        my $contents= read_file( $atomicupd->{location}. "/$file" );
>+        print $contents;
>+        $rv = 1;
>+    } elsif( $file =~ /\.pl$/ ) {
>+    #Run perl script
>+        $rv = do $atomicupd->{location}. "/$file";
>+        if( !$rv ) {
>+            print "ERROR: $@\n" if $@;
>+            print "ERROR: $!\n" if $!;
>+            $rv = 1 if !$! && !$@; #apparently, the file does not end with 1;
>+        }
>+    } elsif( $file =~ /\.sql$/ ) {
>+    #Run sql file via installer
>+        my $installer = C4::Installer->new();
>+        $rv = $installer->load_sql( $atomicupd->{location}. "/$file" )? 0: 1;
>+        #Note: load_sql already warns
>+    } else {
>+        print "DB rev $version contains unsupported file $file\n";
>+        $rv = 0;
>+    }
>+
>+    if( $devrun ) {
>+        print "Dev upgrade $file done\n";
>+        _atomic_memory( $atomicupd, $file ) if $rv;
>+    } else {
>+        _atomic_memory( $atomicupd ); #Official db rev clears the atomic pref
>+        SetVersion($version);
>+        print "Upgrade to $version done (Bug $bugno - $descr)\n";
>+    }
>+}
>+
>+sub _atomic_memory {
>+    my ( $atomicupd, $upd ) = @_;
>+    $atomicupd->{remember}= $upd? $atomicupd->{remember}."$upd;": '';
>+    C4::Context->set_preference( ATOMICUPD_PREF, $atomicupd->{remember} );
>+}
>+
> =head2 TableExists($table)
> 
> =cut
>-- 
>1.7.7.6

Actions: View | Diff | Splinter Review

Attachments on bug 13068: 32173 | 32174 | 32175 | 32177 | 32178 | 32179 | 32180 | 32185 | 32294 | 32300 | 32398 | 32399 | 32525 | 32526 | 32658 | 32659 | 32784 | 32785 | 32839 | 32840 | 32841 | 32842 | 32843 | 32919 | 32921 | 33859 | 34070 | 34071 | 34072 | 34949 | 34950 | 34951 | 34960 | 34998 | 35000 | 35001 | 35002 | 35003 | 35366 | 35367 | 35368 | 35370 | 36716 | 36717 | 36718 | 36719 | 36779 | 36780 | 36781 | 36792 | 37061 | 37062 | 37063 | 37064 | 37065 | 37066 | 37075 | 37076 | 37491