NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitc40e20a

committed

Revert renaming of int44in/int44out.

This seemed like a good idea in commitbe42eb9, but it causes moretrouble than it's worth for cross-branch upgrade testing.Discussion:https://postgr.es/m/11927.1519756619@sss.pgh.pa.us

1 parent6614aaa commitc40e20aCopy full SHA for c40e20a

File tree

5 files changed

+16

-16

lines changed

src/test/regress
- expected
  - create_type.out
- input
  - create_function_1.source
- output
  - create_function_1.source
- regress.c
- sql
  - create_type.sql

5 files changed

+16

-16

lines changed

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

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ CREATE TYPE widget (`
`16`	`16`	`);`
`17`	`17`	`CREATE TYPE city_budget (`
`18`	`18`	`internallength = 16,`
`19`		`- input =city_budget_in,`
`20`		`- output =city_budget_out,`
	`19`	`+ input =int44in,`
	`20`	`+ output =int44out,`
`21`	`21`	`element = int4,`
`22`	`22`	`category = 'x', -- just to verify the system will take it`
`23`	`23`	`preferred = true -- ditto`

`‎src/test/regress/input/create_function_1.source`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,12 @@ CREATE FUNCTION widget_out(widget)`
`12`	`12`	`AS '@libdir@/regress@DLSUFFIX@'`
`13`	`13`	`LANGUAGE C STRICT IMMUTABLE;`
`14`	`14`
`15`		`-CREATE FUNCTIONcity_budget_in(cstring)`
	`15`	`+CREATE FUNCTIONint44in(cstring)`
`16`	`16`	`RETURNS city_budget`
`17`	`17`	`AS '@libdir@/regress@DLSUFFIX@'`
`18`	`18`	`LANGUAGE C STRICT IMMUTABLE;`
`19`	`19`
`20`		`-CREATE FUNCTIONcity_budget_out(city_budget)`
	`20`	`+CREATE FUNCTIONint44out(city_budget)`
`21`	`21`	`RETURNS cstring`
`22`	`22`	`AS '@libdir@/regress@DLSUFFIX@'`
`23`	`23`	`LANGUAGE C STRICT IMMUTABLE;`

`‎src/test/regress/output/create_function_1.source`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,13 @@ CREATE FUNCTION widget_out(widget)`
`12`	`12`	`AS '@libdir@/regress@DLSUFFIX@'`
`13`	`13`	`LANGUAGE C STRICT IMMUTABLE;`
`14`	`14`	`NOTICE: argument type widget is only a shell`
`15`		`-CREATE FUNCTIONcity_budget_in(cstring)`
	`15`	`+CREATE FUNCTIONint44in(cstring)`
`16`	`16`	`RETURNS city_budget`
`17`	`17`	`AS '@libdir@/regress@DLSUFFIX@'`
`18`	`18`	`LANGUAGE C STRICT IMMUTABLE;`
`19`	`19`	`NOTICE: type "city_budget" is not yet defined`
`20`	`20`	`DETAIL: Creating a shell type definition.`
`21`		`-CREATE FUNCTIONcity_budget_out(city_budget)`
	`21`	`+CREATE FUNCTIONint44out(city_budget)`
`22`	`22`	`RETURNS cstring`
`23`	`23`	`AS '@libdir@/regress@DLSUFFIX@'`
`24`	`24`	`LANGUAGE C STRICT IMMUTABLE;`

`‎src/test/regress/regress.c`

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -442,19 +442,19 @@ set_ttdummy(PG_FUNCTION_ARGS)`
`442`	`442`
`443`	`443`
`444`	`444`	`/*`
`445`		`- * Typecity_budget has no real-world use, but the regression tests use it.`
`446`		`- * It's a four-element vector of int4's.`
	`445`	`+ * Typeint44 has no real-world use, but the regression tests use it`
	`446`	`+ *(under the alias "city_budget").It's a four-element vector of int4's.`
`447`	`447`	`*/`
`448`	`448`
`449`	`449`	`/*`
`450`		`- *city_budget_in- converts "num, num, ..." to internal form`
	`450`	`+ *int44in- converts "num, num, ..." to internal form`
`451`	`451`	`*`
`452`	`452`	`*Note: Fills any missing positions with zeroes.`
`453`	`453`	`*/`
`454`		`-PG_FUNCTION_INFO_V1(city_budget_in);`
	`454`	`+PG_FUNCTION_INFO_V1(int44in);`
`455`	`455`
`456`	`456`	`Datum`
`457`		`-city_budget_in(PG_FUNCTION_ARGS)`
	`457`	`+int44in(PG_FUNCTION_ARGS)`
`458`	`458`	`{`
`459`	`459`	`char*input_string=PG_GETARG_CSTRING(0);`
`460`	`460`	`int32result= (int32)palloc(4*sizeof(int32));`
`@@ -473,12 +473,12 @@ city_budget_in(PG_FUNCTION_ARGS)`
`473`	`473`	`}`
`474`	`474`
`475`	`475`	`/*`
`476`		`- *city_budget_out- converts internal form to "num, num, ..."`
	`476`	`+ *int44out- converts internal form to "num, num, ..."`
`477`	`477`	`*/`
`478`		`-PG_FUNCTION_INFO_V1(city_budget_out);`
	`478`	`+PG_FUNCTION_INFO_V1(int44out);`
`479`	`479`
`480`	`480`	`Datum`
`481`		`-city_budget_out(PG_FUNCTION_ARGS)`
	`481`	`+int44out(PG_FUNCTION_ARGS)`
`482`	`482`	`{`
`483`	`483`	`int32an_array= (int32)PG_GETARG_POINTER(0);`
`484`	`484`	`charresult= (char)palloc(16*4);`

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

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ CREATE TYPE widget (`
`18`	`18`
`19`	`19`	`CREATETYPEcity_budget (`
`20`	`20`	`internallength=16,`
`21`		`- input=city_budget_in,`
`22`		`- output=city_budget_out,`
	`21`	`+ input=int44in,`
	`22`	`+ output=int44out,`
`23`	`23`	`element= int4,`
`24`	`24`	`category='x',-- just to verify the system will take it`
`25`	`25`	`preferred= true-- ditto`

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!

Commitc40e20a

File tree

5 files changed

5 files changed

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

`‎src/test/regress/input/create_function_1.source`

`‎src/test/regress/output/create_function_1.source`

`‎src/test/regress/regress.c`

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

0 commit comments