Changeset 2083 for trunk/LATMOS-Accounts

Timestamp:

09/18/17 19:49:37 (7 years ago)

Author:

nanardon

Message:

Make sql-upgrade automatic

Location:

trunk/LATMOS-Accounts

Files:

• MANIFEST (modified) (3 diffs)
• Makefile.PL (modified) (1 diff)
• bin/la-sql-upgrade (added)
• bin/la-sql-upgrade.in (deleted)
• lib/LATMOS/Accounts/Bases/Sql.pm (modified) (2 diffs)
• lib/LATMOS/Accounts/Bases/Sql/upgrade.pm (added)

trunk/LATMOS-Accounts/MANIFEST

@@ -35 +35 @@
 bin/la-sql-freeip
 bin/la-sql-log
+bin/la-sql-properties
 bin/la-sql-recompute
 bin/la-sql-rename-host
-bin/la-sql-properties
 bin/la-sql-reset-passwd
 bin/la-sql-rev
@@ -44 +44 @@
 bin/la-sql-switch-cname
 bin/la-sql-updsshfp
-bin/la-sql-upgrade.in
+bin/la-sql-upgrade
 bin/la-sync
 bin/la-sync-ctl
@@ -100 +100 @@
 lib/LATMOS/Accounts/Bases/Sql/Userstatus.pm
 lib/LATMOS/Accounts/Bases/Sql/objects.pm
+lib/LATMOS/Accounts/Bases/Sql/upgrade.pm
 lib/LATMOS/Accounts/Bases/Unix.pm
 lib/LATMOS/Accounts/Bases/Unix/Group.pm

trunk/LATMOS-Accounts/Makefile.PL

@@ -148 +148 @@
 $makepo
 
-bin/la-sql-upgrade: bin/la-sql-upgrade.in
-\tcat \$< \| sed 's:\@DATADIR\@:\$(DATADIR):' > \$@
-\tchmod +x \$@
-
 svnmanifest:
 \tsvn ls -R| grep -v "/\$\$"  > MANIFEST

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql.pm

@@ -18 +18 @@
 our $VERSION = (q$Rev$ =~ /^Rev: (\d+) /)[0];
 
-sub SCHEMA_VERSION { 11 };
+sub SCHEMA_VERSION { 26 };
 
 =head1 NAME
@@ -98 +98 @@
         $self->log(LA_DEBUG, 'New connection to DB');
 
+        {
+            my $sv = $self->get_global_value('schema_version') || 1;
+            if ($sv < SCHEMA_VERSION) {
+                require LATMOS::Accounts::Bases::Sql::upgrade;
+                if ($self->SchemaUpgrade()) {
+                    $self->commit;
+                } else {
+                    $self->rollback;
+                    return;
+                }
+            }
+        }
 
         foreach my $otype ($self->list_supported_objects) {