Commit00aa8ed

committed

Adjust plpython to convert \r\n and \r to \n in Python scripts,

per recent discussion concluding that this is the Right Thing. Addregression test check for this behavior. Michael Fuhr

1 parent2187059 commit00aa8edCopy full SHA for 00aa8ed

File tree

+48

-3

lines changed

+48

-3

lines changed

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -137,3 +137,21 @@ SELECT join_sequences(sequences) FROM sequences`
`137`	`137`	`----------------`
`138`	`138`	`(0 rows)`
`139`	`139`
	`140`	`+SELECT newline_lf();`
	`141`	`+ newline_lf`
	`142`	`+------------`
	`143`	`+ 123`
	`144`	`+(1 row)`
	`145`	`+`
	`146`	`+SELECT newline_cr();`
	`147`	`+ newline_cr`
	`148`	`+------------`
	`149`	`+ 123`
	`150`	`+(1 row)`
	`151`	`+`
	`152`	`+SELECT newline_crlf();`
	`153`	`+ newline_crlf`
	`154`	`+--------------`
	`155`	`+ 123`
	`156`	`+(1 row)`
	`157`	`+`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`* MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.`
`30`	`30`	`*`
`31`	`31`	`* IDENTIFICATION`
`32`		`- *$PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.58 2004/12/17 02:14:48 tgl Exp $`
	`32`	`+ *$PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.59 2005/03/24 17:22:34 tgl Exp $`
`33`	`33`	`*`
`34`	`34`	`*********************************************************************`
`35`	`35`	`*/`
`@@ -1206,10 +1206,14 @@ PLy_procedure_munge_source(const char name, const char src)`
`1206`	`1206`
`1207`	`1207`	`while (*sp!='\0')`
`1208`	`1208`	`{`
`1209`		`-if (*sp=='\n')`
	`1209`	`+if (sp=='\r'&&(sp+1)=='\n')`
	`1210`	`+sp++;`
	`1211`	`+`
	`1212`	`+if (sp=='\n'\|\|sp=='\r')`
`1210`	`1213`	`{`
`1211`		`-mp++=sp++;`
	`1214`	`+*mp++='\n';`
`1212`	`1215`	`*mp++='\t';`
	`1216`	`+sp++;`
`1213`	`1217`	`}`
`1214`	`1218`	`else`
`1215`	`1219`	`mp++=sp++;`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -306,3 +306,19 @@ CREATE OR REPLACE FUNCTION write_file(text,text) RETURNS text AS '`
`306`	`306`	`open(args[0],"w").write(args[1])`
`307`	`307`	`return "Wrote to file: %s" % args[0]`
`308`	`308`	`' LANGUAGE plpythonu;`
	`309`	`+`
	`310`	`+--`
	`311`	`+-- Universal Newline Support`
	`312`	`+--`
	`313`	`+`
	`314`	`+CREATE OR REPLACEFUNCTIONnewline_lf() RETURNSintegerAS`
	`315`	`+'x = 100\ny = 23\nreturn x + y\n'`
	`316`	`+LANGUAGE plpythonu;`
	`317`	`+`
	`318`	`+CREATE OR REPLACEFUNCTIONnewline_cr() RETURNSintegerAS`
	`319`	`+'x = 100\ry = 23\rreturn x + y\r'`
	`320`	`+LANGUAGE plpythonu;`
	`321`	`+`
	`322`	`+CREATE OR REPLACEFUNCTIONnewline_crlf() RETURNSintegerAS`
	`323`	`+'x = 100\r\ny = 23\r\nreturn x + y\r\n'`
	`324`	`+LANGUAGE plpythonu;`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -61,3 +61,10 @@ SELECT join_sequences(sequences) FROM sequences`
`61`	`61`	`-- error in trigger`
`62`	`62`	`--`
`63`	`63`
	`64`	`+--`
	`65`	`+-- Check Universal Newline Support`
	`66`	`+--`
	`67`	`+`
	`68`	`+SELECT newline_lf();`
	`69`	`+SELECT newline_cr();`
	`70`	`+SELECT newline_crlf();`

Comments

(0)