Skip to content

Commit 709f0dc

Browse files
andyyang890andyyang890
committed
sql: use pretty-printing in SHOW CREATE FUNCTION/PROCEDURE
The populate functions for the virtual tables `crdb_internal.create_{function,procedure}_statements`, which back SHOW CREATE FUNCTION/PROCEDURE, have been updated to use the pretty-printer to generate their `create_statement` columns. Release note (sql change): The `create_statement` column in SHOW CREATE FUNCTION/PROCEDURE is now pretty-printed.
1 parent 83a24ab commit 709f0dc

14 files changed

Lines changed: 766 additions & 539 deletions

File tree

‎pkg/backup/testdata/backup-restore/plpgsql_procedures‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,14 @@ CREATE PROCEDURE sc1.p1(a sc1.enum1)
9696
LANGUAGE plpgsql
9797
SECURITY INVOKER
9898
AS $$
99-
DECLARE
100-
foobar sc1.enum1;
101-
BEGIN
102-
SELECT a FROM sc1.tbl1;
103-
SELECT 'Good':::sc1.enum1;
104-
SELECT nextval('sc1.sq1'::REGCLASS);
105-
END;
106-
$$
99+
DECLARE
100+
foobar sc1.enum1;
101+
BEGIN
102+
SELECT a FROM sc1.tbl1;
103+
SELECT 'Good':::sc1.enum1;
104+
SELECT nextval('sc1.sq1'::REGCLASS);
105+
END;
106+
$$
107107

108108
exec-sql
109109
CALL sc1.p1('Good'::sc1.enum1)
@@ -137,14 +137,14 @@ CREATE PROCEDURE sc1.p1(a sc1.enum1)
137137
LANGUAGE plpgsql
138138
SECURITY INVOKER
139139
AS $$
140-
DECLARE
141-
foobar sc1.enum1;
142-
BEGIN
143-
SELECT a FROM sc1.tbl1;
144-
SELECT 'Good':::sc1.enum1;
145-
SELECT nextval('sc1.sq1'::REGCLASS);
146-
END;
147-
$$
140+
DECLARE
141+
foobar sc1.enum1;
142+
BEGIN
143+
SELECT a FROM sc1.tbl1;
144+
SELECT 'Good':::sc1.enum1;
145+
SELECT nextval('sc1.sq1'::REGCLASS);
146+
END;
147+
$$
148148

149149
# Make sure procedure signature is rewritten in schema descriptor so that
150150
# procedure can be resolved and executed.
@@ -302,14 +302,14 @@ CREATE PROCEDURE sc1.p1(a sc1.enum1)
302302
LANGUAGE plpgsql
303303
SECURITY INVOKER
304304
AS $$
305-
DECLARE
306-
foobar sc1.enum1;
307-
BEGIN
308-
SELECT a FROM sc1.tbl1;
309-
SELECT 'Good':::sc1.enum1;
310-
SELECT nextval('sc1.sq1'::REGCLASS);
311-
END;
312-
$$
305+
DECLARE
306+
foobar sc1.enum1;
307+
BEGIN
308+
SELECT a FROM sc1.tbl1;
309+
SELECT 'Good':::sc1.enum1;
310+
SELECT nextval('sc1.sq1'::REGCLASS);
311+
END;
312+
$$
313313

314314
query-sql
315315
CALL sc1.p1('Good'::sc1.enum1)
@@ -344,14 +344,14 @@ CREATE PROCEDURE sc1.p1(a sc1.enum1)
344344
LANGUAGE plpgsql
345345
SECURITY INVOKER
346346
AS $$
347-
DECLARE
348-
foobar sc1.enum1;
349-
BEGIN
350-
SELECT a FROM sc1.tbl1;
351-
SELECT 'Good':::sc1.enum1;
352-
SELECT nextval('sc1.sq1'::REGCLASS);
353-
END;
354-
$$
347+
DECLARE
348+
foobar sc1.enum1;
349+
BEGIN
350+
SELECT a FROM sc1.tbl1;
351+
SELECT 'Good':::sc1.enum1;
352+
SELECT nextval('sc1.sq1'::REGCLASS);
353+
END;
354+
$$
355355

356356
# Make sure procedure signature is rewritten in schema descriptor so that
357357
# procedure can be resolved and executed.

‎pkg/backup/testdata/backup-restore/plpgsql_user_defined_functions‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,15 @@ CREATE FUNCTION sc1.f1(a sc1.enum1)
117117
LANGUAGE plpgsql
118118
SECURITY INVOKER
119119
AS $$
120-
DECLARE
121-
x INT8 := 0;
122-
foobar sc1.enum1;
123-
BEGIN
124-
SELECT a FROM sc1.tbl1;
125-
SELECT 'Good':::sc1.enum1;
126-
RETURN nextval('sc1.sq1'::REGCLASS);
127-
END;
128-
$$
120+
DECLARE
121+
x INT8 := 0;
122+
foobar sc1.enum1;
123+
BEGIN
124+
SELECT a FROM sc1.tbl1;
125+
SELECT 'Good':::sc1.enum1;
126+
RETURN nextval('sc1.sq1'::REGCLASS);
127+
END;
128+
$$
129129

130130
query-sql
131131
SELECT sc1.f1('Good'::sc1.enum1)
@@ -143,15 +143,15 @@ CREATE FUNCTION sc2.f2()
143143
LANGUAGE plpgsql
144144
SECURITY INVOKER
145145
AS $$
146-
DECLARE
147-
x INT8;
148-
BEGIN
149-
SELECT a FROM sc2.tbl2 LIMIT 1 INTO x;
150-
SELECT sc1.f1('Good':::sc1.enum1);
151-
CALL public.p_nested('Good':::sc1.enum1);
152-
RETURN x;
153-
END;
154-
$$
146+
DECLARE
147+
x INT8;
148+
BEGIN
149+
SELECT a FROM sc2.tbl2 LIMIT 1 INTO x;
150+
SELECT sc1.f1('Good':::sc1.enum1);
151+
CALL public.p_nested('Good':::sc1.enum1);
152+
RETURN x;
153+
END;
154+
$$
155155

156156
exec-sql
157157
DROP DATABASE db1
@@ -180,15 +180,15 @@ CREATE FUNCTION sc1.f1(a sc1.enum1)
180180
LANGUAGE plpgsql
181181
SECURITY INVOKER
182182
AS $$
183-
DECLARE
184-
x INT8 := 0;
185-
foobar sc1.enum1;
186-
BEGIN
187-
SELECT a FROM sc1.tbl1;
188-
SELECT 'Good':::sc1.enum1;
189-
RETURN nextval('sc1.sq1'::REGCLASS);
190-
END;
191-
$$
183+
DECLARE
184+
x INT8 := 0;
185+
foobar sc1.enum1;
186+
BEGIN
187+
SELECT a FROM sc1.tbl1;
188+
SELECT 'Good':::sc1.enum1;
189+
RETURN nextval('sc1.sq1'::REGCLASS);
190+
END;
191+
$$
192192

193193
query-sql
194194
SELECT create_statement FROM [SHOW CREATE FUNCTION sc2.f2]
@@ -201,15 +201,15 @@ CREATE FUNCTION sc2.f2()
201201
LANGUAGE plpgsql
202202
SECURITY INVOKER
203203
AS $$
204-
DECLARE
205-
x INT8;
206-
BEGIN
207-
SELECT a FROM sc2.tbl2 LIMIT 1 INTO x;
208-
SELECT sc1.f1('Good':::sc1.enum1);
209-
CALL public.p_nested('Good':::sc1.enum1);
210-
RETURN x;
211-
END;
212-
$$
204+
DECLARE
205+
x INT8;
206+
BEGIN
207+
SELECT a FROM sc2.tbl2 LIMIT 1 INTO x;
208+
SELECT sc1.f1('Good':::sc1.enum1);
209+
CALL public.p_nested('Good':::sc1.enum1);
210+
RETURN x;
211+
END;
212+
$$
213213

214214
# Make sure function signature is rewritten in schema descriptor so that
215215
# function can be resolved and executed.
@@ -372,16 +372,16 @@ CREATE FUNCTION sc1.f1(a sc1.enum1)
372372
LANGUAGE plpgsql
373373
SECURITY INVOKER
374374
AS $$
375-
DECLARE
376-
x INT8;
377-
foobar sc1.enum1;
378-
BEGIN
379-
SELECT a FROM sc1.tbl1;
380-
SELECT 'Good':::sc1.enum1;
381-
SELECT nextval('sc1.sq1'::REGCLASS) INTO x;
382-
RETURN x;
383-
END;
384-
$$
375+
DECLARE
376+
x INT8;
377+
foobar sc1.enum1;
378+
BEGIN
379+
SELECT a FROM sc1.tbl1;
380+
SELECT 'Good':::sc1.enum1;
381+
SELECT nextval('sc1.sq1'::REGCLASS) INTO x;
382+
RETURN x;
383+
END;
384+
$$
385385

386386
query-sql
387387
SELECT sc1.f1('Good'::sc1.enum1)
@@ -416,16 +416,16 @@ CREATE FUNCTION sc1.f1(a sc1.enum1)
416416
LANGUAGE plpgsql
417417
SECURITY INVOKER
418418
AS $$
419-
DECLARE
420-
x INT8;
421-
foobar sc1.enum1;
422-
BEGIN
423-
SELECT a FROM sc1.tbl1;
424-
SELECT 'Good':::sc1.enum1;
425-
SELECT nextval('sc1.sq1'::REGCLASS) INTO x;
426-
RETURN x;
427-
END;
428-
$$
419+
DECLARE
420+
x INT8;
421+
foobar sc1.enum1;
422+
BEGIN
423+
SELECT a FROM sc1.tbl1;
424+
SELECT 'Good':::sc1.enum1;
425+
SELECT nextval('sc1.sq1'::REGCLASS) INTO x;
426+
RETURN x;
427+
END;
428+
$$
429429

430430
# Make sure function signature is rewritten in schema descriptor so that
431431
# function can be resolved and executed.

‎pkg/backup/testdata/backup-restore/procedures‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ CREATE PROCEDURE sc1.p1(a sc1.enum1)
9090
LANGUAGE SQL
9191
SECURITY INVOKER
9292
AS $$
93-
SELECT a FROM sc1.tbl1;
94-
SELECT 'Good':::sc1.enum1;
95-
SELECT nextval('sc1.sq1'::REGCLASS);
96-
$$
93+
SELECT a FROM sc1.tbl1;
94+
SELECT 'Good':::sc1.enum1;
95+
SELECT nextval('sc1.sq1'::REGCLASS);
96+
$$
9797

9898
exec-sql
9999
CALL sc1.p1('Good'::sc1.enum1)
@@ -127,10 +127,10 @@ CREATE PROCEDURE sc1.p1(a sc1.enum1)
127127
LANGUAGE SQL
128128
SECURITY INVOKER
129129
AS $$
130-
SELECT a FROM sc1.tbl1;
131-
SELECT 'Good':::sc1.enum1;
132-
SELECT nextval('sc1.sq1'::REGCLASS);
133-
$$
130+
SELECT a FROM sc1.tbl1;
131+
SELECT 'Good':::sc1.enum1;
132+
SELECT nextval('sc1.sq1'::REGCLASS);
133+
$$
134134

135135
# Make sure procedure signature is rewritten in schema descriptor so that
136136
# procedure can be resolved and executed.
@@ -282,10 +282,10 @@ CREATE PROCEDURE sc1.p1(a sc1.enum1)
282282
LANGUAGE SQL
283283
SECURITY INVOKER
284284
AS $$
285-
SELECT a FROM sc1.tbl1;
286-
SELECT 'Good':::sc1.enum1;
287-
SELECT nextval('sc1.sq1'::REGCLASS);
288-
$$
285+
SELECT a FROM sc1.tbl1;
286+
SELECT 'Good':::sc1.enum1;
287+
SELECT nextval('sc1.sq1'::REGCLASS);
288+
$$
289289

290290
query-sql
291291
CALL sc1.p1('Good'::sc1.enum1)
@@ -320,10 +320,10 @@ CREATE PROCEDURE sc1.p1(a sc1.enum1)
320320
LANGUAGE SQL
321321
SECURITY INVOKER
322322
AS $$
323-
SELECT a FROM sc1.tbl1;
324-
SELECT 'Good':::sc1.enum1;
325-
SELECT nextval('sc1.sq1'::REGCLASS);
326-
$$
323+
SELECT a FROM sc1.tbl1;
324+
SELECT 'Good':::sc1.enum1;
325+
SELECT nextval('sc1.sq1'::REGCLASS);
326+
$$
327327

328328
# Make sure procedure signature is rewritten in schema descriptor so that
329329
# procedure can be resolved and executed.

‎pkg/backup/testdata/backup-restore/user-defined-functions‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ CREATE FUNCTION sc1.f1(a sc1.enum1)
9393
LANGUAGE SQL
9494
SECURITY INVOKER
9595
AS $$
96-
SELECT a FROM sc1.tbl1;
97-
SELECT 'Good':::sc1.enum1;
98-
SELECT nextval('sc1.sq1'::REGCLASS);
99-
$$
96+
SELECT a FROM sc1.tbl1;
97+
SELECT 'Good':::sc1.enum1;
98+
SELECT nextval('sc1.sq1'::REGCLASS);
99+
$$
100100

101101
query-sql
102102
SELECT sc1.f1('Good'::sc1.enum1)
@@ -130,10 +130,10 @@ CREATE FUNCTION sc1.f1(a sc1.enum1)
130130
LANGUAGE SQL
131131
SECURITY INVOKER
132132
AS $$
133-
SELECT a FROM sc1.tbl1;
134-
SELECT 'Good':::sc1.enum1;
135-
SELECT nextval('sc1.sq1'::REGCLASS);
136-
$$
133+
SELECT a FROM sc1.tbl1;
134+
SELECT 'Good':::sc1.enum1;
135+
SELECT nextval('sc1.sq1'::REGCLASS);
136+
$$
137137

138138
# Make sure function signature is rewritten in schema descriptor so that
139139
# function can be resolved and executed.
@@ -279,10 +279,10 @@ CREATE FUNCTION sc1.f1(a sc1.enum1)
279279
LANGUAGE SQL
280280
SECURITY INVOKER
281281
AS $$
282-
SELECT a FROM sc1.tbl1;
283-
SELECT 'Good':::sc1.enum1;
284-
SELECT nextval('sc1.sq1'::REGCLASS);
285-
$$
282+
SELECT a FROM sc1.tbl1;
283+
SELECT 'Good':::sc1.enum1;
284+
SELECT nextval('sc1.sq1'::REGCLASS);
285+
$$
286286

287287
query-sql
288288
SELECT sc1.f1('Good'::sc1.enum1)
@@ -317,10 +317,10 @@ CREATE FUNCTION sc1.f1(a sc1.enum1)
317317
LANGUAGE SQL
318318
SECURITY INVOKER
319319
AS $$
320-
SELECT a FROM sc1.tbl1;
321-
SELECT 'Good':::sc1.enum1;
322-
SELECT nextval('sc1.sq1'::REGCLASS);
323-
$$
320+
SELECT a FROM sc1.tbl1;
321+
SELECT 'Good':::sc1.enum1;
322+
SELECT nextval('sc1.sq1'::REGCLASS);
323+
$$
324324

325325
# Make sure function signature is rewritten in schema descriptor so that
326326
# function can be resolved and executed.

0 commit comments

Comments
 (0)