Changeset 1401 for trunk/LATMOS-Accounts/lib/LATMOS

Timestamp:

08/28/15 12:09:30 (9 years ago)

Author:

nanardon

Message:

Add SCHEMA_VERSION() to SQL base

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases

Files:

• Sql.pm (modified) (2 diffs)
• Sql/User.pm (modified) (2 diffs)
• Sql/objects.pm (modified) (1 diff)

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

@@ -18 +18 @@
 our $VERSION = (q$Rev$ =~ /^Rev: (\d+) /)[0];
 
-my $SCHEMA_VERSION = 11;
+sub SCHEMA_VERSION { 11 };
 
 =head1 NAME
@@ -108 +108 @@
 
     my $sv = $self->get_global_value('schema_version') || 1;
-    if ($sv < $SCHEMA_VERSION) {
+    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,
+            SCHEMA_VERSION,
             $self->label,
         );

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

@@ -756 +756 @@
                         )
                     );
-                    $sth->execute($obj->id);
+                    $sth->execute($obj->id) or $obj->db->rollback;
                     my $res = $sth->fetchrow_hashref;
                     $sth->finish;
@@ -775 +775 @@
                         )
                     );
-                    $sth->execute($self->object->id);
+                    $sth->execute($self->object->id) or $self->object->db->rollback;
                     my $res = $sth->fetchrow_hashref;
                     $sth->finish;

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

@@ -324 +324 @@
     );
     $sth->execute($self->id);
-    my $res = $sth->fetchrow_hashref;
+    my $res = $sth->fetchrow_hashref or $self->db->rollback;
     $sth->finish;
     return $res->{$field};