Fixup some SQL formatting, per Khushboo

This commit is contained in:
Dave Page 2016-03-10 17:23:59 +00:00
parent ce5d7b7d60
commit b7f6df34ab
8 changed files with 53 additions and 51 deletions

View File

@ -1,23 +1,23 @@
SELECT 'lanacl' as deftype, COALESCE(gt.rolname, 'public') grantee, g.rolname grantor, SELECT 'lanacl' as deftype, COALESCE(gt.rolname, 'public') grantee, g.rolname grantor,
array_agg(privilege_type) as privileges, array_agg(is_grantable) as grantable array_agg(privilege_type) as privileges, array_agg(is_grantable) as grantable
FROM FROM
(SELECT (SELECT
d.grantee, d.grantor, d.is_grantable, d.grantee, d.grantor, d.is_grantable,
CASE d.privilege_type CASE d.privilege_type
WHEN 'USAGE' THEN 'U' WHEN 'USAGE' THEN 'U'
ELSE 'UNKNOWN' ELSE 'UNKNOWN'
END AS privilege_type END AS privilege_type
FROM FROM
(SELECT lanacl FROM pg_language lan (SELECT lanacl FROM pg_language lan
LEFT OUTER JOIN pg_shdescription descr ON (lan.oid=descr.objoid AND descr.classoid='pg_language'::regclass) LEFT OUTER JOIN pg_shdescription descr ON (lan.oid=descr.objoid AND descr.classoid='pg_language'::regclass)
WHERE lan.oid = {{ lid|qtLiteral }}::OID WHERE lan.oid = {{ lid|qtLiteral }}::OID
) acl, ) acl,
(SELECT (d).grantee AS grantee, (d).grantor AS grantor, (d).is_grantable AS is_grantable, (SELECT (d).grantee AS grantee, (d).grantor AS grantor, (d).is_grantable AS is_grantable,
(d).privilege_type AS privilege_type (d).privilege_type AS privilege_type
FROM (SELECT aclexplode(lanacl) as d FROM pg_language lan1 FROM (SELECT aclexplode(lanacl) as d FROM pg_language lan1
WHERE lan1.oid = {{ lid|qtLiteral }}::OID ) a WHERE lan1.oid = {{ lid|qtLiteral }}::OID ) a
) d ) d
) d ) d
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid) LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)
LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid) LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)
GROUP BY g.rolname, gt.rolname GROUP BY g.rolname, gt.rolname

View File

@ -1,7 +1,7 @@
SELECT lan.oid as oid, lanname as name, lanpltrusted as trusted, lanacl as acl, hp.proname as lanproc, SELECT lan.oid as oid, lanname as name, lanpltrusted as trusted, lanacl as acl, hp.proname as lanproc,
vp.proname as lanval, description, pg_get_userbyid(lan.lanowner) as lanowner, ip.proname as laninl, vp.proname as lanval, description, pg_get_userbyid(lan.lanowner) as lanowner, ip.proname as laninl,
(SELECT array_agg(label) FROM pg_seclabels sl1 WHERE sl1.objoid=lan.oid) AS labels, (SELECT array_agg(label) FROM pg_seclabels sl1 WHERE sl1.objoid=lan.oid) AS labels,
(SELECT array_agg(provider) FROM pg_seclabels sl2 WHERE sl2.objoid=lan.oid) AS providers (SELECT array_agg(provider) FROM pg_seclabels sl2 WHERE sl2.objoid=lan.oid) AS providers
FROM pg_language lan JOIN pg_proc hp on hp.oid=lanplcallfoid LEFT OUTER JOIN pg_proc ip on ip.oid=laninline FROM pg_language lan JOIN pg_proc hp on hp.oid=lanplcallfoid LEFT OUTER JOIN pg_proc ip on ip.oid=laninline
LEFT OUTER JOIN pg_proc vp on vp.oid=lanvalidator LEFT OUTER JOIN pg_proc vp on vp.oid=lanvalidator
LEFT OUTER JOIN pg_description des ON (des.objoid=lan.oid AND des.objsubid=0 AND des.classoid='pg_language'::regclass) LEFT OUTER JOIN pg_description des ON (des.objoid=lan.oid AND des.objsubid=0 AND des.classoid='pg_language'::regclass)

View File

@ -1,6 +1,7 @@
-- Language: {{data.name}} -- Language: {{data.name}}
-- DROP LANGUAGE {{ conn|qtIdent(data.name) }} -- DROP LANGUAGE {{ conn|qtIdent(data.name) }}
{# ============= CREATE LANGUAGE Query ============= #} {# ============= CREATE LANGUAGE Query ============= #}
CREATE {% if data.trusted %}TRUSTED{% endif %} PROCEDURAL LANGUAGE {{ conn|qtIdent(data.name) }} CREATE {% if data.trusted %}TRUSTED{% endif %} PROCEDURAL LANGUAGE {{ conn|qtIdent(data.name) }}
{% if data.lanproc %} {% if data.lanproc %}
@ -10,8 +11,8 @@ CREATE {% if data.trusted %}TRUSTED{% endif %} PROCEDURAL LANGUAGE {{ conn|qtIde
INLINE {{ conn|qtIdent(data.laninl) }} INLINE {{ conn|qtIdent(data.laninl) }}
{% endif %} {% endif %}
{% if data.lanval %} {% if data.lanval %}
VALIDATOR {{ conn|qtIdent(data.lanval) }} VALIDATOR {{ conn|qtIdent(data.lanval) }}{% endif %};
{% endif %};
{# ============= ALTER LANGUAGE Query ============= #} {# ============= ALTER LANGUAGE Query ============= #}
{% if data.lanowner %} {% if data.lanowner %}
ALTER LANGUAGE {{ conn|qtIdent(data.name) }} ALTER LANGUAGE {{ conn|qtIdent(data.name) }}

View File

@ -3,17 +3,17 @@
{# ============= Update language name ============= #} {# ============= Update language name ============= #}
{% if data.name != o_data.name %} {% if data.name != o_data.name %}
ALTER LANGUAGE {{ conn|qtIdent(o_data.name) }} ALTER LANGUAGE {{ conn|qtIdent(o_data.name) }}
RENAME TO {{ conn|qtIdent(data.name) }}; RENAME TO {{ conn|qtIdent(data.name) }};
{% endif %} {% endif %}
{# ============= Update language user ============= #} {# ============= Update language user ============= #}
{% if data.lanowner and data.lanowner != o_data.lanowner %} {% if data.lanowner and data.lanowner != o_data.lanowner %}
ALTER LANGUAGE {{ conn|qtIdent(data.name) }} ALTER LANGUAGE {{ conn|qtIdent(data.name) }}
OWNER TO {{ conn|qtIdent(data.lanowner) }}; OWNER TO {{ conn|qtIdent(data.lanowner) }};
{% endif %} {% endif %}
{# ============= Update language comments ============= #} {# ============= Update language comments ============= #}
{% if data.description and data.description != o_data.description %} {% if data.description and data.description != o_data.description %}
COMMENT ON LANGUAGE {{ conn|qtIdent(data.name) }} COMMENT ON LANGUAGE {{ conn|qtIdent(data.name) }}
IS '{{ data.description }}'; IS '{{ data.description }}';
{% endif %} {% endif %}
{% endif %} {% endif %}

View File

@ -1,19 +1,19 @@
SELECT 'lanacl' as deftype, COALESCE(gt.rolname, 'public') grantee, g.rolname grantor, SELECT 'lanacl' as deftype, COALESCE(gt.rolname, 'public') grantee, g.rolname grantor,
array_agg(privilege_type) as privileges, array_agg(is_grantable) as grantable array_agg(privilege_type) as privileges, array_agg(is_grantable) as grantable
FROM FROM
(SELECT (SELECT
d.grantee, d.grantor, d.is_grantable, d.grantee, d.grantor, d.is_grantable,
CASE d.privilege_type CASE d.privilege_type
WHEN 'USAGE' THEN 'U' WHEN 'USAGE' THEN 'U'
ELSE 'UNKNOWN' ELSE 'UNKNOWN'
END AS privilege_type END AS privilege_type
FROM FROM
(SELECT lanacl FROM pg_language lan (SELECT lanacl FROM pg_language lan
LEFT OUTER JOIN pg_shdescription descr ON (lan.oid=descr.objoid AND descr.classoid='pg_language'::regclass) LEFT OUTER JOIN pg_shdescription descr ON (lan.oid=descr.objoid AND descr.classoid='pg_language'::regclass)
WHERE lan.oid = {{ lid|qtLiteral }}::OID WHERE lan.oid = {{ lid|qtLiteral }}::OID
) acl, ) acl,
aclexplode(lanacl) d aclexplode(lanacl) d
) d ) d
LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid) LEFT JOIN pg_catalog.pg_roles g ON (d.grantor = g.oid)
LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid) LEFT JOIN pg_catalog.pg_roles gt ON (d.grantee = gt.oid)
GROUP BY g.rolname, gt.rolname GROUP BY g.rolname, gt.rolname

View File

@ -1,7 +1,7 @@
SELECT lan.oid as oid, lanname as name, lanpltrusted as trusted, lanacl as acl, hp.proname as lanproc, SELECT lan.oid as oid, lanname as name, lanpltrusted as trusted, lanacl as acl, hp.proname as lanproc,
vp.proname as lanval, description, pg_get_userbyid(lan.lanowner) as lanowner, ip.proname as laninl, vp.proname as lanval, description, pg_get_userbyid(lan.lanowner) as lanowner, ip.proname as laninl,
(SELECT array_agg(label) FROM pg_seclabels sl1 WHERE sl1.objoid=lan.oid) AS labels, (SELECT array_agg(label) FROM pg_seclabels sl1 WHERE sl1.objoid=lan.oid) AS labels,
(SELECT array_agg(provider) FROM pg_seclabels sl2 WHERE sl2.objoid=lan.oid) AS providers (SELECT array_agg(provider) FROM pg_seclabels sl2 WHERE sl2.objoid=lan.oid) AS providers
FROM pg_language lan JOIN pg_proc hp on hp.oid=lanplcallfoid LEFT OUTER JOIN pg_proc ip on ip.oid=laninline FROM pg_language lan JOIN pg_proc hp on hp.oid=lanplcallfoid LEFT OUTER JOIN pg_proc ip on ip.oid=laninline
LEFT OUTER JOIN pg_proc vp on vp.oid=lanvalidator LEFT OUTER JOIN pg_proc vp on vp.oid=lanvalidator
LEFT OUTER JOIN pg_description des ON (des.objoid=lan.oid AND des.objsubid=0 AND des.classoid='pg_language'::regclass) LEFT OUTER JOIN pg_description des ON (des.objoid=lan.oid AND des.objsubid=0 AND des.classoid='pg_language'::regclass)

View File

@ -1,19 +1,20 @@
-- Language: {{data.name}} -- Language: {{data.name}}
-- DROP LANGUAGE {{ conn|qtIdent(data.name) }} -- DROP LANGUAGE {{ conn|qtIdent(data.name) }}
{# ============= CREATE LANGUAGE Query ============= #} {# ============= CREATE LANGUAGE Query ============= #}
CREATE {% if data.trusted %}TRUSTED{% endif %} PROCEDURAL LANGUAGE {{ conn|qtIdent(data.name) }} CREATE {% if data.trusted %}TRUSTED{% endif %} PROCEDURAL LANGUAGE {{ conn|qtIdent(data.name) }}
{% if data.lanproc %} {% if data.lanproc %}
HANDLER {{ conn|qtIdent(data.lanproc) }} HANDLER {{ conn|qtIdent(data.lanproc) }}
{% endif %} {% endif %}
{% if data.laninl %} {% if data.laninl %}
INLINE {{ conn|qtIdent(data.laninl) }} INLINE {{ conn|qtIdent(data.laninl) }}
{% endif %} {% endif %}
{% if data.lanval %} {% if data.lanval %}
VALIDATOR {{ conn|qtIdent(data.lanval) }} VALIDATOR {{ conn|qtIdent(data.lanval) }}{% endif %};
{% endif %};
{# ============= ALTER LANGUAGE Query ============= #} {# ============= ALTER LANGUAGE Query ============= #}
{% if data.lanowner %} {% if data.lanowner %}
ALTER LANGUAGE {{ conn|qtIdent(data.name) }} ALTER LANGUAGE {{ conn|qtIdent(data.name) }}
OWNER TO {{ conn|qtIdent(data.lanowner) }}; OWNER TO {{ conn|qtIdent(data.lanowner) }};
{% endif %} {% endif %}

View File

@ -3,17 +3,17 @@
{# ============= Update language name ============= #} {# ============= Update language name ============= #}
{% if data.name != o_data.name %} {% if data.name != o_data.name %}
ALTER LANGUAGE {{ conn|qtIdent(o_data.name) }} ALTER LANGUAGE {{ conn|qtIdent(o_data.name) }}
RENAME TO {{ conn|qtIdent(data.name) }}; RENAME TO {{ conn|qtIdent(data.name) }};
{% endif %} {% endif %}
{# ============= Update language user ============= #} {# ============= Update language user ============= #}
{% if data.lanowner and data.lanowner != o_data.lanowner %} {% if data.lanowner and data.lanowner != o_data.lanowner %}
ALTER LANGUAGE {{ conn|qtIdent(data.name) }} ALTER LANGUAGE {{ conn|qtIdent(data.name) }}
OWNER TO {{ conn|qtIdent(data.lanowner) }}; OWNER TO {{ conn|qtIdent(data.lanowner) }};
{% endif %} {% endif %}
{# ============= Update language comments ============= #} {# ============= Update language comments ============= #}
{% if data.description and data.description != o_data.description %} {% if data.description and data.description != o_data.description %}
COMMENT ON LANGUAGE {{ conn|qtIdent(data.name) }} COMMENT ON LANGUAGE {{ conn|qtIdent(data.name) }}
IS '{{ data.description }}'; IS '{{ data.description }}';
{% endif %} {% endif %}
{% endif %} {% endif %}