Skip to content

Commit 1a84dec

Browse files
akorotkovakorotkov
committed
Compatibility with PostgreSQL 11
WITH syntax in CREATE FUNCTION is not supported anymore.
1 parent ac45271 commit 1a84dec

File tree

8 files changed

+63
-63
lines changed

8 files changed

+63
-63
lines changed

‎pgs_circle.sql.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ CREATE FUNCTION strans_circle(scircle, strans)
401401
RETURNS scircle
402402
AS 'MODULE_PATHNAME' , 'spheretrans_circle'
403403
LANGUAGE 'c'
404-
WITH (isstrict, iscachable);
404+
IMMUTABLE STRICT;
405405

406406
COMMENT ON FUNCTION strans_circle (scircle, strans) IS
407407
'returns a transformated spherical circle';
@@ -420,7 +420,7 @@ CREATE FUNCTION strans_circle_inverse(scircle, strans)
420420
RETURNS scircle
421421
AS 'MODULE_PATHNAME' , 'spheretrans_circle_inverse'
422422
LANGUAGE 'c'
423-
WITH (isstrict, iscachable);
423+
IMMUTABLE STRICT;
424424

425425
COMMENT ON FUNCTION strans_circle_inverse (scircle, strans) IS
426426
'returns a inverse transformated spherical circle';

‎pgs_ellipse.sql.in

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ CREATE FUNCTION sellipse(spoint, float8, float8, float8)
99
RETURNS sellipse
1010
AS 'MODULE_PATHNAME', 'sphereellipse_infunc'
1111
LANGUAGE 'c'
12-
WITH (isstrict, iscachable);
12+
IMMUTABLE STRICT;
1313

1414
COMMENT ON FUNCTION sellipse(spoint, float8, float8, float8) IS
1515
'returns spherical ellipse from center, radius1, radius2 and inclination';
@@ -18,7 +18,7 @@ CREATE FUNCTION inc(sellipse)
1818
RETURNS float8
1919
AS 'MODULE_PATHNAME', 'sphereellipse_incl'
2020
LANGUAGE 'c'
21-
WITH (isstrict, iscachable);
21+
IMMUTABLE STRICT;
2222

2323
COMMENT ON FUNCTION inc(sellipse) IS
2424
'inclination of spherical ellipse';
@@ -27,7 +27,7 @@ CREATE FUNCTION lrad(sellipse)
2727
RETURNS float8
2828
AS 'MODULE_PATHNAME', 'sphereellipse_rad1'
2929
LANGUAGE 'c'
30-
WITH (isstrict, iscachable);
30+
IMMUTABLE STRICT;
3131

3232
COMMENT ON FUNCTION lrad(sellipse) IS
3333
'large radius of spherical ellipse';
@@ -36,7 +36,7 @@ CREATE FUNCTION srad(sellipse)
3636
RETURNS float8
3737
AS 'MODULE_PATHNAME', 'sphereellipse_rad2'
3838
LANGUAGE 'c'
39-
WITH (isstrict, iscachable);
39+
IMMUTABLE STRICT;
4040

4141
COMMENT ON FUNCTION srad(sellipse) IS
4242
'small radius of spherical ellipse';
@@ -51,7 +51,7 @@ CREATE FUNCTION sellipse(spoint)
5151
RETURNS sellipse
5252
AS 'MODULE_PATHNAME', 'spherepoint_ellipse'
5353
LANGUAGE 'c'
54-
WITH (isstrict, iscachable);
54+
IMMUTABLE STRICT;
5555

5656
COMMENT ON FUNCTION sellipse(spoint) IS
5757
'returns spherical point as spherical ellipse';
@@ -69,7 +69,7 @@ CREATE FUNCTION scircle(sellipse)
6969
RETURNS scircle
7070
AS 'MODULE_PATHNAME', 'sphereellipse_circle'
7171
LANGUAGE 'c'
72-
WITH (isstrict, iscachable);
72+
IMMUTABLE STRICT;
7373

7474
COMMENT ON FUNCTION scircle(sellipse) IS
7575
'spherical bounding circle of spherical ellipse';
@@ -86,7 +86,7 @@ CREATE FUNCTION sellipse(scircle)
8686
RETURNS sellipse
8787
AS 'MODULE_PATHNAME', 'spherecircle_ellipse'
8888
LANGUAGE 'c'
89-
WITH (isstrict, iscachable);
89+
IMMUTABLE STRICT;
9090

9191
COMMENT ON FUNCTION sellipse(scircle) IS
9292
'returns spherical circle as spherical ellipse';
@@ -103,7 +103,7 @@ CREATE FUNCTION strans(sellipse)
103103
RETURNS strans
104104
AS 'MODULE_PATHNAME', 'sphereellipse_trans'
105105
LANGUAGE 'c'
106-
WITH (isstrict, iscachable);
106+
IMMUTABLE STRICT;
107107

108108
COMMENT ON FUNCTION strans(sellipse) IS
109109
'returns Euler transformation of spherical ellipse';
@@ -127,7 +127,7 @@ CREATE FUNCTION center(sellipse)
127127
RETURNS spoint
128128
AS 'MODULE_PATHNAME', 'sphereellipse_center'
129129
LANGUAGE 'c'
130-
WITH (isstrict, iscachable);
130+
IMMUTABLE STRICT;
131131

132132
COMMENT ON FUNCTION center(sellipse) IS
133133
'center of spherical ellipse';
@@ -370,7 +370,7 @@ CREATE FUNCTION strans_ellipse(sellipse, strans)
370370
RETURNS sellipse
371371
AS 'MODULE_PATHNAME', 'spheretrans_ellipse'
372372
LANGUAGE 'c'
373-
WITH (isstrict, iscachable);
373+
IMMUTABLE STRICT;
374374

375375
COMMENT ON FUNCTION strans_ellipse (sellipse, strans) IS
376376
'returns a transformated spherical ellipse';
@@ -388,7 +388,7 @@ CREATE FUNCTION strans_ellipse_inverse (sellipse, strans)
388388
RETURNS sellipse
389389
AS 'MODULE_PATHNAME', 'spheretrans_ellipse_inv'
390390
LANGUAGE 'c'
391-
WITH (isstrict, iscachable);
391+
IMMUTABLE STRICT;
392392

393393
COMMENT ON FUNCTION strans_ellipse_inverse (sellipse, strans) IS
394394
'returns a inverse transformated spherical ellipse';

‎pgs_euler.sql.in

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ CREATE FUNCTION strans_zxz(strans)
66
RETURNS strans
77
AS 'MODULE_PATHNAME', 'spheretrans_zxz'
88
LANGUAGE 'c'
9-
WITH (isstrict, iscachable);
9+
IMMUTABLE STRICT;
1010

1111
COMMENT ON FUNCTION strans_zxz(strans) IS
1212
'returns Euler transformation as ZXZ transformation';
@@ -15,7 +15,7 @@ CREATE FUNCTION strans(FLOAT8, FLOAT8, FLOAT8)
1515
RETURNS strans
1616
AS 'MODULE_PATHNAME', 'spheretrans_from_float8'
1717
LANGUAGE 'c'
18-
WITH (isstrict, iscachable);
18+
IMMUTABLE STRICT;
1919

2020
COMMENT ON FUNCTION strans(FLOAT8, FLOAT8, FLOAT8) IS
2121
'returns an transformation object using Euler angles (ZXZ)';
@@ -24,7 +24,7 @@ CREATE FUNCTION strans(FLOAT8, FLOAT8, FLOAT8, CSTRING)
2424
RETURNS strans
2525
AS 'MODULE_PATHNAME', 'spheretrans_from_float8_and_type'
2626
LANGUAGE 'c'
27-
WITH (isstrict, iscachable);
27+
IMMUTABLE STRICT;
2828

2929
COMMENT ON FUNCTION strans(FLOAT8, FLOAT8, FLOAT8, CSTRING) IS
3030
'returns an transformation object using Euler angles and axis';
@@ -33,7 +33,7 @@ CREATE FUNCTION phi(strans)
3333
RETURNS FLOAT8
3434
AS 'MODULE_PATHNAME', 'spheretrans_phi'
3535
LANGUAGE 'c'
36-
WITH (isstrict, iscachable);
36+
IMMUTABLE STRICT;
3737

3838
COMMENT ON FUNCTION phi(strans) IS
3939
'returns the first angle of Euler angles of a transformation object';
@@ -42,7 +42,7 @@ CREATE FUNCTION theta(strans)
4242
RETURNS FLOAT8
4343
AS 'MODULE_PATHNAME', 'spheretrans_theta'
4444
LANGUAGE 'c'
45-
WITH (isstrict, iscachable);
45+
IMMUTABLE STRICT;
4646

4747
COMMENT ON FUNCTION theta(strans) IS
4848
'returns the second angle of Euler angles of a transformation object';
@@ -51,7 +51,7 @@ CREATE FUNCTION psi(strans)
5151
RETURNS FLOAT8
5252
AS 'MODULE_PATHNAME', 'spheretrans_psi'
5353
LANGUAGE 'c'
54-
WITH (isstrict, iscachable);
54+
IMMUTABLE STRICT;
5555

5656
COMMENT ON FUNCTION psi(strans) IS
5757
'returns the third angle of Euler angles of a transformation object';
@@ -60,7 +60,7 @@ CREATE FUNCTION axes(strans)
6060
RETURNS CHARACTER(3)
6161
AS 'MODULE_PATHNAME', 'spheretrans_type'
6262
LANGUAGE 'c'
63-
WITH (isstrict, iscachable);
63+
IMMUTABLE STRICT;
6464

6565
COMMENT ON FUNCTION axes (strans) IS
6666
'returns the axis of Euler angles of a transformation object';
@@ -72,7 +72,7 @@ CREATE FUNCTION strans_equal(strans, strans)
7272
RETURNS BOOL
7373
AS 'MODULE_PATHNAME', 'spheretrans_equal'
7474
LANGUAGE 'c'
75-
WITH (isstrict, iscachable);
75+
IMMUTABLE STRICT;
7676

7777
COMMENT ON FUNCTION strans_equal(strans, strans) IS
7878
'returns true, if Euler transformations are equal';
@@ -96,7 +96,7 @@ CREATE FUNCTION strans_not_equal(strans, strans)
9696
RETURNS BOOL
9797
AS 'MODULE_PATHNAME', 'spheretrans_not_equal'
9898
LANGUAGE 'c'
99-
WITH (isstrict, iscachable);
99+
IMMUTABLE STRICT;
100100

101101
COMMENT ON FUNCTION strans_not_equal(strans, strans) IS
102102
'returns true, if Euler transformations are not equal';
@@ -119,7 +119,7 @@ CREATE FUNCTION strans(strans)
119119
RETURNS strans
120120
AS 'MODULE_PATHNAME', 'spheretrans'
121121
LANGUAGE 'c'
122-
WITH (isstrict, iscachable);
122+
IMMUTABLE STRICT;
123123

124124
COMMENT ON FUNCTION strans(strans) IS
125125
'returns Euler transformation';
@@ -136,7 +136,7 @@ CREATE FUNCTION strans_invert(strans)
136136
RETURNS strans
137137
AS 'MODULE_PATHNAME', 'spheretrans_invert'
138138
LANGUAGE 'c'
139-
WITH (isstrict, iscachable);
139+
IMMUTABLE STRICT;
140140

141141
COMMENT ON FUNCTION strans_invert(strans) IS
142142
'returns inverse Euler transformation';
@@ -153,7 +153,7 @@ CREATE FUNCTION strans_point(spoint, strans)
153153
RETURNS spoint
154154
AS 'MODULE_PATHNAME', 'spheretrans_point'
155155
LANGUAGE 'c'
156-
WITH (isstrict, iscachable);
156+
IMMUTABLE STRICT;
157157

158158
COMMENT ON FUNCTION strans_point (spoint, strans) IS
159159
'returns a transformated spherical point';
@@ -171,7 +171,7 @@ CREATE FUNCTION strans_point_inverse(spoint, strans)
171171
RETURNS spoint
172172
AS 'MODULE_PATHNAME', 'spheretrans_point_inverse'
173173
LANGUAGE 'c'
174-
WITH (isstrict, iscachable);
174+
IMMUTABLE STRICT;
175175

176176
COMMENT ON FUNCTION strans_point_inverse (spoint, strans) IS
177177
'returns a inverse transformated spherical point';
@@ -189,7 +189,7 @@ CREATE FUNCTION strans_trans(strans, strans)
189189
RETURNS strans
190190
AS 'MODULE_PATHNAME', 'spheretrans_trans'
191191
LANGUAGE 'c'
192-
WITH (isstrict, iscachable);
192+
IMMUTABLE STRICT;
193193

194194
COMMENT ON FUNCTION strans_trans (strans, strans) IS
195195
'returns a transformated Euler transformation';
@@ -207,7 +207,7 @@ CREATE FUNCTION strans_trans_inv(strans, strans)
207207
RETURNS strans
208208
AS 'MODULE_PATHNAME', 'spheretrans_trans_inv'
209209
LANGUAGE 'c'
210-
WITH (isstrict, iscachable);
210+
IMMUTABLE STRICT;
211211

212212
COMMENT ON FUNCTION strans_trans_inv (strans, strans) IS
213213
'returns a inverse transformated Euler transformation';

‎pgs_gist.sql.in

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ CREATE FUNCTION spherekey_in(CSTRING)
55
RETURNS spherekey
66
AS 'MODULE_PATHNAME'
77
LANGUAGE 'c'
8-
WITH (isstrict, iscachable);
8+
IMMUTABLE STRICT;
99

1010

1111
CREATE FUNCTION spherekey_out(spherekey)
1212
RETURNS CSTRING
1313
AS 'MODULE_PATHNAME'
1414
LANGUAGE 'c'
15-
WITH (isstrict, iscachable);
15+
IMMUTABLE STRICT;
1616

1717

1818
CREATE TYPE spherekey (
@@ -26,32 +26,32 @@ CREATE FUNCTION pointkey_in(CSTRING)
2626
RETURNS pointkey
2727
AS 'MODULE_PATHNAME', 'pointkey_in'
2828
LANGUAGE 'c'
29-
WITH (isstrict, iscachable);
29+
IMMUTABLE STRICT;
3030

3131

3232
CREATE FUNCTION pointkey_out(pointkey)
3333
RETURNS CSTRING
3434
AS 'MODULE_PATHNAME', 'pointkey_out'
3535
LANGUAGE 'c'
36-
WITH (isstrict, iscachable);
36+
IMMUTABLE STRICT;
3737

3838
CREATE FUNCTION pointkey_volume(pointkey)
3939
RETURNS float8
4040
AS 'MODULE_PATHNAME', 'pointkey_volume'
4141
LANGUAGE 'c'
42-
WITH (isstrict, iscachable);
42+
IMMUTABLE STRICT;
4343

4444
CREATE FUNCTION pointkey_area(pointkey)
4545
RETURNS float8
4646
AS 'MODULE_PATHNAME', 'pointkey_area'
4747
LANGUAGE 'c'
48-
WITH (isstrict, iscachable);
48+
IMMUTABLE STRICT;
4949

5050
CREATE FUNCTION pointkey_perimeter(pointkey)
5151
RETURNS float8
5252
AS 'MODULE_PATHNAME', 'pointkey_perimeter'
5353
LANGUAGE 'c'
54-
WITH (isstrict, iscachable);
54+
IMMUTABLE STRICT;
5555

5656
CREATE TYPE pointkey (
5757
input = pointkey_in,
@@ -76,7 +76,7 @@ CREATE FUNCTION g_spherekey_union(bytea, internal)
7676
CREATE FUNCTION g_spherekey_penalty (internal, internal, internal)
7777
RETURNS internal
7878
AS 'MODULE_PATHNAME', 'g_spherekey_penalty'
79-
LANGUAGE 'c' with (isstrict);
79+
LANGUAGE 'c';
8080

8181
CREATE FUNCTION g_spherekey_picksplit(internal, internal)
8282
RETURNS internal

‎pgs_line.sql.in

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ CREATE FUNCTION strans(sline)
5959
RETURNS strans
6060
AS 'MODULE_PATHNAME', 'spheretrans_from_line'
6161
LANGUAGE 'c'
62-
WITH (isstrict, iscachable);
62+
IMMUTABLE STRICT;
6363

6464
COMMENT ON FUNCTION strans(sline) IS
6565
'converts line to a transformation (ZXZ)';
@@ -77,7 +77,7 @@ CREATE FUNCTION sline(spoint)
7777
RETURNS sline
7878
AS 'MODULE_PATHNAME', 'sphereline_from_point'
7979
LANGUAGE 'c'
80-
WITH (isstrict, iscachable);
80+
IMMUTABLE STRICT;
8181

8282
COMMENT ON FUNCTION sline(spoint) IS
8383
'casts a spherical point to a spherical line';
@@ -181,7 +181,7 @@ CREATE FUNCTION swap(sline)
181181
RETURNS sline
182182
AS 'MODULE_PATHNAME', 'sphereline_swap_beg_end'
183183
LANGUAGE 'c'
184-
WITH (isstrict, iscachable);
184+
IMMUTABLE STRICT;
185185

186186
COMMENT ON FUNCTION swap(sline) IS
187187
'returns a spherical line with swapped begin and end';
@@ -202,7 +202,7 @@ CREATE FUNCTION turn(sline)
202202
RETURNS sline
203203
AS 'MODULE_PATHNAME', 'sphereline_turn'
204204
LANGUAGE 'c'
205-
WITH (isstrict, iscachable);
205+
IMMUTABLE STRICT;
206206

207207
COMMENT ON FUNCTION turn(sline) IS
208208
'returns a turned spherical line but keeps begin and end';
@@ -393,7 +393,7 @@ CREATE FUNCTION strans_line(sline, strans)
393393
RETURNS sline
394394
AS 'MODULE_PATHNAME', 'spheretrans_line'
395395
LANGUAGE 'c'
396-
WITH (isstrict, iscachable);
396+
IMMUTABLE STRICT;
397397

398398
COMMENT ON FUNCTION strans_line (sline, strans) IS
399399
'returns a transformated spherical line';
@@ -412,7 +412,7 @@ CREATE FUNCTION strans_line_inverse(sline, strans)
412412
RETURNS sline
413413
AS 'MODULE_PATHNAME', 'spheretrans_line_inverse'
414414
LANGUAGE 'c'
415-
WITH (isstrict, iscachable);
415+
IMMUTABLE STRICT;
416416

417417
COMMENT ON FUNCTION strans_line_inverse (sline, strans) IS
418418
'returns a inverse transformated spherical line';

‎pgs_path.sql.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ CREATE FUNCTION swap(spath)
130130
RETURNS spath
131131
AS 'MODULE_PATHNAME', 'spherepath_swap'
132132
LANGUAGE 'c'
133-
WITH (isstrict, iscachable);
133+
IMMUTABLE STRICT;
134134

135135
COMMENT ON FUNCTION swap(spath) IS
136136
'returns a swapped spherical path (changed direction)';
@@ -264,7 +264,7 @@ CREATE FUNCTION strans_path(spath, strans)
264264
RETURNS spath
265265
AS 'MODULE_PATHNAME', 'spheretrans_path'
266266
LANGUAGE 'c'
267-
WITH (isstrict, iscachable);
267+
IMMUTABLE STRICT;
268268

269269
COMMENT ON FUNCTION strans_path (spath, strans) IS
270270
'returns a transformated spherical path';
@@ -282,7 +282,7 @@ CREATE FUNCTION strans_path_inverse(spath, strans)
282282
RETURNS spath
283283
AS 'MODULE_PATHNAME', 'spheretrans_path_inverse'
284284
LANGUAGE 'c'
285-
WITH (isstrict, iscachable);
285+
IMMUTABLE STRICT;
286286

287287
COMMENT ON FUNCTION strans_path_inverse (spath, strans) IS
288288
'returns a inverse transformated spherical path';

0 commit comments

Comments
 (0)