Commita7eba9c

committed

DatabaseMetaData.getColumns() doesn't appear to get the default

value for each column. Here is a context diff of CVS which shouldfix it.Jason Davies

1 parenteec08cd commita7eba9cCopy full SHA for a7eba9c

File tree

-4

lines changed

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

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1936,7 +1936,7 @@ public java.sql.ResultSet getColumns(String catalog, String schemaPattern, Strin`
`1936`	`1936`
`1937`	`1937`	`// Now form the query`
`1938`	`1938`	`// Modified by Stefan Andreasen <stefan@linux.kapow.dk>`
`1939`		`-r =connection.ExecSQL("select a.oid,c.relname,a.attname,a.atttypid,a.attnum,a.attnotnull,a.attlen,a.atttypmod from pg_class c,pg_attribute awhere a.attrelid=c.oid and c.relname like '"+tableNamePattern.toLowerCase()+"' and a.attname like '"+columnNamePattern.toLowerCase()+"' and a.attnum>0 order by c.relname,a.attnum");`
	`1939`	`+r =connection.ExecSQL("select a.oid,c.relname,a.attname,a.atttypid,a.attnum,a.attnotnull,a.attlen,a.atttypmod,d.adsrc from pg_class c,pg_attribute a,pg_attrdef dwhere a.attrelid=c.oid and c.relname like '"+tableNamePattern.toLowerCase()+"' and a.attname like '"+columnNamePattern.toLowerCase()+"' and a.attnum>0 and c.oid=d.adrelid and d.adnum=a.attnum order by c.relname,a.attnum");`
`1940`	`1940`
`1941`	`1941`	`byteremarks[];`
`1942`	`1942`
`@@ -1983,7 +1983,7 @@ public java.sql.ResultSet getColumns(String catalog, String schemaPattern, Strin`
`1983`	`1983`	`// tuple[10] is below`
`1984`	`1984`	`// tuple[11] is above`
`1985`	`1985`
`1986`		`-tuple[12] =null;// column default`
	`1986`	`+tuple[12] =r.getBytes(9);// column default`
`1987`	`1987`
`1988`	`1988`	`tuple[13] =null;// sql data type (unused)`
`1989`	`1989`	`tuple[14] =null;// sql datetime sub (unused)`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1936,7 +1936,7 @@ public java.sql.ResultSet getColumns(String catalog, String schemaPattern, Strin`
`1936`	`1936`
`1937`	`1937`	`// Now form the query`
`1938`	`1938`	`// Modified by Stefan Andreasen <stefan@linux.kapow.dk>`
`1939`		`-r =connection.ExecSQL("select a.oid,c.relname,a.attname,a.atttypid,a.attnum,a.attnotnull,a.attlen,a.atttypmod from pg_class c,pg_attribute awhere a.attrelid=c.oid and c.relname like '"+tableNamePattern.toLowerCase()+"' and a.attname like '"+columnNamePattern.toLowerCase()+"' and a.attnum>0 order by c.relname,a.attnum");`
	`1939`	`+r =connection.ExecSQL("select a.oid,c.relname,a.attname,a.atttypid,a.attnum,a.attnotnull,a.attlen,a.atttypmod,d.adsrc from pg_class c,pg_attribute a,pg_attrdef dwhere a.attrelid=c.oid and c.relname like '"+tableNamePattern.toLowerCase()+"' and a.attname like '"+columnNamePattern.toLowerCase()+"' and a.attnum>0 and c.oid=d.adrelid and d.adnum=a.attnum order by c.relname,a.attnum");`
`1940`	`1940`
`1941`	`1941`	`byteremarks[];`
`1942`	`1942`
`@@ -1983,7 +1983,7 @@ public java.sql.ResultSet getColumns(String catalog, String schemaPattern, Strin`
`1983`	`1983`	`// tuple[10] is below`
`1984`	`1984`	`// tuple[11] is above`
`1985`	`1985`
`1986`		`-tuple[12] =null;// column default`
	`1986`	`+tuple[12] =r.getBytes(9);// column default`
`1987`	`1987`
`1988`	`1988`	`tuple[13] =null;// sql data type (unused)`
`1989`	`1989`	`tuple[14] =null;// sql datetime sub (unused)`

Comments

(0)