Changeset 2243 for trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql.pm

Timestamp:

05/21/19 17:30:15 (5 years ago)

Author:

nanardon

Message:

Improve schema upgrade procedure

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql.pm (modified) (3 diffs)

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

@@ -18 +18 @@
 our $VERSION = (q$Rev$ =~ /^Rev: (\d+) /)[0];
 
-sub SCHEMA_VERSION { 31 };
+sub SCHEMA_VERSION { 32 };
 
 =head1 NAME
@@ -95 +95 @@
         $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;
-                }
-            }
-        }
-
-        $self->{_db}->commit;
         return $self->{_db};
     }
 }
 
+sub IsSchemaUpToDate {
+    my ($self) = @_;
+
+    my $sv = $self->get_global_value('schema_version') || 1;
+
+    return $sv == SCHEMA_VERSION;
+}
+
+sub SchemaUpgrade {
+    my ($self) = @_;
+
+    if (!$self->IsSchemaUpToDate) {
+        require LATMOS::Accounts::Bases::Sql::upgrade;
+        if ($self->_SchemaUpgrade()) {
+            $self->commit;
+        } else {
+            $self->rollback;
+            return;
+        }
+    } else {
+        return 1;
+    }
+}
+
 =head2 load
 
@@ -123 +133 @@
     if (!$self->db) { return 0 };
 
-    my $sv = $self->get_global_value('schema_version') || 1;
-    if ($sv < SCHEMA_VERSION) {
-        $self->log(LA_CRIT,
-            "Schema version %d found, %d is need, please update db using " .
-            "`la-sql-upgrade' tool for `%s' base",
-            $sv,
-            SCHEMA_VERSION,
-            $self->label,
-        );
-        # return;
-    }
+    if (!$self->IsSchemaUpToDate) {
+        my $sv = $self->get_global_value('schema_version') || 1;
+        $self->log(LA_ERR, "Schema need update, please run `la-sql-upgrade -b %s'", $self->label); 
+        return;
+    }
+
     if (!$self->_CreateInternalObjects) {
         $self->rollback;