Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 7f4f42f

Browse files
committed
Clean up CREATE FUNCTION syntax usage in contrib and elsewhere, in
particular get rid of single quotes around language names and old WITH () construct.
1 parent fe83b3e commit 7f4f42f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+967
-976
lines changed

contrib/btree_gist/btree_gist.sql.in

+121-121
Large diffs are not rendered by default.

contrib/cube/cube.sql.in

+33-33
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ SET search_path = public;
77
CREATE OR REPLACE FUNCTION cube_in(cstring)
88
RETURNS cube
99
AS 'MODULE_PATHNAME'
10-
LANGUAGE 'C' IMMUTABLE STRICT;
10+
LANGUAGE C IMMUTABLE STRICT;
1111

1212
CREATE OR REPLACE FUNCTION cube_out(cube)
1313
RETURNS cstring
1414
AS 'MODULE_PATHNAME'
15-
LANGUAGE 'C' IMMUTABLE STRICT;
15+
LANGUAGE C IMMUTABLE STRICT;
1616

1717
CREATE TYPE cube (
1818
INTERNALLENGTH = variable,
@@ -27,7 +27,7 @@ COMMENT ON TYPE cube IS 'multi-dimensional cube ''(FLOAT-1, FLOAT-2, ..., FLOAT-
2727

2828
CREATE OR REPLACE FUNCTION cube(text) RETURNS cube
2929
AS 'MODULE_PATHNAME'
30-
LANGUAGE 'C' IMMUTABLE STRICT;
30+
LANGUAGE C IMMUTABLE STRICT;
3131

3232
COMMENT ON FUNCTION cube(text) IS 'convert text to cube';
3333

@@ -42,70 +42,70 @@ CREATE CAST (text AS cube) WITH FUNCTION cube(text) AS ASSIGNMENT;
4242
CREATE OR REPLACE FUNCTION cube_eq(cube, cube)
4343
RETURNS bool
4444
AS 'MODULE_PATHNAME'
45-
LANGUAGE 'C' IMMUTABLE STRICT;
45+
LANGUAGE C IMMUTABLE STRICT;
4646

4747
COMMENT ON FUNCTION cube_eq(cube, cube) IS 'same as';
4848

4949
CREATE OR REPLACE FUNCTION cube_ne(cube, cube)
5050
RETURNS bool
5151
AS 'MODULE_PATHNAME'
52-
LANGUAGE 'C' IMMUTABLE STRICT;
52+
LANGUAGE C IMMUTABLE STRICT;
5353

5454
COMMENT ON FUNCTION cube_ne(cube, cube) IS 'different';
5555

5656
CREATE OR REPLACE FUNCTION cube_lt(cube, cube)
5757
RETURNS bool
5858
AS 'MODULE_PATHNAME'
59-
LANGUAGE 'C' IMMUTABLE STRICT;
59+
LANGUAGE C IMMUTABLE STRICT;
6060

6161
COMMENT ON FUNCTION cube_lt(cube, cube) IS 'lower than';
6262

6363
CREATE OR REPLACE FUNCTION cube_gt(cube, cube)
6464
RETURNS bool
6565
AS 'MODULE_PATHNAME'
66-
LANGUAGE 'C' IMMUTABLE STRICT;
66+
LANGUAGE C IMMUTABLE STRICT;
6767

6868
COMMENT ON FUNCTION cube_gt(cube, cube) IS 'greater than';
6969

7070
CREATE OR REPLACE FUNCTION cube_le(cube, cube)
7171
RETURNS bool
7272
AS 'MODULE_PATHNAME'
73-
LANGUAGE 'C' IMMUTABLE STRICT;
73+
LANGUAGE C IMMUTABLE STRICT;
7474

7575
COMMENT ON FUNCTION cube_le(cube, cube) IS 'lower than or equal to';
7676

7777
CREATE OR REPLACE FUNCTION cube_ge(cube, cube)
7878
RETURNS bool
7979
AS 'MODULE_PATHNAME'
80-
LANGUAGE 'C' IMMUTABLE STRICT;
80+
LANGUAGE C IMMUTABLE STRICT;
8181

8282
COMMENT ON FUNCTION cube_ge(cube, cube) IS 'greater than or equal to';
8383

8484
CREATE OR REPLACE FUNCTION cube_cmp(cube, cube)
8585
RETURNS int4
8686
AS 'MODULE_PATHNAME'
87-
LANGUAGE 'C' IMMUTABLE STRICT;
87+
LANGUAGE C IMMUTABLE STRICT;
8888

8989
COMMENT ON FUNCTION cube_cmp(cube, cube) IS 'btree comparison function';
9090

9191
CREATE OR REPLACE FUNCTION cube_contains(cube, cube)
9292
RETURNS bool
9393
AS 'MODULE_PATHNAME'
94-
LANGUAGE 'C' IMMUTABLE STRICT;
94+
LANGUAGE C IMMUTABLE STRICT;
9595

9696
COMMENT ON FUNCTION cube_contains(cube, cube) IS 'contains';
9797

9898
CREATE OR REPLACE FUNCTION cube_contained(cube, cube)
9999
RETURNS bool
100100
AS 'MODULE_PATHNAME'
101-
LANGUAGE 'C' IMMUTABLE STRICT;
101+
LANGUAGE C IMMUTABLE STRICT;
102102

103103
COMMENT ON FUNCTION cube_contained(cube, cube) IS 'contained in';
104104

105105
CREATE OR REPLACE FUNCTION cube_overlap(cube, cube)
106106
RETURNS bool
107107
AS 'MODULE_PATHNAME'
108-
LANGUAGE 'C' IMMUTABLE STRICT;
108+
LANGUAGE C IMMUTABLE STRICT;
109109

110110
COMMENT ON FUNCTION cube_overlap(cube, cube) IS 'overlaps';
111111

@@ -114,17 +114,17 @@ COMMENT ON FUNCTION cube_overlap(cube, cube) IS 'overlaps';
114114
CREATE OR REPLACE FUNCTION cube_union(cube, cube)
115115
RETURNS cube
116116
AS 'MODULE_PATHNAME'
117-
LANGUAGE 'C' IMMUTABLE STRICT;
117+
LANGUAGE C IMMUTABLE STRICT;
118118

119119
CREATE OR REPLACE FUNCTION cube_inter(cube, cube)
120120
RETURNS cube
121121
AS 'MODULE_PATHNAME'
122-
LANGUAGE 'C' IMMUTABLE STRICT;
122+
LANGUAGE C IMMUTABLE STRICT;
123123

124124
CREATE OR REPLACE FUNCTION cube_size(cube)
125125
RETURNS float8
126126
AS 'MODULE_PATHNAME'
127-
LANGUAGE 'C' IMMUTABLE STRICT;
127+
LANGUAGE C IMMUTABLE STRICT;
128128

129129

130130
-- Misc N-dimensional functions
@@ -134,54 +134,54 @@ LANGUAGE 'C' IMMUTABLE STRICT;
134134
CREATE OR REPLACE FUNCTION cube_distance(cube, cube)
135135
RETURNS float8
136136
AS 'MODULE_PATHNAME'
137-
LANGUAGE 'C' IMMUTABLE STRICT;
137+
LANGUAGE C IMMUTABLE STRICT;
138138

139139
-- Extracting elements functions
140140

141141
CREATE OR REPLACE FUNCTION cube_dim(cube)
142142
RETURNS int4
143143
AS 'MODULE_PATHNAME'
144-
LANGUAGE 'C' IMMUTABLE STRICT;
144+
LANGUAGE C IMMUTABLE STRICT;
145145

146146
CREATE OR REPLACE FUNCTION cube_ll_coord(cube, int4)
147147
RETURNS float8
148148
AS 'MODULE_PATHNAME'
149-
LANGUAGE 'C' IMMUTABLE STRICT;
149+
LANGUAGE C IMMUTABLE STRICT;
150150

151151
CREATE OR REPLACE FUNCTION cube_ur_coord(cube, int4)
152152
RETURNS float8
153153
AS 'MODULE_PATHNAME'
154-
LANGUAGE 'C' IMMUTABLE STRICT;
154+
LANGUAGE C IMMUTABLE STRICT;
155155

156156
CREATE OR REPLACE FUNCTION cube(float8) RETURNS cube
157157
AS 'MODULE_PATHNAME', 'cube_f8'
158-
LANGUAGE 'C' IMMUTABLE STRICT;
158+
LANGUAGE C IMMUTABLE STRICT;
159159

160160
CREATE OR REPLACE FUNCTION cube(float8, float8) RETURNS cube
161161
AS 'MODULE_PATHNAME', 'cube_f8_f8'
162-
LANGUAGE 'C' IMMUTABLE STRICT;
162+
LANGUAGE C IMMUTABLE STRICT;
163163

164164
CREATE OR REPLACE FUNCTION cube(cube, float8) RETURNS cube
165165
AS 'MODULE_PATHNAME', 'cube_c_f8'
166-
LANGUAGE 'C' IMMUTABLE STRICT;
166+
LANGUAGE C IMMUTABLE STRICT;
167167

168168
CREATE OR REPLACE FUNCTION cube(cube, float8, float8) RETURNS cube
169169
AS 'MODULE_PATHNAME', 'cube_c_f8_f8'
170-
LANGUAGE 'C' IMMUTABLE STRICT;
170+
LANGUAGE C IMMUTABLE STRICT;
171171

172172
-- Test if cube is also a point
173173

174174
CREATE OR REPLACE FUNCTION cube_is_point(cube)
175175
RETURNS bool
176176
AS 'MODULE_PATHNAME'
177-
LANGUAGE 'C' IMMUTABLE STRICT;
177+
LANGUAGE C IMMUTABLE STRICT;
178178

179179
-- Increasing the size of a cube by a radius in at least n dimensions
180180

181181
CREATE OR REPLACE FUNCTION cube_enlarge(cube, float8, int4)
182182
RETURNS cube
183183
AS 'MODULE_PATHNAME'
184-
LANGUAGE 'C' IMMUTABLE STRICT;
184+
LANGUAGE C IMMUTABLE STRICT;
185185

186186
--
187187
-- OPERATORS
@@ -247,37 +247,37 @@ CREATE OPERATOR ~ (
247247
CREATE OR REPLACE FUNCTION g_cube_consistent(internal,cube,int4)
248248
RETURNS bool
249249
AS 'MODULE_PATHNAME'
250-
LANGUAGE 'C';
250+
LANGUAGE C;
251251

252252
CREATE OR REPLACE FUNCTION g_cube_compress(internal)
253253
RETURNS internal
254254
AS 'MODULE_PATHNAME'
255-
LANGUAGE 'C';
255+
LANGUAGE C;
256256

257257
CREATE OR REPLACE FUNCTION g_cube_decompress(internal)
258258
RETURNS internal
259259
AS 'MODULE_PATHNAME'
260-
LANGUAGE 'C';
260+
LANGUAGE C;
261261

262262
CREATE OR REPLACE FUNCTION g_cube_penalty(internal,internal,internal)
263263
RETURNS internal
264264
AS 'MODULE_PATHNAME'
265-
LANGUAGE 'C' STRICT;
265+
LANGUAGE C STRICT;
266266

267267
CREATE OR REPLACE FUNCTION g_cube_picksplit(internal, internal)
268268
RETURNS internal
269269
AS 'MODULE_PATHNAME'
270-
LANGUAGE 'C';
270+
LANGUAGE C;
271271

272272
CREATE OR REPLACE FUNCTION g_cube_union(internal, internal)
273273
RETURNS cube
274274
AS 'MODULE_PATHNAME'
275-
LANGUAGE 'C';
275+
LANGUAGE C;
276276

277277
CREATE OR REPLACE FUNCTION g_cube_same(cube, cube, internal)
278278
RETURNS internal
279279
AS 'MODULE_PATHNAME'
280-
LANGUAGE 'C';
280+
LANGUAGE C;
281281

282282

283283
-- Create the operator classes for indexing

0 commit comments

Comments
 (0)