Commite70b483

Peter Mount

committed

Some minor bug fixes

1 parentfe90c54 commite70b483Copy full SHA for e70b483

File tree

+23

-33

lines changed

+23

-33

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,9 @@`
	`1`	`+Sun Jun 27 12:00:00 BST 1999`
	`2`	`+- Fixed typo in postgresql.Driver that prevented compilation`
	`3`	`+- Implemented getTimestamp() fix submitted by Philipp Matthias Hahn`
	`4`	`+ <pmhahn@titan.lahn.de>`
	`5`	`+- Cleaned up some comments in Connection`
	`6`	`+`
`1`	`7`	`Wed Jun 23 06:50:00 BST 1999`
`2`	`8`	`- Fixed error in errors.properties where the arguments are 0 based not`
`3`	`9`	`1 based`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public java.sql.Connection connect(String url, Properties info) throws SQLExcept`
`104`	`104`	`return (java.sql.Connection)con;`
`105`	`105`	`}catch(ClassNotFoundExceptionex) {`
`106`	`106`	`thrownewPSQLException("postgresql.jvm.version",ex);`
`107`		`- }catch(PSQLException(ex1) {`
	`107`	`+ }catch(PSQLExceptionex1) {`
`108`	`108`	`// re-throw the exception, otherwise it will be caught next, and a`
`109`	`109`	`// postgresql.unusual error will be returned instead.`
`110`	`110`	`throwex1;`

Lines changed: 8 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -434,24 +434,16 @@ public Time getTime(int columnIndex) throws SQLException`
`434`	`434`	`publicTimestampgetTimestamp(intcolumnIndex)throwsSQLException`
`435`	`435`	`{`
`436`	`436`	`Strings =getString(columnIndex);`
	`437`	`+if(s==null)`
	`438`	`+returnnull;`
	`439`	`+`
`437`	`440`	`SimpleDateFormatdf =newSimpleDateFormat("yyyy-MM-dd HH:mm:sszzz");`
`438`	`441`
`439`		`-if (s !=null)`
`440`		`- {`
`441`		`-intTZ =newFloat(s.substring(19)).intValue();`
`442`		`-TZ =TZ 60 60 *1000;`
`443`		`-TimeZonezone =TimeZone.getDefault();`
`444`		`-zone.setRawOffset(TZ);`
`445`		`-Stringnm =zone.getID();`
`446`		`-s =s.substring(0,19) +nm;`
`447`		`-try {`
`448`		`-java.util.Dated =df.parse(s);`
`449`		`-returnnewTimestamp(d.getTime());`
`450`		`-}catch (ParseExceptione) {`
`451`		`-thrownewPSQLException("postgresql.res.badtimestamp",newInteger(e.getErrorOffset()),s);`
`452`		`-}`
`453`		`- }`
`454`		`-returnnull;// SQL NULL`
	`442`	`+try {`
	`443`	`+returnnewTimestamp(df.parse(s).getTime());`
	`444`	`+ }catch(ParseExceptione) {`
	`445`	`+thrownewPSQLException("postgresql.res.badtimestamp",newInteger(e.getErrorOffset()),s);`
	`446`	`+ }`
`455`	`447`	`}`
`456`	`448`
`457`	`449`	`/**`

Lines changed: 8 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -436,24 +436,16 @@ public Time getTime(int columnIndex) throws SQLException`
`436`	`436`	`publicTimestampgetTimestamp(intcolumnIndex)throwsSQLException`
`437`	`437`	`{`
`438`	`438`	`Strings =getString(columnIndex);`
	`439`	`+if(s==null)`
	`440`	`+returnnull;`
	`441`	`+`
`439`	`442`	`SimpleDateFormatdf =newSimpleDateFormat("yyyy-MM-dd HH:mm:sszzz");`
`440`	`443`
`441`		`-if (s !=null)`
`442`		`- {`
`443`		`-intTZ =newFloat(s.substring(19)).intValue();`
`444`		`-TZ =TZ 60 60 *1000;`
`445`		`-TimeZonezone =TimeZone.getDefault();`
`446`		`-zone.setRawOffset(TZ);`
`447`		`-Stringnm =zone.getID();`
`448`		`-s =s.substring(0,19) +nm;`
`449`		`-try {`
`450`		`-java.util.Dated =df.parse(s);`
`451`		`-returnnewTimestamp(d.getTime());`
`452`		`-}catch (ParseExceptione) {`
`453`		`-thrownewPSQLException("postgresql.res.badtimestamp",newInteger(e.getErrorOffset()),s);`
`454`		`-}`
`455`		`- }`
`456`		`-returnnull;// SQL NULL`
	`444`	`+try {`
	`445`	`+returnnewTimestamp(df.parse(s).getTime());`
	`446`	`+ }catch(ParseExceptione) {`
	`447`	`+thrownewPSQLException("postgresql.res.badtimestamp",newInteger(e.getErrorOffset()),s);`
	`448`	`+ }`
`457`	`449`	`}`
`458`	`450`
`459`	`451`	`/**`

Comments

(0)