Changeset 1312 for branches

Timestamp:

04/02/15 15:48:01 (9 years ago)

Author:

nanardon

Message:

merge irev changes from trunk

Location:

branches/4.0/LATMOS-Accounts

Files:

• bin/la-sql-log (modified) (1 diff)
• bin/la-sql-upgrade.in (modified) (2 diffs)
• lib/LATMOS/Accounts/Bases/Sql.pm (modified) (1 diff)

branches/4.0/LATMOS-Accounts/bin/la-sql-log

@@ -56 +56 @@
 
 foreach(@logs) {
-    printf("%s %s: %s/%s (%d) %s\n",
+    printf("%s (%d), %s: %s/%s (%d) %s\n",
         $_->{logdate},
+        $_->{irev} || -1,
         $_->{username},
         $_->{otype},

branches/4.0/LATMOS-Accounts/bin/la-sql-upgrade.in

@@ -202 +202 @@
             ALTER TABLE revaliases ADD COLUMN description text;
             },
-        ],
-    },
-    {
-        ver => 7,
-        sql => [
             q{
             CREATE OR REPLACE FUNCTION group_sort_fields()
@@ -259 +254 @@
         ],
     },
-
+    {
+        ver => 8,
+        sql => [
+            q{
+            CREATE TABLE objectslogs
+            (
+              logkey SERIAL NOT NULL,
+              ikey bigint NOT NULL,
+              irev bigint,
+              otype text NOT NULL,
+              name text NOT NULL,
+              changetype text NOT NULL,
+              username text NOT NULL,
+              message text NOT NULL,
+              logdate timestamp with time zone NOT NULL DEFAULT now(),
+              CONSTRAINT objectlogs_pkey PRIMARY KEY (logkey)
+            );},
+            q{
+            CREATE INDEX objectlogs_name_idx
+              ON objectslogs
+              USING btree
+              (name);
+            },
+            q{
+            CREATE INDEX objectslogs_ikey_idx
+              ON objectslogs
+              USING btree
+              (ikey);
+            },
+            q{
+            CREATE INDEX objectslogs_otype_idx
+              ON objectslogs
+              USING btree
+              (otype);
+            }
+        ],
+    },
 );
 

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

@@ -649 +649 @@
 
     my $sth = $self->db->prepare(q{
-        INSERT into objectslogs (ikey, otype, name, changetype, username, message)
-        VALUES (?,?,?,?,?,?)
+        INSERT into objectslogs (ikey, irev, otype, name, changetype, username, message)
+        VALUES (?,?,?,?,?,?,?)
         });
 
     $sth->execute(
         $ref,
+        $self->current_rev,
         $otype,
         $name,