Changeset 2234

Timestamp:

03/08/19 14:31:40 (5 years ago)

Author:

nanardon

Message:

Allow to use functions in queryformat

Location:

trunk/LATMOS-Accounts

Files:

• lib/LATMOS/Accounts/Bases.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Bases/Objects.pm (modified) (2 diffs)
• lib/LATMOS/Accounts/Bases/Sql.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Bases/Sql/objects.pm (modified) (1 diff)
• t/10_bases.t (modified) (1 diff)

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

@@ -1251 +1251 @@
 
 sub QFunc {
-    my ($self, $sub, @args) = @_;
+    my ($self, $sub, $args) = @_;
+
+    $args ||= '';
+    my @args = split(',', $args);
 
     for ($sub) {

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

@@ -320 +320 @@
             my $res = '';
 
-            if (!$op) {
+            if ($op) {
+                if ($op eq '?') {
+                    $res = $val ? $3 : '';
+                } elsif ($op eq '?!') {
+                    $res = $val ? '' : $3;
+                }
+                if ($res =~ /^(\w+)\((.*)\)$/) {
+                    $res = $self->base->QFunc($1, $2);
+                }
+            } else {
                 for ($modifier) {
                     /upper/ and do {
@@ -332 +341 @@
                     $res = sprintf('%' . ($3 || 's'), ref $val ? join(',', @$val) : (defined($val) ? $val : ''))
                 }
-            } elsif ($op eq '?') {
-                $res = $val ? $3 : '';
-            } elsif ($op eq '?!') {
-                $res = $val ? '' : $3;
             }
             $res

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

@@ -1184 +1184 @@
 }
 
-sub QFunc {
-    my ($self, $sub, @args) = @_;
-
-    $self->SUPER::QFunc($sub, @args);
-}
-
-
 1;
 

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

@@ -1013 +1013 @@
 
         if (my ($func, $args) = $val =~ /^(\w+)\((.*)\)$/) {
-            $args ||= '';
-            my @args = split(',', $args);
-
-            $val = $base->QFunc( $func, @args );
+            $val = $base->QFunc( $func, $args );
         }
 

trunk/LATMOS-Accounts/t/10_bases.t

@@ -18 +18 @@
 ok(eq_set(
     [ $dummyb->list_canonical_fields('user') ],
-    [qw(username homeDirectory) ],
+    [qw( username homeDirectory shell gecos uidNumber gidNumber ) ],
 ), "Can get canonicals fields");
 is( $dummyb->attribute('user', 'homeDirectory')->iname, "home", "can call get_fields_name");