Changeset 52 for LATMOS-Accounts

Timestamp:

04/25/09 23:56:24 (15 years ago)

Author:

nanardon

Message:

• add revision support in Sql base

Location:

LATMOS-Accounts/lib/LATMOS/Accounts/Bases

Files:

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

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

@@ -76 +76 @@
             uidNumber       => 'uid',
             gidNumber       => 'gid',
-            # gecos           => 'gecos',
+            gecos           => 'gecos',
             homeDirectory   => 'home',
             loginShell      => 'shell',
             sn              => 'name',
             givenName       => 'firstname',
-            #userPassword    => ($self->{use_shadow} ? 'spassword' : 'password'),
+            userPassword    => 'password',
         },
         group => {
@@ -124 +124 @@
 }
 
+sub current_rev {
+    my ($self) = @_;
+    my $sth = $self->db->prepare_cached(
+        q{select max(rev) from revisions}
+    );
+    $sth->execute;
+    my $res = $sth->fetchrow_hashref;
+    $sth->finish;
+    return ($res->{max});
+} 
+
 1;
 

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

@@ -41 +41 @@
 sub key_field { 'login' }
 
+sub get_field {
+    my ($self, $field) = @_;
+    if ($field eq 'gecos') {
+        return $self->get_field('firstname') . ' ' . $self->get_field('name');
+    } else {
+        return $self->SUPER::get_field($field);
+    }
+}
+
+sub set_fields {
+    my ($self, %data) = @_;
+    $self->SUPER::set_fields(
+        map { $_ => $data{$_} }
+        grep { $_ ne 'gecos' } keys %data
+    );
+}
+
 1;
 

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

@@ -49 +49 @@
     );
     $sth->execute;
+    my @keys;
+    while(my $res = $sth->fetchrow_hashref) {
+        push(@keys, $res->{k});
+    }
+    @keys
+}
+
+sub list_from_rev {
+    my ($class, $base, $rev) = @_;
+    my $sth = $base->db->prepare_cached(
+        sprintf(
+            q{select %s as k from %s where rev > ? order by %s},
+            $base->db->quote_identifier($class->key_field),
+            $base->db->quote_identifier($class->object_table),
+            $base->db->quote_identifier($class->key_field),
+        )
+    );
+    $sth->execute($rev);
     my @keys;
     while(my $res = $sth->fetchrow_hashref) {

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Unix/User.pm

@@ -61 +61 @@
     foreach my $field (keys %data) {
         # TODO check fields exists !
+        $field =~ /^(sn|givenName)$/ and next;
         $self->{$field} = $data{$field};
     }