Changeset 2204 for trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases

Timestamp:

02/19/19 19:43:10 (5 years ago)

Author:

nanardon

Message:

Track parent object in SQL log

Location:

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

Files:

• Sql.pm (modified) (7 diffs)
• Sql/Address.pm (modified) (1 diff)
• Sql/Employment.pm (modified) (1 diff)
• Sql/objects.pm (modified) (2 diffs)
• Sql/upgrade.pm (modified) (2 diffs)

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

@@ -18 +18 @@
 our $VERSION = (q$Rev: 2149 $ =~ /^Rev: (\d+) /)[0];
 
-sub SCHEMA_VERSION { 28 };
+sub SCHEMA_VERSION { 29 };
 
 =head1 NAME
@@ -154 +154 @@
         # return;
     }
-    $self->_CreateInternalObjects;
+    if (!$self->_CreateInternalObjects) {
+        $self->rollback;
+    }
 
     1;
@@ -214 +216 @@
     if ($change > 0) {
         $self->db->commit;
-    } else {
-       $self->db->rollback;
-    }
-
-    return 1;
+    }
+
+    return $change;
 }
 
@@ -1092 +1092 @@
     );
 
+    my ($potype, $pname, $pikey);
+
+    if (my $obj = $self->get_object($otype, $name)) {
+        my $parent = $obj->ParentObject;
+        $potype = $parent->type;
+        $pname  = $parent->name;
+        $pikey  = $parent->Iid; 
+    }
+
     my $sth = $self->db->prepare(q{
-        INSERT into objectslogs (ikey, irev, otype, name, changetype, username, message)
-        VALUES (?,?,?,?,?,?,?)
+        INSERT into objectslogs (ikey, irev, otype, name, changetype, username, message, parentotype, parentname, parentikey)
+        VALUES (?,?,?,?,?,?,?,?,?,?)
         });
 
@@ -1105 +1114 @@
         $self->user || '@Console',
         sprintf($message, @args),
+        $potype, $pname, $pikey,
     );
 }
@@ -1119 +1129 @@
     my $sth = $self->db->prepare(q{
         select ikey from objectslogs where
-            otype = ? and
-            name  = ?
+            (otype = $1 and name  = $2) 
         group by ikey
     });
@@ -1130 +1139 @@
     @ids or return;
 
-    my $sth2 = $self->db->prepare(sprintf(
+    my $sth2 = $self->db->prepare(
         q{
-            select * from objectslogs where ikey IN (%s)
+            select * from objectslogs where ikey = ANY ($1)
+                or parentikey = ANY ($1)
             order by logdate asc
         },
-        join(',', ('?') x scalar(@ids))
-    ));
-
-    $sth2->execute(@ids);
+    );
+
+    $sth2->execute( \@ids );
     my @logs;
     while (my $res = $sth2->fetchrow_hashref) {

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

@@ -337 +337 @@
 }
 
+sub ParentObject {
+    my ($self) = @_;
+
+    return $self->base->get_object('user', $self->_get_attributes('user'));
+}
+
 sub _create {
     my ($class, $base, $id, %data) = @_;

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

@@ -316 +316 @@
     }
     $class->SUPER::_get_attr_schema($base, $attrs);
+}
+
+sub ParentObject {
+    my ($self) = @_;
+
+    return $self->base->get_object('user', $self->_get_attributes('user'));
 }
 

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

@@ -306 +306 @@
 
 sub Iid { $_[0]->_get_ikey }
+
+sub ParentObject { }
 
 sub _get_ikey {
@@ -1417 +1419 @@
 }
 
+sub ReportChange {
+    my ($self, $changetype, $message, @args) = @_;
+
+    $self->base->ReportChange(
+        $self->type,
+        $self->id,
+        $self->Iid,
+        $changetype, $message, @args
+    )
+}
+
+
 1;
 

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

@@ -1161 +1161 @@
                 }
             ]
+        },
+        {
+            ver => 29,
+            sql => [
+                q{
+                ALTER TABLE objectslogs
+                   ADD COLUMN parentotype text;
+                ALTER TABLE objectslogs
+                   ADD COLUMN parentname text;
+                ALTER TABLE objectslogs
+                   ADD COLUMN parentikey bigint;
+                CREATE INDEX objectslogs_parentotype_idx
+                    ON public.objectslogs
+                    USING btree (parentotype);
+                CREATE INDEX objectslogs_parentname_idx
+                    ON objectslogs
+                    USING btree (parentname);
+                CREATE INDEX objectslogs_parentikey_idx
+                    ON objectslogs
+                    USING btree (parentikey);
+                }
+            ],
         },
     );
@@ -1224 +1246 @@
     );
 
+    return 1;
 }