NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit9ab5ed4

committed

Use factorial rather than numeric_fac in create_operator.sql.

These two SQL functions are aliases for the same C function, so thischange has no semantic effect. However, because we dropped thenumeric_fac alias in HEAD (commit 76f412ab3), operator definitionsbased on that one don't port forward, causing problems for cross-versionupgrade tests based on the regression database.Patch all active back branches to dodge the problem.Discussion:https://postgr.es/m/449144.1600439950@sss.pgh.pa.us

1 parentf083afa commit9ab5ed4Copy full SHA for 9ab5ed4

File tree

2 files changed

+20

-20

lines changed

src/test/regress
- expected
  - create_operator.out
- sql
  - create_operator.sql

2 files changed

+20

-20

lines changed

`‎src/test/regress/expected/create_operator.out`

Lines changed: 10 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,15 +16,15 @@ CREATE OPERATOR <% (`
`16`	`16`	`);`
`17`	`17`	`CREATE OPERATOR @#@ (`
`18`	`18`	`rightarg = int8,-- left unary`
`19`		`- procedure =numeric_fac`
	`19`	`+ procedure =factorial`
`20`	`20`	`);`
`21`	`21`	`CREATE OPERATOR #@# (`
`22`	`22`	`leftarg = int8,-- right unary`
`23`		`- procedure =numeric_fac`
	`23`	`+ procedure =factorial`
`24`	`24`	`);`
`25`	`25`	`CREATE OPERATOR #%# (`
`26`	`26`	`leftarg = int8,-- right unary`
`27`		`- procedure =numeric_fac`
	`27`	`+ procedure =factorial`
`28`	`28`	`);`
`29`	`29`	`-- Test operator created above`
`30`	`30`	`SELECT point '(1,2)' <% widget '(0,0,3)' AS t,`
`@@ -40,7 +40,7 @@ ERROR: operator does not exist: integer ######`
`40`	`40`	`-- => is disallowed now`
`41`	`41`	`CREATE OPERATOR => (`
`42`	`42`	`leftarg = int8,-- right unary`
`43`		`- procedure =numeric_fac`
	`43`	`+ procedure =factorial`
`44`	`44`	`);`
`45`	`45`	`ERROR: syntax error at or near "=>"`
`46`	`46`	`LINE 1: CREATE OPERATOR => (`
`@@ -50,7 +50,7 @@ LINE 1: CREATE OPERATOR => (`
`50`	`50`	`-- this is legal because ! is not allowed in sql ops`
`51`	`51`	`CREATE OPERATOR !=- (`
`52`	`52`	`leftarg = int8,-- right unary`
`53`		`- procedure =numeric_fac`
	`53`	`+ procedure =factorial`
`54`	`54`	`);`
`55`	`55`	`SELECT 2 !=-;`
`56`	`56`	`?column?`
`@@ -128,23 +128,23 @@ REVOKE USAGE ON SCHEMA schema_op1 FROM regress_rol_op1;`
`128`	`128`	`SET ROLE regress_rol_op1;`
`129`	`129`	`CREATE OPERATOR schema_op1.#*# (`
`130`	`130`	`leftarg = int8,-- right unary`
`131`		`- procedure =numeric_fac`
	`131`	`+ procedure =factorial`
`132`	`132`	`);`
`133`	`133`	`ERROR: permission denied for schema schema_op1`
`134`	`134`	`ROLLBACK;`
`135`	`135`	`-- Should fail. SETOF type functions not allowed as argument (testing leftarg)`
`136`	`136`	`BEGIN TRANSACTION;`
`137`	`137`	`CREATE OPERATOR #*# (`
`138`	`138`	`leftarg = SETOF int8,`
`139`		`- procedure =numeric_fac`
	`139`	`+ procedure =factorial`
`140`	`140`	`);`
`141`	`141`	`ERROR: SETOF type not allowed for operator argument`
`142`	`142`	`ROLLBACK;`
`143`	`143`	`-- Should fail. SETOF type functions not allowed as argument (testing rightarg)`
`144`	`144`	`BEGIN TRANSACTION;`
`145`	`145`	`CREATE OPERATOR #*# (`
`146`	`146`	`rightarg = SETOF int8,`
`147`		`- procedure =numeric_fac`
	`147`	`+ procedure =factorial`
`148`	`148`	`);`
`149`	`149`	`ERROR: SETOF type not allowed for operator argument`
`150`	`150`	`ROLLBACK;`
`@@ -168,13 +168,13 @@ ROLLBACK;`
`168`	`168`	`-- Should fail. Invalid attribute`
`169`	`169`	`CREATE OPERATOR #@%# (`
`170`	`170`	`leftarg = int8,-- right unary`
`171`		`- procedure =numeric_fac,`
	`171`	`+ procedure =factorial,`
`172`	`172`	`invalid_att = int8`
`173`	`173`	`);`
`174`	`174`	`WARNING: operator attribute "invalid_att" not recognized`
`175`	`175`	`-- Should fail. At least leftarg or rightarg should be mandatorily specified`
`176`	`176`	`CREATE OPERATOR #@%# (`
`177`		`- procedure =numeric_fac`
	`177`	`+ procedure =factorial`
`178`	`178`	`);`
`179`	`179`	`ERROR: at least one of leftarg or rightarg must be specified`
`180`	`180`	`-- Should fail. Procedure should be mandatorily specified`

`‎src/test/regress/sql/create_operator.sql`

Lines changed: 10 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,17 +19,17 @@ CREATE OPERATOR <% (`
`19`	`19`
`20`	`20`	`CREATE OPERATOR @#@ (`
`21`	`21`	`rightarg= int8,-- left unary`
`22`		`- procedure=numeric_fac`
	`22`	`+ procedure=factorial`
`23`	`23`	`);`
`24`	`24`
`25`	`25`	`CREATE OPERATOR#@# (`
`26`	`26`	`leftarg= int8,-- right unary`
`27`		`- procedure=numeric_fac`
	`27`	`+ procedure=factorial`
`28`	`28`	`);`
`29`	`29`
`30`	`30`	`CREATE OPERATOR#%# (`
`31`	`31`	`leftarg= int8,-- right unary`
`32`		`- procedure=numeric_fac`
	`32`	`+ procedure=factorial`
`33`	`33`	`);`
`34`	`34`
`35`	`35`	`-- Test operator created above`
`@@ -42,7 +42,7 @@ COMMENT ON OPERATOR ###### (int4, NONE) IS 'bad right unary';`
`42`	`42`	`-- => is disallowed now`
`43`	`43`	`CREATE OPERATOR=> (`
`44`	`44`	`leftarg= int8,-- right unary`
`45`		`- procedure=numeric_fac`
	`45`	`+ procedure=factorial`
`46`	`46`	`);`
`47`	`47`
`48`	`48`	`-- lexing of <=, >=, <>, != has a number of edge cases`
`@@ -51,7 +51,7 @@ CREATE OPERATOR => (`
`51`	`51`	`-- this is legal because ! is not allowed in sql ops`
`52`	`52`	`CREATE OPERATOR!=- (`
`53`	`53`	`leftarg= int8,-- right unary`
`54`		`- procedure=numeric_fac`
	`54`	`+ procedure=factorial`
`55`	`55`	`);`
`56`	`56`	`SELECT2!=-;`
`57`	`57`	`-- make sure lexer returns != as <> even in edge cases`
`@@ -85,7 +85,7 @@ REVOKE USAGE ON SCHEMA schema_op1 FROM regress_rol_op1;`
`85`	`85`	`SET ROLE regress_rol_op1;`
`86`	`86`	`CREATEOPERATORschema_op1.#*# (`
`87`	`87`	`leftarg= int8,-- right unary`
`88`		`- procedure=numeric_fac`
	`88`	`+ procedure=factorial`
`89`	`89`	`);`
`90`	`90`	`ROLLBACK;`
`91`	`91`
`@@ -94,7 +94,7 @@ ROLLBACK;`
`94`	`94`	`BEGIN TRANSACTION;`
`95`	`95`	`CREATE OPERATOR#*# (`
`96`	`96`	`leftarg= SETOF int8,`
`97`		`- procedure=numeric_fac`
	`97`	`+ procedure=factorial`
`98`	`98`	`);`
`99`	`99`	`ROLLBACK;`
`100`	`100`
`@@ -103,7 +103,7 @@ ROLLBACK;`
`103`	`103`	`BEGIN TRANSACTION;`
`104`	`104`	`CREATE OPERATOR#*# (`
`105`	`105`	`rightarg= SETOF int8,`
`106`		`- procedure=numeric_fac`
	`106`	`+ procedure=factorial`
`107`	`107`	`);`
`108`	`108`	`ROLLBACK;`
`109`	`109`
`@@ -129,13 +129,13 @@ ROLLBACK;`
`129`	`129`	`-- Should fail. Invalid attribute`
`130`	`130`	`CREATE OPERATOR#@%# (`
`131`	`131`	`leftarg= int8,-- right unary`
`132`		`- procedure=numeric_fac,`
	`132`	`+ procedure=factorial,`
`133`	`133`	`invalid_att= int8`
`134`	`134`	`);`
`135`	`135`
`136`	`136`	`-- Should fail. At least leftarg or rightarg should be mandatorily specified`
`137`	`137`	`CREATE OPERATOR#@%# (`
`138`		`- procedure=numeric_fac`
	`138`	`+ procedure=factorial`
`139`	`139`	`);`
`140`	`140`
`141`	`141`	`-- Should fail. Procedure should be mandatorily specified`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit9ab5ed4

File tree

2 files changed

2 files changed

`‎src/test/regress/expected/create_operator.out`

`‎src/test/regress/sql/create_operator.sql`

0 commit comments