Index: contrib/retep/build.xml
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/contrib/retep/build.xml,v
retrieving revision 1.5
diff -c -r1.5 build.xml
*** contrib/retep/build.xml	2001/05/16 16:20:51	1.5
--- contrib/retep/build.xml	2001/05/16 16:53:23
***************
*** 43,48 ****
--- 43,49 ----
    <target name="compile" depends="checks,prepare,warning" if="jdk1.2+">
      <javac srcdir="${src}" destdir="${dest}">
        <include name="${package}/**" />
+       <exclude name="${package}/**" unless="jdk1.2+" />
      </javac>
    </target>
  
Index: src/interfaces/jdbc/build.xml
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/interfaces/jdbc/build.xml,v
retrieving revision 1.9
diff -c -r1.9 build.xml
*** src/interfaces/jdbc/build.xml	2001/05/16 16:20:52	1.9
--- src/interfaces/jdbc/build.xml	2001/05/16 16:53:38
***************
*** 120,126 ****
      <javac srcdir="${src}" destdir="${dest}">
        <include name="example/**" />
        <exclude name="example/corba/**"/>
!       <exclude name="example/blobtest.java" unless="jdk1.2+" />
      </javac>
    </target>
  
--- 120,126 ----
      <javac srcdir="${src}" destdir="${dest}">
        <include name="example/**" />
        <exclude name="example/corba/**"/>
!       <exclude name="example/blobtest.java" unless="jdk1.2+"/>
      </javac>
    </target>
  
Index: src/interfaces/jdbc/org/postgresql/jdbc1/ResultSetMetaData.java
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/ResultSetMetaData.java,v
retrieving revision 1.1
diff -c -r1.1 ResultSetMetaData.java
*** src/interfaces/jdbc/org/postgresql/jdbc1/ResultSetMetaData.java	2000/04/17 20:07:48	1.1
--- src/interfaces/jdbc/org/postgresql/jdbc1/ResultSetMetaData.java	2001/05/16 16:53:40
***************
*** 290,295 ****
--- 290,301 ----
  	return 16;
        case Types.VARCHAR:
  	return 0;
+       case Types.NUMERIC:
+ 	Field f = getField(column);
+ 	if(f != null)
+         	return ((0xFFFF0000)&f.mod)>>16;
+ 	else
+ 		return 0;
        default:
  	return 0;
        }
***************
*** 321,326 ****
--- 327,338 ----
  	return 16;
        case Types.VARCHAR:
  	return 0;
+       case Types.NUMERIC:
+ 	Field f = getField(column);
+ 	if(f != null)
+ 		return (((0x0000FFFF)&f.mod)-4);
+ 	else
+ 		return 0;
        default:
  	return 0;
        }
Index: src/interfaces/jdbc/org/postgresql/jdbc2/ResultSetMetaData.java
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc2/ResultSetMetaData.java,v
retrieving revision 1.1
diff -c -r1.1 ResultSetMetaData.java
*** src/interfaces/jdbc/org/postgresql/jdbc2/ResultSetMetaData.java	2000/04/17 20:07:51	1.1
--- src/interfaces/jdbc/org/postgresql/jdbc2/ResultSetMetaData.java	2001/05/16 16:53:40
***************
*** 285,290 ****
--- 285,296 ----
  	return 16;
        case Types.VARCHAR:
  	return 0;
+       case Types.NUMERIC:
+ 	Field f = getField(column);
+ 	if(f != null)
+         	return ((0xFFFF0000)&f.mod)>>16;
+ 	else
+ 		return 0;
        default:
  	return 0;
        }
***************
*** 316,321 ****
--- 322,333 ----
  	return 16;
        case Types.VARCHAR:
  	return 0;
+       case Types.NUMERIC:
+ 	Field f = getField(column);
+ 	if(f != null)
+ 		return (((0x0000FFFF)&f.mod)-4);
+ 	else
+ 		return 0;
        default:
  	return 0;
        }