Changeset 2327

Timestamp:

12/17/19 15:26:28 (4 years ago)

Author:

nanardon

Message:

Fix queryformat evaluation

Location:

trunk/LATMOS-Accounts

Files:

• lib/LATMOS/Accounts/Bases/Objects.pm (modified) (3 diffs)
• live-test/10_sql.t (modified) (2 diffs)

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

@@ -318 +318 @@
             my $attr = $2;
             my $val = '';
+            my $modifier = $3 || '';
             
             if ($attr =~ /^(\w+)\((.*)\)$/) {
@@ -325 +326 @@
             }
 
-            my $modifier = $3 || '';
             my $res = '';
 
@@ -347 +347 @@
                         last;
                     };
-                    $res = sprintf('%' . ($3 || 's'), ref $val ? join(',', @$val) : (defined($val) ? $val : ''))
+                    $res = sprintf('%' . ($modifier || 's'), ref $val ? join(',', @$val) : (defined($val) ? $val : ''))
                 }
             }

trunk/LATMOS-Accounts/live-test/10_sql.t

@@ -18 +18 @@
     plan skip_all => 'No SQL base defined';
 } else {
-    plan tests => 102; # Number of test
+    plan tests => 107; # Number of test
 }
 
@@ -47 +47 @@
 ok($base->delete_object('user', $oid), "Can delete user $oid");
 ok(!$base->get_object('user', $oid), "user $oid is actually deleted");
+}
+
+$base->rollback;
+
+
+{ # test: query
+my $oid = genid();
+
+use_ok('LATMOS::Accounts::Bases::Sql::User');
+ok($base->create_c_object('user', $oid,
+    sn => "snUser",
+    givenName => "givenNameUser",
+    expire => undef,
+    ), "Can create user $oid");
+ok(my $obj = $base->get_object('user', $oid), "user $oid is actually deleted");
+
+is($obj->queryformat('%{name}'),   $oid, 'queryformat %{name}');
+is($obj->queryformat('%{_gecos}'), 'givenNameUser snUser,-,,', 'queryformat %{_gecos}');
 }