|
7 | 7 | * |
8 | 8 | * |
9 | 9 | * IDENTIFICATION |
10 | | - * $PostgreSQL: pgsql/src/backend/commands/foreigncmds.c,v 1.1 2008/12/19 16:25:17 petere Exp $ |
| 10 | + * $PostgreSQL: pgsql/src/backend/commands/foreigncmds.c,v 1.2 2008/12/20 09:40:56 heikki Exp $ |
11 | 11 | * |
12 | 12 | *------------------------------------------------------------------------- |
13 | 13 | */ |
@@ -316,7 +316,7 @@ CreateForeignDataWrapper(CreateFdwStmt *stmt) |
316 | 316 | boolnulls[Natts_pg_foreign_data_wrapper]; |
317 | 317 | HeapTupletuple; |
318 | 318 | OidfdwId; |
319 | | -Datumfdwoptions=InvalidOid; |
| 319 | +Datumfdwoptions; |
320 | 320 | OidownerId; |
321 | 321 | ForeignDataWrapperLibrary*fdwlib; |
322 | 322 |
|
@@ -362,7 +362,7 @@ CreateForeignDataWrapper(CreateFdwStmt *stmt) |
362 | 362 | fdwoptions=transformGenericOptions(0,stmt->options,FdwOpt,NULL, |
363 | 363 | fdwlib->validateOptionList); |
364 | 364 |
|
365 | | -if (OidIsValid(fdwoptions)) |
| 365 | +if (PointerIsValid(DatumGetPointer(fdwoptions))) |
366 | 366 | values[Anum_pg_foreign_data_wrapper_fdwoptions-1]=fdwoptions; |
367 | 367 | else |
368 | 368 | nulls[Anum_pg_foreign_data_wrapper_fdwoptions-1]= true; |
@@ -465,7 +465,7 @@ AlterForeignDataWrapper(AlterFdwStmt *stmt) |
465 | 465 | datum=transformGenericOptions(datum,stmt->options,FdwOpt, |
466 | 466 | NULL,fdwlib->validateOptionList); |
467 | 467 |
|
468 | | -if (OidIsValid(datum)) |
| 468 | +if (PointerIsValid(DatumGetPointer(datum))) |
469 | 469 | repl_val[Anum_pg_foreign_data_wrapper_fdwoptions-1]=ObjectIdGetDatum(datum); |
470 | 470 | else |
471 | 471 | repl_null[Anum_pg_foreign_data_wrapper_fdwoptions-1]= true; |
|
565 | 565 | CreateForeignServer(CreateForeignServerStmt*stmt) |
566 | 566 | { |
567 | 567 | Relationrel; |
568 | | -Datumsrvoptions=InvalidOid; |
| 568 | +Datumsrvoptions; |
569 | 569 | Datumvalues[Natts_pg_foreign_server]; |
570 | 570 | boolnulls[Natts_pg_foreign_server]; |
571 | 571 | HeapTupletuple; |
@@ -631,7 +631,7 @@ CreateForeignServer(CreateForeignServerStmt *stmt) |
631 | 631 | srvoptions=transformGenericOptions(0,stmt->options,ServerOpt,fdw, |
632 | 632 | fdw->lib->validateOptionList); |
633 | 633 |
|
634 | | -if (OidIsValid(srvoptions)) |
| 634 | +if (PointerIsValid(DatumGetPointer(srvoptions))) |
635 | 635 | values[Anum_pg_foreign_server_srvoptions-1]=srvoptions; |
636 | 636 | else |
637 | 637 | nulls[Anum_pg_foreign_server_srvoptions-1]= true; |
@@ -727,7 +727,7 @@ AlterForeignServer(AlterForeignServerStmt *stmt) |
727 | 727 | datum=transformGenericOptions(datum,stmt->options,ServerOpt, |
728 | 728 | fdw,fdw->lib->validateOptionList); |
729 | 729 |
|
730 | | -if (OidIsValid(datum)) |
| 730 | +if (PointerIsValid(DatumGetPointer(datum))) |
731 | 731 | repl_val[Anum_pg_foreign_server_srvoptions-1]=datum; |
732 | 732 | else |
733 | 733 | repl_null[Anum_pg_foreign_server_srvoptions-1]= true; |
|
822 | 822 | CreateUserMapping(CreateUserMappingStmt*stmt) |
823 | 823 | { |
824 | 824 | Relationrel; |
825 | | -Datumuseoptions=InvalidOid; |
| 825 | +Datumuseoptions; |
826 | 826 | Datumvalues[Natts_pg_user_mapping]; |
827 | 827 | boolnulls[Natts_pg_user_mapping]; |
828 | 828 | HeapTupletuple; |
@@ -877,7 +877,7 @@ CreateUserMapping(CreateUserMappingStmt *stmt) |
877 | 877 | useoptions=transformGenericOptions(0,stmt->options,UserMappingOpt, |
878 | 878 | fdw,fdw->lib->validateOptionList); |
879 | 879 |
|
880 | | -if (OidIsValid(useoptions)) |
| 880 | +if (PointerIsValid(DatumGetPointer(useoptions))) |
881 | 881 | values[Anum_pg_user_mapping_umoptions-1]=useoptions; |
882 | 882 | else |
883 | 883 | nulls[Anum_pg_user_mapping_umoptions-1]= true; |
@@ -977,7 +977,7 @@ AlterUserMapping(AlterUserMappingStmt *stmt) |
977 | 977 | datum=transformGenericOptions(datum,stmt->options,UserMappingOpt, |
978 | 978 | fdw,fdw->lib->validateOptionList); |
979 | 979 |
|
980 | | -if (OidIsValid(datum)) |
| 980 | +if (PointerIsValid(DatumGetPointer(datum))) |
981 | 981 | repl_val[Anum_pg_user_mapping_umoptions-1]=datum; |
982 | 982 | else |
983 | 983 | repl_null[Anum_pg_user_mapping_umoptions-1]= true; |
|