Changeset 1843 for trunk

Timestamp:

10/18/16 16:06:10 (8 years ago)

Author:

nanardon

Message:

Automatically register attributes a db start

Location:

trunk/LATMOS-Accounts

Files:

• bin/la-sql-upgrade.in (modified) (1 diff)
• lib/LATMOS/Accounts/Bases/Sql.pm (modified) (1 diff)

trunk/LATMOS-Accounts/bin/la-sql-upgrade.in

@@ -1057 +1057 @@
 }
 
-foreach my $otype ($labase->list_supported_objects) {
-    foreach my $attribute ($labase->list_canonical_fields($otype, 'r')) {
-        my $attr = $labase->attribute($otype, $attribute);
-        $attr->{inline} and next;
-        $attr->{managed} and next;
-
-        if ($labase->is_registered_attribute($otype, $attribute)) {
-        } else {
-            $labase->register_attribute($otype, $attribute, $attr->{comment})
-                or die "Error, aborting\n";
-            print "Attr. $attribute for object type $otype registred\n";
-        }
-    }
-}
-
 foreach (@objects) {
     if (!$labase->get_object($_->{otype}, $_->{name})) {

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

@@ -97 +97 @@
         $self->{_db}->do(q{set DATESTYLE to 'DMY'});
         $self->log(LA_DEBUG, 'New connection to DB');
+
+        foreach my $otype ($self->list_supported_objects) {
+            foreach my $attribute ($self->list_canonical_fields($otype, 'r')) {
+                my $attr = $self->attribute($otype, $attribute);
+                $attr->{inline} and next;
+                $attr->{managed} and next;
+
+                if ($self->is_registered_attribute($otype, $attribute)) {
+                } else {
+                    if($self->register_attribute($otype, $attribute, $attr->{comment})) {
+                        $self->log(LA_NOTICE, "Attr. $attribute for object type $otype registred");
+                    } else {
+                        $self->log(LA_ERR, "Can't register attribute $attribute");
+                        $self->{_db}->rollback;
+                        return;
+                    }
+                }
+            }
+        }
+
         $self->{_db}->commit;
         return $self->{_db};