Changeset 1382 for trunk

Timestamp:

08/14/15 19:11:12 (9 years ago)

Author:

nanardon

Message:

return 0 value for active attribute

Location:

trunk/LATMOS-Accounts

Files:

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

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

@@ -519 +519 @@
         ],
     },
+    {
+        ver => 12,
+        sql => [
+            q{
+            CREATE OR REPLACE VIEW user_attributes AS 
+            (        (        (        (        (        (        (        (        (        (        (
+            SELECT "user".uidnumber::text AS value, 'uidnumber' AS attr, "user".rev AS attr_key, "user".ikey AS okey FROM "user"
+            UNION ALL 
+            SELECT "user".gidnumber::text AS value, 'gidnumber' AS attr, "user".rev AS attr_key, "user".ikey AS okey FROM "user")
+            UNION ALL 
+            SELECT "user".name AS value, 'name' AS attr, "user".rev AS attr_key, "user".ikey AS okey FROM "user")
+            UNION ALL 
+            SELECT "user".expire::text AS value, 'expire' AS attr, "user".rev AS attr_key, "user".ikey AS okey FROM "user"
+            WHERE "user".expire IS NOT NULL)
+            UNION ALL 
+            SELECT '1'::text AS value, 'exported' AS attr, "user".rev AS attr_key, "user".ikey AS okey
+            FROM "user"
+            WHERE "user".exported = true)
+            UNION ALL 
+            SELECT address_attributes_site.value, 'allsite' AS attr, "user".rev AS attr_key, "user".ikey AS okey
+            FROM "user"
+            JOIN address ON address."user" = "user".name
+            JOIN address_attributes_site ON address_attributes_site.okey = address.ikey
+            WHERE address_attributes_site.attr = 'site'::text AND address.exported = true)
+            UNION ALL 
+            SELECT "group".name AS value, 'memberOf' AS attr, "user".rev AS attr_key, "user".ikey AS okey
+            FROM "user"
+            JOIN group_attributes ON group_attributes.value = "user".name
+            JOIN "group" ON group_attributes.okey = "group".ikey
+            WHERE group_attributes.attr = 'memberUID'::text)
+            UNION ALL 
+            SELECT user_attributes.value, user_attributes.attr, user_attributes.attr_key, user_attributes.okey
+            FROM user_attributes_base user_attributes)
+            UNION ALL 
+            SELECT "group".name AS value, 'departments' AS attr, "user".rev AS attr_key, "user".ikey AS okey
+            FROM "group"
+            JOIN group_attributes_sutypes ON "group".ikey = group_attributes_sutypes.okey
+            JOIN group_attributes_users ON "group".ikey = group_attributes_users.okey AND group_attributes_users.attr = 'memberUID'::text
+            JOIN "user" ON "user".name = group_attributes_users.value
+            WHERE group_attributes_sutypes.value = 'dpmt'::text AND group_attributes_sutypes.attr = 'sutype'::text)
+            UNION ALL 
+            SELECT "group".name AS value, 'cells' AS attr, "user".rev AS attr_key, "user".ikey AS okey
+            FROM "group"
+            JOIN group_attributes_sutypes ON "group".ikey = group_attributes_sutypes.okey
+            JOIN group_attributes_users ON "group".ikey = group_attributes_users.okey AND group_attributes_users.attr = 'memberUID'::text
+            JOIN "user" ON "user".name = group_attributes_users.value
+            WHERE group_attributes_sutypes.value = 'cell'::text AND group_attributes_sutypes.attr = 'sutype'::text)
+            UNION ALL 
+            SELECT "group".name AS value, 'managedObjects' AS attr, "user".rev AS attr_key, "user".ikey AS okey
+            FROM "user"
+            JOIN group_attributes ON group_attributes.value = "user".name
+            JOIN "group" ON group_attributes.okey = "group".ikey
+            WHERE group_attributes.attr = 'managedBy'::text)
+            UNION ALL 
+            SELECT justify_interval(now() - "user".expire)::text AS value, 'expired' AS attr, "user".rev AS attr_key, "user".ikey AS okey
+            FROM "user"
+            WHERE "user".expire <= now())
+            UNION ALL 
+            SELECT 1::text AS value, 'active' AS attr, "user".rev AS attr_key, "user".ikey AS okey
+            FROM "user"
+            WHERE ("user".expire IS NULL OR "user".expire >= now()) AND "user".exported = true
+            UNION ALL 
+            SELECT 0::text AS value, 'active' AS attr, "user".rev AS attr_key, "user".ikey AS okey
+            FROM "user"
+            WHERE ("user".expire IS NOT NULL and "user".expire <= now()) or "user".exported = false; 
+            }
+        ],
+    }
 );
 

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

@@ -18 +18 @@
 our $VERSION = (q$Rev$ =~ /^Rev: (\d+) /)[0];
 
-my $SCHEMA_VERSION = 5;
+my $SCHEMA_VERSION = 11;
 
 =head1 NAME