*** ex5/lib/pgmetadata.inc.orig	2002-07-04 18:25:33.000000000 +0900
--- ex5/lib/pgmetadata.inc	2004-03-04 17:36:09.000000000 +0900
***************
*** 73,79 ****
  	  obj_description(p.oid) as description
  	  FROM pg_proc p, pg_type t0, pg_type t1, pg_type t2,pg_operator o 
  	  WHERE t1.typname = '$typename'
! 	  AND p.prorettype = t0.oid AND RegprocToOid(o.oprcode) = p.oid
  	  AND p.pronargs = 2 AND o.oprleft = t1.oid AND o.oprright = t2.oid
  	  AND t0.typname = 'bool' AND t1.typname = t2.typname
  EOF;
--- 73,79 ----
  	  obj_description(p.oid) as description
  	  FROM pg_proc p, pg_type t0, pg_type t1, pg_type t2,pg_operator o 
  	  WHERE t1.typname = '$typename'
! 	  AND p.prorettype = t0.oid AND o.oprcode = p.oid
  	  AND p.pronargs = 2 AND o.oprleft = t1.oid AND o.oprright = t2.oid
  	  AND t0.typname = 'bool' AND t1.typname = t2.typname
  EOF;
*** ex6/lib/pgmetadata.inc.orig	2002-07-04 18:26:02.000000000 +0900
--- ex6/lib/pgmetadata.inc	2004-03-04 22:48:44.000000000 +0900
***************
*** 81,87 ****
  	  obj_description(p.oid) as description
  	  FROM pg_proc p, pg_type t0, pg_type t1, pg_type t2,pg_operator o 
  	  WHERE t1.typname = '$typename'
! 	  AND p.prorettype = t0.oid AND RegprocToOid(o.oprcode) = p.oid
  	  AND p.pronargs = 2 AND o.oprleft = t1.oid AND o.oprright = t2.oid
  	  AND t0.typname = 'bool' AND t1.typname = t2.typname
  EOF;
--- 81,87 ----
  	  obj_description(p.oid) as description
  	  FROM pg_proc p, pg_type t0, pg_type t1, pg_type t2,pg_operator o 
  	  WHERE t1.typname = '$typename'
! 	  AND p.prorettype = t0.oid AND o.oprcode = p.oid
  	  AND p.pronargs = 2 AND o.oprleft = t1.oid AND o.oprright = t2.oid
  	  AND t0.typname = 'bool' AND t1.typname = t2.typname
  EOF;
***************
*** 99,105 ****
    // 制約に関する情報の取得
    function getConstraint() {
      $sql = <<< EOF
!       SELECT rcname,rcsrc FROM pg_relcheck WHERE rcrelid = '$this->table_oid'
  EOF;
      $result = $this->db->doQuery($sql);	// selectを実行
      $rows = pg_num_rows($result);
--- 99,105 ----
    // 制約に関する情報の取得
    function getConstraint() {
      $sql = <<< EOF
!       SELECT conname,consrc FROM pg_constraint WHERE conrelid = '$this->table_oid'
  EOF;
      $result = $this->db->doQuery($sql);	// selectを実行
      $rows = pg_num_rows($result);
***************
*** 112,119 ****
  
      // 連想配列に制約名と制約値を格納
      for ($i=0;$i<$rows;$i++) {
!       $constraints[$i]["rcname"] = pg_fetch_result($result,$i,"rcname");	// 制約名
!       $constraints[$i]["rcsrc"] = pg_fetch_result($result,$i,"rcsrc");	// 制約
      }
      pg_free_result($result);
  
--- 112,119 ----
  
      // 連想配列に制約名と制約値を格納
      for ($i=0;$i<$rows;$i++) {
!       $constraints[$i]["rcname"] = pg_fetch_result($result,$i,"conname");	// 制約名
!       $constraints[$i]["rcsrc"] = pg_fetch_result($result,$i,"consrc");	// 制約
      }
      pg_free_result($result);