Commitd5d23dd

committed

Allow jdbc to return proper server version number

Anders Bengtsson

1 parent9d5098c commitd5d23ddCopy full SHA for d5d23dd

File tree

+16

-16

lines changed

src/interfaces/jdbc/org/postgresql
- jdbc1
  - DatabaseMetaData.java
- jdbc2
  - DatabaseMetaData.java

+16

-16

lines changed

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -167,19 +167,19 @@ public String getDatabaseProductName() throws SQLException`
`167`	`167`	`/**`
`168`	`168`	`* What is the version of this database product.`
`169`	`169`	`*`
`170`		`- * <p>Note that PostgreSQL 6.3 has a system catalog called pg_version -`
`171`		`- * however, select * from pg_version on any database retrieves`
`172`		`- * no rows.`
`173`		`- *`
`174`		`- * <p>For now, we will return the version 6.3 (in the hope that we change`
`175`		`- * this driver as often as we change the database)`
`176`		`- *`
`177`	`170`	`* @return the database version`
`178`	`171`	`* @exception SQLException if a database access error occurs`
`179`	`172`	`*/`
`180`	`173`	`publicStringgetDatabaseProductVersion()throwsSQLException`
`181`	`174`	`{`
`182`		`-returnconnection.this_driver.getVersion();`
	`175`	`+java.sql.ResultSetresultSet =connection.ExecSQL("select version()");`
	`176`	`+resultSet.next();`
	`177`	`+`
	`178`	`+StringTokenizerversionParts =newStringTokenizer(resultSet.getString(1));`
	`179`	`+versionParts.nextToken();/* "PostgreSQL" */`
	`180`	`+StringversionNumber =versionParts.nextToken();/* "X.Y.Z" */`
	`181`	`+`
	`182`	`+returnversionNumber;`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`/**`

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -167,19 +167,19 @@ public String getDatabaseProductName() throws SQLException`
`167`	`167`	`/**`
`168`	`168`	`* What is the version of this database product.`
`169`	`169`	`*`
`170`		`- * <p>Note that PostgreSQL 6.3 has a system catalog called pg_version -`
`171`		`- * however, select * from pg_version on any database retrieves`
`172`		`- * no rows.`
`173`		`- *`
`174`		`- * <p>For now, we will return the version 6.3 (in the hope that we change`
`175`		`- * this driver as often as we change the database)`
`176`		`- *`
`177`	`170`	`* @return the database version`
`178`	`171`	`* @exception SQLException if a database access error occurs`
`179`	`172`	`*/`
`180`	`173`	`publicStringgetDatabaseProductVersion()throwsSQLException`
`181`	`174`	`{`
`182`		`-returnconnection.this_driver.getVersion();`
	`175`	`+java.sql.ResultSetresultSet =connection.ExecSQL("select version()");`
	`176`	`+resultSet.next();`
	`177`	`+`
	`178`	`+StringTokenizerversionParts =newStringTokenizer(resultSet.getString(1));`
	`179`	`+versionParts.nextToken();/* "PostgreSQL" */`
	`180`	`+StringversionNumber =versionParts.nextToken();/* "X.Y.Z" */`
	`181`	`+`
	`182`	`+returnversionNumber;`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`/**`

Comments

(0)