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:

vegbien.sql
201 201
    LANGUAGE plpgsql IMMUTABLE STRICT
202 202
    AS $$
203 203
BEGIN
204
    BEGIN
205
        RETURN value::growthform;
206
    EXCEPTION
207
        WHEN data_exception THEN
208
            RAISE WARNING '%', SQLERRM;
209
            RETURN NULL;
210
    END;
211
    RETURN new;
204
    RETURN value::growthform;
205
EXCEPTION
206
    WHEN data_exception THEN
207
        RAISE WARNING '%', SQLERRM;
208
        RETURN NULL;
212 209
END;
213 210
$$;
214 211

  
......
271 268
    LANGUAGE plpgsql IMMUTABLE STRICT
272 269
    AS $$
273 270
BEGIN
274
    BEGIN
275
        RETURN value::placerank;
276
    EXCEPTION
277
        WHEN data_exception THEN
278
            RAISE WARNING '%', SQLERRM;
279
            RETURN NULL;
280
    END;
281
    RETURN new;
271
    RETURN value::placerank;
272
EXCEPTION
273
    WHEN data_exception THEN
274
        RAISE WARNING '%', SQLERRM;
275
        RETURN NULL;
282 276
END;
283 277
$$;
284 278

  
......
341 335
    LANGUAGE plpgsql IMMUTABLE STRICT
342 336
    AS $$
343 337
BEGIN
344
    BEGIN
345
        RETURN value::taxonrank;
346
    EXCEPTION
347
        WHEN data_exception THEN
348
            RAISE WARNING '%', SQLERRM;
349
            RETURN NULL;
350
    END;
351
    RETURN new;
338
    RETURN value::taxonrank;
339
EXCEPTION
340
    WHEN data_exception THEN
341
        RAISE WARNING '%', SQLERRM;
342
        RETURN NULL;
352 343
END;
353 344
$$;
354 345

  

Also available in: Unified diff