Changeset 1865 for trunk/LATMOS-Accounts/bin

Timestamp:

12/21/16 15:07:28 (7 years ago)

Author:

nanardon

Message:

Merge branch

Location:

trunk/LATMOS-Accounts/bin

Files:

• la-sql-alias (added)
• la-sql-properties (added)
• la-sql-upgrade.in (modified) (4 diffs)

trunk/LATMOS-Accounts/bin/la-sql-upgrade.in

@@ -47 +47 @@
 my $LA = LATMOS::Accounts->new($config, noacl => 1);
 my $labase = $LA->base($base);
+$labase->unexported(1);
 
 my $dbi = $labase->db;
@@ -1003 +1004 @@
         ],
     },
+    {
+        ver => 21,
+        sql => [
+            'ALTER TABLE objects ADD COLUMN oalias text',
+            'ALTER TABLE objects
+               ADD COLUMN nodelete boolean NOT NULL DEFAULT false',
+            'ALTER TABLE objects
+               ADD COLUMN internobject boolean NOT NULL DEFAULT false',
+        ],
+    },
+    {
+        ver => 22,
+        sql => [
+            'CREATE INDEX fki_employment
+            ON employment_attributes
+            USING btree (okey);'
+        ],
+    },
+    {
+        ver => 23,
+        sql => [
+            'ALTER TABLE address ADD COLUMN expire timestamp with time zone'
+        ],
+    },
+    {
+        ver => 24,
+        sql => [
+            q{
+            CREATE OR REPLACE FUNCTION user_sort_fields()
+            RETURNS trigger AS
+            $BODY$DECLARE
+            rec RECORD;
+            BEGIN
+
+            IF (TG_OP='UPDATE' or TG_OP='INSERT') THEN
+
+            IF (new.attr='locked') THEN
+            IF (TG_OP = 'INSERT') THEN
+            new.value = now()::text;
+            ELSIF (TG_OP='UPDATE') THEN
+            new.value = old.value;
+            END IF;
+            END IF;
+
+            IF (new.attr='nickname') THEN
+            PERFORM 1 from "user" where "user".ikey = new.okey
+                and new.value = "user".name;
+            IF NOT FOUND THEN
+            select aliases.name into rec from aliases join "user"
+            on array["user".name] = aliases.forward
+            where "user".ikey = new.okey and aliases.name = new.value;
+            IF NOT FOUND THEN
+            insert into aliases ("name", "forward", "description", exported)
+            select new.value, array["user".name], 'Forward for ' || "user".name || ' nickname', "user".exported from "user" where "user".ikey = new.okey;
+            END IF;
+            END IF;
+            END IF;
+
+            IF (new.attr='uidNumber') THEN
+            update "user" set uidnumber = new.value::integer where ikey = new.okey;
+            RETURN NULL;
+            END IF;
+
+            IF (new.attr='gidNumber') THEN
+            update "user" set gidnumber = new.value::integer where ikey = new.okey;
+            RETURN null;
+            END IF;
+
+            IF (new.attr='expire') THEN
+            update "user" set expire = new.value::timestamp where ikey = new.okey;
+            RETURN NULL;
+            END IF;
+
+            IF (new.attr='exported') THEN
+            update "user" set exported = true where ikey = new.okey;
+            RETURN NULL;
+            END IF;
+
+            END IF;
+
+            IF (TG_OP = 'DELETE') THEN
+
+            IF (old.attr='expire') THEN
+            update "user" set expire = NULL where ikey = old.okey;
+            RETURN NULL;
+            END IF;
+
+            IF (old.attr='exported') THEN
+            update "user" set exported = false where ikey = old.okey;
+            RETURN NULL;
+            END IF;
+
+            END IF;
+
+
+            IF (TG_OP='INSERT') THEN
+            IF (new.attr='manager') THEN
+            insert into user_attributes_users VALUES (new.*);
+            RETURN NULL;
+            END IF;
+
+            IF (new.attr='site') THEN
+            insert into user_attributes_site VALUES (new.*);
+            RETURN NULL;
+            END IF;
+
+            IF (new.attr='department') THEN
+            insert into user_attributes_groups VALUES (new.*);
+            RETURN NULL;
+            END IF;
+
+            IF (new.attr='contratType') THEN
+            insert into user_attributes_groups VALUES (new.*);
+            RETURN NULL;
+            END IF;
+
+            IF (new.attr='jobType') THEN
+            insert into user_attributes_groups VALUES (new.*);
+            RETURN NULL;
+            END IF;
+
+            END IF;
+
+            IF (TG_OP='DELETE') then
+            RETURN old;
+            ELSE
+            RETURN new;
+            end if;
+            END;$BODY$
+            LANGUAGE plpgsql VOLATILE
+            COST 100;
+            ALTER FUNCTION user_sort_fields()
+            OWNER TO latmos;
+
+            },
+        ],
+    },
 );
 
@@ -1019 +1157 @@
             description => 'Contract',
         },
+    },
+    {
+        name => '-useralias',
+        otype => 'group',
+        attrs => {
+            description => 'Internal group for user alias object',
+            gidnumber => -1,
+            unexported => 1,
+        },
+        intern => 1,
     },
 );
@@ -1057 +1205 @@
 }
 
+my $setnodel  = $dbi->prepare('UPDATE objects SET nodelete     = true where name = ?');
+my $setintern = $dbi->prepare('UPDATE objects SET internobject = true where name = ?');
+
 foreach (@objects) {
-    if (!$labase->get_object($_->{otype}, $_->{name})) {
-        printf("Creatting object %s/%s\n", $_->{otype}, $_->{name});
+    if (!$labase->GetRawObject($_->{otype}, $_->{name})) {
+        printf("Creating object %s/%s\n", $_->{otype}, $_->{name});
         $labase->create_object($_->{otype}, $_->{name}, %{$_->{attrs} || {}})
             or die sprintf("cannot create %s/%s\n", $_->{otype}, $_->{name});
 
     }
+
+    $setnodel->execute($_->{name});
+    $setintern->execute($_->{name}) if ($_->{intern});
 }