|
|
|
|
@ -629,7 +629,7 @@ RangeVarAdjustRelationPersistence(RangeVar *newRelation, Oid nspid) |
|
|
|
|
switch (newRelation->relpersistence) |
|
|
|
|
{ |
|
|
|
|
case RELPERSISTENCE_TEMP: |
|
|
|
|
if (!isTempOrToastNamespace(nspid)) |
|
|
|
|
if (!isTempOrTempToastNamespace(nspid)) |
|
|
|
|
{ |
|
|
|
|
if (isAnyTempNamespace(nspid)) |
|
|
|
|
ereport(ERROR, |
|
|
|
|
@ -642,7 +642,7 @@ RangeVarAdjustRelationPersistence(RangeVar *newRelation, Oid nspid) |
|
|
|
|
} |
|
|
|
|
break; |
|
|
|
|
case RELPERSISTENCE_PERMANENT: |
|
|
|
|
if (isTempOrToastNamespace(nspid)) |
|
|
|
|
if (isTempOrTempToastNamespace(nspid)) |
|
|
|
|
newRelation->relpersistence = RELPERSISTENCE_TEMP; |
|
|
|
|
else if (isAnyTempNamespace(nspid)) |
|
|
|
|
ereport(ERROR, |
|
|
|
|
@ -2992,11 +2992,11 @@ isTempToastNamespace(Oid namespaceId) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* isTempOrToastNamespace - is the given namespace my temporary-table |
|
|
|
|
* isTempOrTempToastNamespace - is the given namespace my temporary-table |
|
|
|
|
* namespace or my temporary-toast-table namespace? |
|
|
|
|
*/ |
|
|
|
|
bool |
|
|
|
|
isTempOrToastNamespace(Oid namespaceId) |
|
|
|
|
isTempOrTempToastNamespace(Oid namespaceId) |
|
|
|
|
{ |
|
|
|
|
if (OidIsValid(myTempNamespace) && |
|
|
|
|
(myTempNamespace == namespaceId || myTempToastNamespace == namespaceId)) |
|
|
|
|
@ -3036,7 +3036,7 @@ bool |
|
|
|
|
isOtherTempNamespace(Oid namespaceId) |
|
|
|
|
{ |
|
|
|
|
/* If it's my own temp namespace, say "false" */ |
|
|
|
|
if (isTempOrToastNamespace(namespaceId)) |
|
|
|
|
if (isTempOrTempToastNamespace(namespaceId)) |
|
|
|
|
return false; |
|
|
|
|
/* Else, if it's any temp namespace, say "true" */ |
|
|
|
|
return isAnyTempNamespace(namespaceId); |
|
|
|
|
|