Project

General

Profile

« Previous | Next » 

Revision 2696

schemas/functions.sql, vegbien.sql: Cast functions: Removed `RETURN new;` at end (artifact of when they were relational functions). Made the EXCEPTION block the main block of the function, to avoid unnecessary nesting.

View differences:

functions.sql
129 129
    LANGUAGE plpgsql IMMUTABLE STRICT
130 130
    AS $$
131 131
BEGIN
132
    BEGIN
133
        RETURN value::boolean;
134
    EXCEPTION
135
        WHEN data_exception THEN
136
            RAISE WARNING '%', SQLERRM;
137
            RETURN NULL;
138
    END;
139
    RETURN new;
132
    RETURN value::boolean;
133
EXCEPTION
134
    WHEN data_exception THEN
135
        RAISE WARNING '%', SQLERRM;
136
        RETURN NULL;
140 137
END;
141 138
$$;
142 139

  
......
149 146
    LANGUAGE plpgsql IMMUTABLE STRICT
150 147
    AS $$
151 148
BEGIN
152
    BEGIN
153
        RETURN value::double precision;
154
    EXCEPTION
155
        WHEN data_exception THEN
156
            RAISE WARNING '%', SQLERRM;
157
            RETURN NULL;
158
    END;
159
    RETURN new;
149
    RETURN value::double precision;
150
EXCEPTION
151
    WHEN data_exception THEN
152
        RAISE WARNING '%', SQLERRM;
153
        RETURN NULL;
160 154
END;
161 155
$$;
162 156

  
......
195 189
    LANGUAGE plpgsql IMMUTABLE STRICT
196 190
    AS $$
197 191
BEGIN
198
    BEGIN
199
        RETURN value::timestamp with time zone;
200
    EXCEPTION
201
        WHEN data_exception THEN
202
            RAISE WARNING '%', SQLERRM;
203
            RETURN NULL;
204
    END;
205
    RETURN new;
192
    RETURN value::timestamp with time zone;
193
EXCEPTION
194
    WHEN data_exception THEN
195
        RAISE WARNING '%', SQLERRM;
196
        RETURN NULL;
206 197
END;
207 198
$$;
208 199

  

Also available in: Unified diff