Changeset 944 for LATMOS-Accounts

Timestamp:

04/26/12 18:54:04 (12 years ago)

Author:

nanardon

Message:

Fix attributes registration when attributes has description in perl code

Location:

LATMOS-Accounts/lib/LATMOS/Accounts/Bases

Files:

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

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

@@ -321 +321 @@
 }
 
+sub is_registered_attribute {
+    my ($self, $otype, $attribute) = @_;
+    my $pclass = $self->_load_obj_class($otype) or return;
+    $pclass->is_registered_attribute($self, $attribute);
+}
+
 sub get_attribute_comment {
     my ($self, $otype, $attribute) = @_;

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

@@ -619 +619 @@
     my ($class, $base, $attribute, $comment) = @_;
 
-    $base->attribute($class->type, $attribute) and do {
+    $class->is_registered_attribute($base, $attribute) and do {
         $base->log(LA_ERR, "The attribute $attribute already exists");
         return;
@@ -630 +630 @@
     );
     my $res = $sth->execute($attribute, $comment);
+}
+
+sub is_registered_attribute {
+    my ($class, $base, $attribute) = @_;
+
+    my $sth = $base->db->prepare(
+        sprintf(q{
+            select 1 from %s where canonical = ?
+            }, $class->attributes_table
+        )
+    );
+    $sth->execute($attribute);
+    my $res = $sth->fetchrow_hashref;
+    return $res ? 1 : 0;
 }