From 8f3175248ab42f2089c3bed84d935fab6508581b Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Wed, 6 Mar 2013 23:56:40 +1300 Subject: [PATCH] A corrected change to fix the case of the language name everywhere. --- ChangeLog | 2 +- dba/better_perms.sql | 12 ++++++------ dba/caldav_functions.sql | 24 ++++++++++++------------ dba/patches/1.2.6.sql | 14 +++++++------- dba/patches/1.2.7.sql | 4 ++-- dba/rrule_functions-8.1.sql | 2 +- dba/rrule_functions.sql | 2 +- 7 files changed, 30 insertions(+), 30 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed37ad22..f38afc7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ 2013-03-06 Andrew McMillan - * Fix capitalisation of 'plpgsql' for Postgres 9.2. (debbug #702403) + * Fix capitalisation of 'plpgsql' & 'sql' for Postgres 9.2. (debbug #702403) 2013-02-16 Andrew McMillan * Content-Type header should be 'charset' not 'encoding'. diff --git a/dba/better_perms.sql b/dba/better_perms.sql index dc07e0ad..0fe1837d 100644 --- a/dba/better_perms.sql +++ b/dba/better_perms.sql @@ -45,7 +45,7 @@ BEGIN RETURN out_bits; END $$ -LANGUAGE 'PlPgSQL' IMMUTABLE STRICT; +LANGUAGE 'plpgsql' IMMUTABLE STRICT; -- This legacy conversion function will eventually be removed, once all logic -- has been converted to use bitmaps, or to use the bits_to_priv() output. @@ -98,7 +98,7 @@ BEGIN RETURN out_priv; END $$ -LANGUAGE 'PlPgSQL' IMMUTABLE STRICT; +LANGUAGE 'plpgsql' IMMUTABLE STRICT; CREATE or REPLACE FUNCTION get_permissions( INT, INT ) RETURNS TEXT AS $$ DECLARE @@ -156,7 +156,7 @@ $$ LANGUAGE 'plpgsql' IMMUTABLE STRICT; CREATE or REPLACE FUNCTION get_group_role_no() RETURNS INT AS $$ SELECT role_no FROM roles WHERE role_name = 'Group' -$$ LANGUAGE 'SQL' IMMUTABLE; +$$ LANGUAGE 'sql' IMMUTABLE; CREATE or REPLACE FUNCTION has_legacy_privilege( INT, TEXT, INT ) RETURNS BOOLEAN AS $$ DECLARE @@ -242,7 +242,7 @@ BEGIN ELSE 0 END)::BIT(24); END $$ -LANGUAGE 'PlPgSQL' IMMUTABLE STRICT; +LANGUAGE 'plpgsql' IMMUTABLE STRICT; -- Given an array of verbose DAV: or CalDAV: privilege names return the bitmask @@ -269,7 +269,7 @@ BEGIN RETURN out_bits; END $$ -LANGUAGE 'PlPgSQL' IMMUTABLE STRICT; +LANGUAGE 'plpgsql' IMMUTABLE STRICT; -- This legacy conversion function will eventually be removed, once all logic @@ -368,4 +368,4 @@ BEGIN RETURN out_priv; END $$ -LANGUAGE 'PlPgSQL' IMMUTABLE STRICT; +LANGUAGE 'plpgsql' IMMUTABLE STRICT; diff --git a/dba/caldav_functions.sql b/dba/caldav_functions.sql index 89b6c1de..0d361d9c 100644 --- a/dba/caldav_functions.sql +++ b/dba/caldav_functions.sql @@ -566,7 +566,7 @@ BEGIN RETURN out_bits; END $$ -LANGUAGE 'PlPgSQL' IMMUTABLE STRICT; +LANGUAGE 'plpgsql' IMMUTABLE STRICT; -- This legacy conversion function will eventually be removed, once all logic -- has been converted to use bitmaps, or to use the bits_to_priv() output. @@ -619,7 +619,7 @@ BEGIN RETURN out_priv; END $$ -LANGUAGE 'PlPgSQL' IMMUTABLE STRICT; +LANGUAGE 'plpgsql' IMMUTABLE STRICT; CREATE or REPLACE FUNCTION get_permissions( INT, INT ) RETURNS TEXT AS $$ DECLARE @@ -677,7 +677,7 @@ $$ LANGUAGE 'plpgsql' IMMUTABLE STRICT; CREATE or REPLACE FUNCTION get_group_role_no() RETURNS INT AS $$ SELECT role_no FROM roles WHERE role_name = 'Group' -$$ LANGUAGE 'SQL' IMMUTABLE; +$$ LANGUAGE 'sql' IMMUTABLE; CREATE or REPLACE FUNCTION has_legacy_privilege( INT, TEXT, INT ) RETURNS BOOLEAN AS $$ DECLARE @@ -763,7 +763,7 @@ BEGIN ELSE 0 END)::BIT(24); END $$ -LANGUAGE 'PlPgSQL' IMMUTABLE STRICT; +LANGUAGE 'plpgsql' IMMUTABLE STRICT; -- Given an array of verbose DAV: or CalDAV: privilege names return the bitmask @@ -790,7 +790,7 @@ BEGIN RETURN out_bits; END $$ -LANGUAGE 'PlPgSQL' IMMUTABLE STRICT; +LANGUAGE 'plpgsql' IMMUTABLE STRICT; -- NOTE: Round-trip through this and then back through privilege_to_bits @@ -885,7 +885,7 @@ BEGIN RETURN out_priv; END $$ -LANGUAGE 'PlPgSQL' IMMUTABLE STRICT; +LANGUAGE 'plpgsql' IMMUTABLE STRICT; -- Expanded group memberships out to some depth @@ -895,7 +895,7 @@ CREATE or REPLACE FUNCTION expand_memberships( INT8, INT ) RETURNS SETOF INT8 AS SELECT expanded.g_id FROM (SELECT CASE WHEN $2 > 0 THEN expand_memberships( group_id, $2 - 1) END AS g_id FROM group_member WHERE member_id = $1) AS expanded WHERE expanded.g_id IS NOT NULL; -$$ LANGUAGE 'SQL' STABLE STRICT; +$$ LANGUAGE 'sql' STABLE STRICT; -- Expanded group members out to some depth CREATE or REPLACE FUNCTION expand_members( INT8, INT ) RETURNS SETOF INT8 AS $$ @@ -904,7 +904,7 @@ CREATE or REPLACE FUNCTION expand_members( INT8, INT ) RETURNS SETOF INT8 AS $$ SELECT expanded.m_id FROM (SELECT CASE WHEN $2 > 0 THEN expand_members( member_id, $2 - 1) END AS m_id FROM group_member WHERE group_id = $1) AS expanded WHERE expanded.m_id IS NOT NULL; -$$ LANGUAGE 'SQL' STABLE STRICT; +$$ LANGUAGE 'sql' STABLE STRICT; @@ -1168,7 +1168,7 @@ CREATE or REPLACE FUNCTION p_has_proxy_access_to( INT8, INT ) RETURNS SETOF INT8 WHERE (default_privileges & 5::BIT(24)) != 0::BIT(24) AND principal_id != $1 ) subquery; -$$ LANGUAGE 'SQL' STABLE STRICT; +$$ LANGUAGE 'sql' STABLE STRICT; -- A list of the principals who can proxy to this principal @@ -1178,7 +1178,7 @@ CREATE or REPLACE FUNCTION grants_proxy_access_from_p( INT8, INT ) RETURNS SETOF WHERE by_collection IS NULL AND by_principal != $1 AND by_principal IN (SELECT expand_members(g2.to_principal,$2) FROM grants g2 WHERE g2.by_principal = $1) ; -$$ LANGUAGE 'SQL' STABLE STRICT; +$$ LANGUAGE 'sql' STABLE STRICT; @@ -1202,7 +1202,7 @@ BEGIN VALUES( in_collection_id, in_status, tmp_int, in_dav_name); RETURN TRUE; END -$$ LANGUAGE 'PlPgSQL' VOLATILE STRICT; +$$ LANGUAGE 'plpgsql' VOLATILE STRICT; CREATE or REPLACE FUNCTION new_sync_token( INT8, INT8 ) RETURNS INT8 AS $$ @@ -1247,7 +1247,7 @@ BEGIN -- Returning the new token RETURN new_token; END -$$ LANGUAGE 'PlPgSQL' STRICT; +$$ LANGUAGE 'plpgsql' STRICT; DROP TRIGGER alarm_changed ON calendar_alarm CASCADE; diff --git a/dba/patches/1.2.6.sql b/dba/patches/1.2.6.sql index f8001527..7fb6e532 100644 --- a/dba/patches/1.2.6.sql +++ b/dba/patches/1.2.6.sql @@ -50,7 +50,7 @@ BEGIN RETURN out_bits; END $$ -LANGUAGE 'PlPgSQL' IMMUTABLE STRICT; +LANGUAGE 'plpgsql' IMMUTABLE STRICT; -- This legacy conversion function will eventually be removed, once all logic -- has been converted to use bitmaps, or to use the bits_to_priv() output. @@ -103,7 +103,7 @@ BEGIN RETURN out_priv; END $$ -LANGUAGE 'PlPgSQL' IMMUTABLE STRICT; +LANGUAGE 'plpgsql' IMMUTABLE STRICT; CREATE or REPLACE FUNCTION get_permissions( INT, INT ) RETURNS TEXT AS $$ DECLARE @@ -161,7 +161,7 @@ $$ LANGUAGE 'plpgsql' IMMUTABLE STRICT; CREATE or REPLACE FUNCTION get_group_role_no() RETURNS INT AS $$ SELECT role_no FROM roles WHERE role_name = 'Group' -$$ LANGUAGE 'SQL' IMMUTABLE; +$$ LANGUAGE 'sql' IMMUTABLE; CREATE or REPLACE FUNCTION has_legacy_privilege( INT, TEXT, INT ) RETURNS BOOLEAN AS $$ DECLARE @@ -247,7 +247,7 @@ BEGIN ELSE 0 END)::BIT(24); END $$ -LANGUAGE 'PlPgSQL' IMMUTABLE STRICT; +LANGUAGE 'plpgsql' IMMUTABLE STRICT; -- Given an array of verbose DAV: or CalDAV: privilege names return the bitmask @@ -274,7 +274,7 @@ BEGIN RETURN out_bits; END $$ -LANGUAGE 'PlPgSQL' IMMUTABLE STRICT; +LANGUAGE 'plpgsql' IMMUTABLE STRICT; -- This legacy conversion function will eventually be removed, once all logic @@ -372,7 +372,7 @@ BEGIN RETURN out_priv; END $$ -LANGUAGE 'PlPgSQL' IMMUTABLE STRICT; +LANGUAGE 'plpgsql' IMMUTABLE STRICT; @@ -491,7 +491,7 @@ BEGIN RETURN out_bits; END $$ -LANGUAGE 'PlPgSQL' IMMUTABLE STRICT; +LANGUAGE 'plpgsql' IMMUTABLE STRICT; ALTER TABLE relationship_type ADD COLUMN bit_confers BIT(24) DEFAULT privilege_to_bits(ARRAY['DAV::read','DAV::write']); diff --git a/dba/patches/1.2.7.sql b/dba/patches/1.2.7.sql index 2dfbc98f..1b5147d2 100644 --- a/dba/patches/1.2.7.sql +++ b/dba/patches/1.2.7.sql @@ -54,7 +54,7 @@ BEGIN VALUES( in_collection_id, in_status, tmp_int, in_dav_name); RETURN TRUE; END -$$ LANGUAGE 'PlPgSQL' VOLATILE STRICT; +$$ LANGUAGE 'plpgsql' VOLATILE STRICT; CREATE or REPLACE FUNCTION new_sync_token( INT8, INT8 ) RETURNS INT8 AS $$ @@ -76,4 +76,4 @@ BEGIN INSERT INTO sync_tokens(collection_id, sync_token) VALUES( in_collection_id, tmp_int ); RETURN tmp_int; END -$$ LANGUAGE 'PlPgSQL' STRICT; +$$ LANGUAGE 'plpgsql' STRICT; diff --git a/dba/rrule_functions-8.1.sql b/dba/rrule_functions-8.1.sql index ea257b68..0175c8c6 100644 --- a/dba/rrule_functions-8.1.sql +++ b/dba/rrule_functions-8.1.sql @@ -706,4 +706,4 @@ $$ LANGUAGE 'plpgsql' IMMUTABLE; CREATE or REPLACE FUNCTION icalendar_interval_to_SQL( TEXT ) RETURNS interval AS $function$ SELECT CASE WHEN substring($1,1,1) = '-' THEN -1 ELSE 1 END * regexp_replace( regexp_replace($1, '[PT-]', '', 'g'), '([A-Z])', E'\\1 ', 'g')::interval; -$function$ LANGUAGE 'SQL' IMMUTABLE STRICT; +$function$ LANGUAGE 'sql' IMMUTABLE STRICT; diff --git a/dba/rrule_functions.sql b/dba/rrule_functions.sql index 8b872a38..1ea896d4 100644 --- a/dba/rrule_functions.sql +++ b/dba/rrule_functions.sql @@ -712,5 +712,5 @@ $$ LANGUAGE 'plpgsql' IMMUTABLE STRICT; CREATE or REPLACE FUNCTION icalendar_interval_to_SQL( TEXT ) RETURNS interval AS $function$ SELECT CASE WHEN substring($1,1,1) = '-' THEN -1 ELSE 1 END * regexp_replace( regexp_replace($1, '[PT-]', '', 'g'), '([A-Z])', E'\\1 ', 'g')::interval; -$function$ LANGUAGE 'SQL' IMMUTABLE STRICT; +$function$ LANGUAGE 'sql' IMMUTABLE STRICT; -- 2.11.4.GIT