NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit7bd099d

committed

Update spelling of COPY options

The preferred spelling was changed from FORCE QUOTE to FORCE_QUOTE andthe like, but some code was still referring to the old spellings.

1 parentb9f117d commit7bd099dCopy full SHA for 7bd099d

File tree

2 files changed

-9

lines changed

src
- backend/commands
  - copy.c
- test/regress/expected
  - copy2.out

2 files changed

-9

lines changed

`‎src/backend/commands/copy.c`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ typedef struct CopyStateData`
`121`	`121`	`charquote;/ CSV quote char (must be 1 byte) */`
`122`	`122`	`charescape;/ CSV escape char (must be 1 byte) */`
`123`	`123`	`Listforce_quote;/ list of column names */`
`124`		`-boolforce_quote_all;/FORCE QUOTE ? */`
	`124`	`+boolforce_quote_all;/FORCE_QUOTE ? */`
`125`	`125`	`boolforce_quote_flags;/ per-column CSV FQ flags */`
`126`	`126`	`Listforce_notnull;/ list of column names */`
`127`	`127`	`boolforce_notnull_flags;/ per-column CSV FNN flags */`
`@@ -1469,7 +1469,7 @@ BeginCopy(bool is_from,`
`1469`	`1469`
`1470`	`1470`	`num_phys_attrs=tupDesc->natts;`
`1471`	`1471`
`1472`		`-/* ConvertFORCE QUOTE name list to per-column flags, check validity */`
	`1472`	`+/* ConvertFORCE_QUOTE name list to per-column flags, check validity */`
`1473`	`1473`	`cstate->force_quote_flags= (bool)palloc0(num_phys_attrssizeof(bool));`
`1474`	`1474`	`if (cstate->force_quote_all)`
`1475`	`1475`	`{`
`@@ -1492,13 +1492,13 @@ BeginCopy(bool is_from,`
`1492`	`1492`	`if (!list_member_int(cstate->attnumlist,attnum))`
`1493`	`1493`	`ereport(ERROR,`
`1494`	`1494`	`(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),`
`1495`		`-errmsg("FORCE QUOTE column \"%s\" not referenced by COPY",`
	`1495`	`+errmsg("FORCE_QUOTE column \"%s\" not referenced by COPY",`
`1496`	`1496`	`NameStr(tupDesc->attrs[attnum-1]->attname))));`
`1497`	`1497`	`cstate->force_quote_flags[attnum-1]= true;`
`1498`	`1498`	`}`
`1499`	`1499`	`}`
`1500`	`1500`
`1501`		`-/* ConvertFORCE NOT NULL name list to per-column flags, check validity */`
	`1501`	`+/* ConvertFORCE_NOT_NULL name list to per-column flags, check validity */`
`1502`	`1502`	`cstate->force_notnull_flags= (bool)palloc0(num_phys_attrssizeof(bool));`
`1503`	`1503`	`if (cstate->force_notnull)`
`1504`	`1504`	`{`
`@@ -1514,13 +1514,13 @@ BeginCopy(bool is_from,`
`1514`	`1514`	`if (!list_member_int(cstate->attnumlist,attnum))`
`1515`	`1515`	`ereport(ERROR,`
`1516`	`1516`	`(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),`
`1517`		`-errmsg("FORCE NOT NULL column \"%s\" not referenced by COPY",`
	`1517`	`+errmsg("FORCE_NOT_NULL column \"%s\" not referenced by COPY",`
`1518`	`1518`	`NameStr(tupDesc->attrs[attnum-1]->attname))));`
`1519`	`1519`	`cstate->force_notnull_flags[attnum-1]= true;`
`1520`	`1520`	`}`
`1521`	`1521`	`}`
`1522`	`1522`
`1523`		`-/* ConvertFORCE NULL name list to per-column flags, check validity */`
	`1523`	`+/* ConvertFORCE_NULL name list to per-column flags, check validity */`
`1524`	`1524`	`cstate->force_null_flags= (bool)palloc0(num_phys_attrssizeof(bool));`
`1525`	`1525`	`if (cstate->force_null)`
`1526`	`1526`	`{`
`@@ -1536,7 +1536,7 @@ BeginCopy(bool is_from,`
`1536`	`1536`	`if (!list_member_int(cstate->attnumlist,attnum))`
`1537`	`1537`	`ereport(ERROR,`
`1538`	`1538`	`(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),`
`1539`		`-errmsg("FORCE NULL column \"%s\" not referenced by COPY",`
	`1539`	`+errmsg("FORCE_NULL column \"%s\" not referenced by COPY",`
`1540`	`1540`	`NameStr(tupDesc->attrs[attnum-1]->attname))));`
`1541`	`1541`	`cstate->force_null_flags[attnum-1]= true;`
`1542`	`1542`	`}`

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

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -421,12 +421,12 @@ ROLLBACK;`
`421`	`421`	`-- should fail with "not referenced by COPY" error`
`422`	`422`	`BEGIN;`
`423`	`423`	`COPY forcetest (d, e) FROM STDIN WITH (FORMAT csv, FORCE_NOT_NULL(b));`
`424`		`-ERROR:FORCE NOT NULL column "b" not referenced by COPY`
	`424`	`+ERROR:FORCE_NOT_NULL column "b" not referenced by COPY`
`425`	`425`	`ROLLBACK;`
`426`	`426`	`-- should fail with "not referenced by COPY" error`
`427`	`427`	`BEGIN;`
`428`	`428`	`COPY forcetest (d, e) FROM STDIN WITH (FORMAT csv, FORCE_NULL(b));`
`429`		`-ERROR:FORCE NULL column "b" not referenced by COPY`
	`429`	`+ERROR:FORCE_NULL column "b" not referenced by COPY`
`430`	`430`	`ROLLBACK;`
`431`	`431`	`\pset null ''`
`432`	`432`	`-- test case with whole-row Var in a check constraint`

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!

Commit7bd099d

File tree

2 files changed

2 files changed

`‎src/backend/commands/copy.c`

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

0 commit comments