Commit80bbd32

Barry Lind

committed

Applied patch from dmitry@openratings.com to fix parsing of array values

Modified Files: jdbc/org/postgresql/Driver.java.in jdbc/org/postgresql/jdbc2/Array.java

1 parentec7aa4b commit80bbd32Copy full SHA for 80bbd32

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Copyright (c) 2003, PostgreSQL Global Development Group`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/Attic/Driver.java.in,v 1.31 2003/06/30 16:38:30 barry Exp $`
	`9`	`+ * $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/Attic/Driver.java.in,v 1.32 2003/07/21 20:48:31 barry Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -503,6 +503,6 @@ public class Driver implements java.sql.Driver`
`503`	`503`
`504`	`504`
`505`	`505`	`//The build number should be incremented for every new build`
`506`		`-private static int m_buildNumber =205;`
	`506`	`+private static int m_buildNumber =206;`
`507`	`507`
`508`	`508`	`}`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -98,19 +98,20 @@ public Object getArray(long index, int count, Map map) throws SQLException`
`98`	`98`	`if (chars[i] =='\\' )`
`99`	`99`	`//escape character that we need to skip`
`100`	`100`	`i++;`
`101`		`-if (chars[i] =='{' )`
	`101`	`+elseif (!insideString &&chars[i] =='{' )`
`102`	`102`	`{`
`103`	`103`	`if (foundOpen )// Only supports 1-D arrays for now`
`104`	`104`	`throworg.postgresql.Driver.notImplemented();`
`105`	`105`	`foundOpen =true;`
`106`	`106`	`continue;`
`107`	`107`	`}`
`108`		`-if (chars[i] =='"')`
	`108`	`+elseif (chars[i] =='"')`
`109`	`109`	`{`
`110`	`110`	`insideString = !insideString;`
`111`	`111`	`continue;`
`112`	`112`	`}`
`113`		`-if ( (!insideString &&chars[i] ==',') \|\|chars[i] =='}' \|\|i ==chars.length -1)`
	`113`	`+elseif (!insideString && (chars[i] ==',' \|\|chars[i] =='}') \|\|`
	`114`	`+i ==chars.length -1)`
`114`	`115`	`{`
`115`	`116`	`if (chars[i] !='"' &&chars[i] !='}' &&chars[i] !=',' )`
`116`	`117`	`sbuf.append(chars[i]);`

Comments

(0)