*** pgsql/src/backend/commands/foreigncmds.c	2008/12/19 16:25:17	1.1
--- pgsql/src/backend/commands/foreigncmds.c	2008/12/20 09:40:56	1.2
***************
*** 7,13 ****
   *
   *
   * IDENTIFICATION
!  *	  $PostgreSQL$
   *
   *-------------------------------------------------------------------------
   */
--- 7,13 ----
   *
   *
   * IDENTIFICATION
!  *	  $PostgreSQL: pgsql/src/backend/commands/foreigncmds.c,v 1.1 2008/12/19 16:25:17 petere Exp $
   *
   *-------------------------------------------------------------------------
   */
*************** CreateForeignDataWrapper(CreateFdwStmt *
*** 316,322 ****
  	bool			nulls[Natts_pg_foreign_data_wrapper];
  	HeapTuple		tuple;
  	Oid				fdwId;
! 	Datum			fdwoptions = InvalidOid;
  	Oid				ownerId;
  	ForeignDataWrapperLibrary  *fdwlib;
  
--- 316,322 ----
  	bool			nulls[Natts_pg_foreign_data_wrapper];
  	HeapTuple		tuple;
  	Oid				fdwId;
! 	Datum			fdwoptions;
  	Oid				ownerId;
  	ForeignDataWrapperLibrary  *fdwlib;
  
*************** CreateForeignDataWrapper(CreateFdwStmt *
*** 362,368 ****
  	fdwoptions = transformGenericOptions(0, stmt->options, FdwOpt, NULL,
  										 fdwlib->validateOptionList);
  
! 	if (OidIsValid(fdwoptions))
  		values[Anum_pg_foreign_data_wrapper_fdwoptions - 1] = fdwoptions;
  	else
  		nulls[Anum_pg_foreign_data_wrapper_fdwoptions - 1] = true;
--- 362,368 ----
  	fdwoptions = transformGenericOptions(0, stmt->options, FdwOpt, NULL,
  										 fdwlib->validateOptionList);
  
! 	if (PointerIsValid(DatumGetPointer(fdwoptions)))
  		values[Anum_pg_foreign_data_wrapper_fdwoptions - 1] = fdwoptions;
  	else
  		nulls[Anum_pg_foreign_data_wrapper_fdwoptions - 1] = true;
*************** AlterForeignDataWrapper(AlterFdwStmt *st
*** 465,471 ****
  		datum = transformGenericOptions(datum, stmt->options, FdwOpt,
  										NULL, fdwlib->validateOptionList);
  
! 		if (OidIsValid(datum))
  			repl_val[Anum_pg_foreign_data_wrapper_fdwoptions - 1] = ObjectIdGetDatum(datum);
  		else
  			repl_null[Anum_pg_foreign_data_wrapper_fdwoptions - 1] = true;
--- 465,471 ----
  		datum = transformGenericOptions(datum, stmt->options, FdwOpt,
  										NULL, fdwlib->validateOptionList);
  
! 		if (PointerIsValid(DatumGetPointer(datum)))
  			repl_val[Anum_pg_foreign_data_wrapper_fdwoptions - 1] = ObjectIdGetDatum(datum);
  		else
  			repl_null[Anum_pg_foreign_data_wrapper_fdwoptions - 1] = true;
*************** void
*** 565,571 ****
  CreateForeignServer(CreateForeignServerStmt *stmt)
  {
  	Relation		rel;
! 	Datum			srvoptions = InvalidOid;
  	Datum			values[Natts_pg_foreign_server];
  	bool			nulls[Natts_pg_foreign_server];
  	HeapTuple		tuple;
--- 565,571 ----
  CreateForeignServer(CreateForeignServerStmt *stmt)
  {
  	Relation		rel;
! 	Datum			srvoptions;
  	Datum			values[Natts_pg_foreign_server];
  	bool			nulls[Natts_pg_foreign_server];
  	HeapTuple		tuple;
*************** CreateForeignServer(CreateForeignServerS
*** 631,637 ****
  	srvoptions = transformGenericOptions(0, stmt->options, ServerOpt, fdw,
  										 fdw->lib->validateOptionList);
  
! 	if (OidIsValid(srvoptions))
  		values[Anum_pg_foreign_server_srvoptions - 1] = srvoptions;
  	else
  		nulls[Anum_pg_foreign_server_srvoptions - 1] = true;
--- 631,637 ----
  	srvoptions = transformGenericOptions(0, stmt->options, ServerOpt, fdw,
  										 fdw->lib->validateOptionList);
  
! 	if (PointerIsValid(DatumGetPointer(srvoptions)))
  		values[Anum_pg_foreign_server_srvoptions - 1] = srvoptions;
  	else
  		nulls[Anum_pg_foreign_server_srvoptions - 1] = true;
*************** AlterForeignServer(AlterForeignServerStm
*** 727,733 ****
  		datum = transformGenericOptions(datum, stmt->options, ServerOpt,
  										fdw, fdw->lib->validateOptionList);
  
! 		if (OidIsValid(datum))
  			repl_val[Anum_pg_foreign_server_srvoptions - 1] = datum;
  		else
  			repl_null[Anum_pg_foreign_server_srvoptions - 1] = true;
--- 727,733 ----
  		datum = transformGenericOptions(datum, stmt->options, ServerOpt,
  										fdw, fdw->lib->validateOptionList);
  
! 		if (PointerIsValid(DatumGetPointer(datum)))
  			repl_val[Anum_pg_foreign_server_srvoptions - 1] = datum;
  		else
  			repl_null[Anum_pg_foreign_server_srvoptions - 1] = true;
*************** void
*** 822,828 ****
  CreateUserMapping(CreateUserMappingStmt *stmt)
  {
  	Relation			rel;
! 	Datum				useoptions = InvalidOid;
  	Datum				values[Natts_pg_user_mapping];
  	bool				nulls[Natts_pg_user_mapping];
  	HeapTuple			tuple;
--- 822,828 ----
  CreateUserMapping(CreateUserMappingStmt *stmt)
  {
  	Relation			rel;
! 	Datum				useoptions;
  	Datum				values[Natts_pg_user_mapping];
  	bool				nulls[Natts_pg_user_mapping];
  	HeapTuple			tuple;
*************** CreateUserMapping(CreateUserMappingStmt
*** 877,883 ****
  	useoptions = transformGenericOptions(0, stmt->options, UserMappingOpt,
  										 fdw, fdw->lib->validateOptionList);
  
! 	if (OidIsValid(useoptions))
  		values[Anum_pg_user_mapping_umoptions - 1] = useoptions;
  	else
  		nulls[Anum_pg_user_mapping_umoptions - 1] = true;
--- 877,883 ----
  	useoptions = transformGenericOptions(0, stmt->options, UserMappingOpt,
  										 fdw, fdw->lib->validateOptionList);
  
! 	if (PointerIsValid(DatumGetPointer(useoptions)))
  		values[Anum_pg_user_mapping_umoptions - 1] = useoptions;
  	else
  		nulls[Anum_pg_user_mapping_umoptions - 1] = true;
*************** AlterUserMapping(AlterUserMappingStmt *s
*** 977,983 ****
  		datum = transformGenericOptions(datum, stmt->options, UserMappingOpt,
  										fdw, fdw->lib->validateOptionList);
  
! 		if (OidIsValid(datum))
  			repl_val[Anum_pg_user_mapping_umoptions - 1] = datum;
  		else
  			repl_null[Anum_pg_user_mapping_umoptions - 1] = true;
--- 977,983 ----
  		datum = transformGenericOptions(datum, stmt->options, UserMappingOpt,
  										fdw, fdw->lib->validateOptionList);
  
! 		if (PointerIsValid(DatumGetPointer(datum)))
  			repl_val[Anum_pg_user_mapping_umoptions - 1] = datum;
  		else
  			repl_null[Anum_pg_user_mapping_umoptions - 1] = true;