Changeset 2262

Timestamp:

06/07/19 17:59:53 (5 years ago)

Author:

nanardon

Message:

Precompute more attribute

Location:

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

Files:

• Attributes.pm (modified) (1 diff)
• Sql.pm (modified) (1 diff)
• Sql/User.pm (modified) (5 diffs)
• Sql/upgrade.pm (modified) (2 diffs)

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

@@ -32 +32 @@
         : (undef, $base_or_object, $maybe_otype);
 
+    my $attr_info = {};
     if (ref $attributes) {
-        $attributes->{_base} = $base;
-        $attributes->{_object} = $object;
-        $attributes->{_name} = $attributes->{name};
-        $attributes->{_otype} = $otype;
-        $attributes->{monitored} ||= $base->config('monitored')->{ lc( $otype . '.' . $attributes->{name} ) };
-
-        return bless($attributes, $class);
-    } else {
-        my $attr_info = $base->get_attr_schema($otype, $attributes) or return;
-
-        $attr_info->{_base} = $base;
-        $attr_info->{_object} = $object;
+        $attr_info = $attributes;
+        $attr_info->{_name} = $attributes->{name};
+    } else {
+        $attr_info = $base->get_attr_schema($otype, $attributes) or return;
         $attr_info->{_name} = $attributes;
-        $attr_info->{_otype} = $otype;
-        $attr_info->{monitored} ||= $base->config('monitored')->{ lc( $otype . '.' . $attributes ) };
-
-        return bless($attr_info, $class);
-    }
+    }
+
+    $attr_info->{_base}       = $base;
+    $attr_info->{_object}     = $object;
+    $attr_info->{_otype}      = $otype;
+    $attr_info->{monitored} ||= $base->config('monitored')->{ lc( $otype . '.' . $attributes ) };
+    $attr_info->{ro}          = 1 if ($attr_info->{auto});
+
+    return bless($attr_info, $class);
 }
 

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

@@ -18 +18 @@
 our $VERSION = (q$Rev$ =~ /^Rev: (\d+) /)[0];
 
-sub SCHEMA_VERSION { 33 };
+sub SCHEMA_VERSION { 34 };
 
 =head1 NAME

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

@@ -951 +951 @@
             },
             sAMAccountName => {
-                ro => 1,
                 auto => 1,
             },
@@ -1020 +1019 @@
             },
             directReports => {
+                auto => 1,
+                ro => 1,
+            },
+            _directReports => {
                 reference => 'user',
                 ro => 1,
+                hide => 1,
                 delayed => 1,
                 get => sub {
@@ -1066 +1070 @@
             otheraddress => {
                 ro => 1,
+                auto => 1,
+            },
+            _otheraddress => {
+                ro => 1,
+                hide => 1,
                 reference => 'address',
                 get => sub {
@@ -1085 +1094 @@
                 },
             },
-            mainaddress => {
+            mainaddress => { auto => 1 },
+            _mainaddress => {
+                hide => 1,
                 ro => 1,
                 reference => 'address',
@@ -1100 +1111 @@
                 },
             },
-            postalAddress => {
+            postalAddress => { auto => 1 },
+            _postalAddress => {
+                hide => 1,
                 ro => 1,
                 get => sub {

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

@@ -1256 +1256 @@
             ],
         },
+        {
+            ver => 34,
+            code => sub { return 1 },
+            recompute => 1,
+        },
     );
 
@@ -1290 +1295 @@
             $maj->{ver}, 'schema_version'
         );
+
+        if ($maj->{code}) {
+            $maj->{code}->() or return;
+        }
     }