Skip to content

Commit 830ef42

Browse files
ItGackyItGacky
committed
work around for 9.1.
1 parent 8ec3a08 commit 830ef42

File tree

4 files changed

+29
-24
lines changed

4 files changed

+29
-24
lines changed

‎lib/pgut/pgut-be.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,9 @@ extern void tuplestore_putvalues(Tuplestorestate *state, TupleDesc tdesc,
155155

156156
#define ATExecChangeOwner(relationOid, newOwnerId, recursing, lockmode) \
157157
ATExecChangeOwner((relationOid), (newOwnerId), (recursing))
158+
#define deleteDependencyRecordsFor(classId, objectId, skipExtensionDeps) \
159+
deleteDependencyRecordsFor((classId), (objectId))
160+
158161
#endif
159162

160163
#if PG_VERSION_NUM < 80300

‎lib/reorg.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,15 +1121,17 @@ swap_heap_or_index_files(Oid r1, Oid r2)
11211121
if (relform1->reltoastrelid)
11221122
{
11231123
count = deleteDependencyRecordsFor(RelationRelationId,
1124-
relform1->reltoastrelid);
1124+
relform1->reltoastrelid,
1125+
false);
11251126
if (count != 1)
11261127
elog(ERROR, "expected one dependency record for TOAST table, found %ld",
11271128
count);
11281129
}
11291130
if (relform2->reltoastrelid)
11301131
{
11311132
count = deleteDependencyRecordsFor(RelationRelationId,
1132-
relform2->reltoastrelid);
1133+
relform2->reltoastrelid,
1134+
false);
11331135
if (count != 1)
11341136
elog(ERROR, "expected one dependency record for TOAST table, found %ld",
11351137
count);

‎msvc/bin.2010.vcxproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,17 +92,17 @@
9292
<PropertyGroup Label="UserMacros" />
9393
<PropertyGroup>
9494
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
95-
<OutDir Condition="'$(Configuration)|$(Platform)'=='9.0|Win32'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/bin/</OutDir>
95+
<OutDir Condition="'$(Configuration)|$(Platform)'=='9.0|Win32'">$(SolutionDir)/bin/x86/$(Configuration)/bin/</OutDir>
9696
<OutDir Condition="'$(Configuration)|$(Platform)'=='9.0|x64'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/bin/</OutDir>
97-
<OutDir Condition="'$(Configuration)|$(Platform)'=='8.4|Win32'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/bin/</OutDir>
97+
<OutDir Condition="'$(Configuration)|$(Platform)'=='8.4|Win32'">$(SolutionDir)/bin/x86/$(Configuration)/bin/</OutDir>
9898
<OutDir Condition="'$(Configuration)|$(Platform)'=='8.4|x64'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/bin/</OutDir>
99-
<OutDir Condition="'$(Configuration)|$(Platform)'=='8.3|Win32'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/bin/</OutDir>
99+
<OutDir Condition="'$(Configuration)|$(Platform)'=='8.3|Win32'">$(SolutionDir)/bin/x86/$(Configuration)/bin/</OutDir>
100100
<OutDir Condition="'$(Configuration)|$(Platform)'=='8.3|x64'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/bin/</OutDir>
101-
<IntDir Condition="'$(Configuration)|$(Platform)'=='9.0|Win32'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir>
101+
<IntDir Condition="'$(Configuration)|$(Platform)'=='9.0|Win32'">$(SolutionDir)/obj/x86/$(Configuration)/$(ProjectName)/</IntDir>
102102
<IntDir Condition="'$(Configuration)|$(Platform)'=='9.0|x64'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir>
103-
<IntDir Condition="'$(Configuration)|$(Platform)'=='8.4|Win32'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir>
103+
<IntDir Condition="'$(Configuration)|$(Platform)'=='8.4|Win32'">$(SolutionDir)/obj/x86/$(Configuration)/$(ProjectName)/</IntDir>
104104
<IntDir Condition="'$(Configuration)|$(Platform)'=='8.4|x64'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir>
105-
<IntDir Condition="'$(Configuration)|$(Platform)'=='8.3|Win32'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir>
105+
<IntDir Condition="'$(Configuration)|$(Platform)'=='8.3|Win32'">$(SolutionDir)/obj/x86/$(Configuration)/$(ProjectName)/</IntDir>
106106
<IntDir Condition="'$(Configuration)|$(Platform)'=='8.3|x64'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir>
107107
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='9.0|Win32'">false</LinkIncremental>
108108
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='9.0|x64'">false</LinkIncremental>
@@ -146,7 +146,7 @@
146146
<DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
147147
</ClCompile>
148148
<Link>
149-
<AdditionalDependencies>kernel32.lib;advapi32.lib;ws2_32.lib;libpq.lib;libpgport.lib;libintl-8.lib</AdditionalDependencies>
149+
<AdditionalDependencies>advapi32.lib;ws2_32.lib;libpq.lib;libpgport.lib;libintl-8.lib</AdditionalDependencies>
150150
<OutputFile>$(OutDir)/$(TargetFileName)</OutputFile>
151151
<GenerateDebugInformation>false</GenerateDebugInformation>
152152
<SubSystem>Console</SubSystem>
@@ -176,7 +176,7 @@
176176
<DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
177177
</ClCompile>
178178
<Link>
179-
<AdditionalDependencies>kernel32.lib;advapi32.lib;ws2_32.lib;libpq.lib;libpgport.lib;libintl.lib</AdditionalDependencies>
179+
<AdditionalDependencies>advapi32.lib;ws2_32.lib;libpq.lib;libpgport.lib;libintl.lib</AdditionalDependencies>
180180
<OutputFile>$(OutDir)/$(TargetFileName)</OutputFile>
181181
<GenerateDebugInformation>false</GenerateDebugInformation>
182182
<SubSystem>Console</SubSystem>
@@ -205,7 +205,7 @@
205205
<DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
206206
</ClCompile>
207207
<Link>
208-
<AdditionalDependencies>kernel32.lib;advapi32.lib;ws2_32.lib;libpq.lib;libpgport.lib;libintl-8.lib</AdditionalDependencies>
208+
<AdditionalDependencies>advapi32.lib;ws2_32.lib;libpq.lib;libpgport.lib;libintl-8.lib</AdditionalDependencies>
209209
<OutputFile>$(OutDir)/$(TargetFileName)</OutputFile>
210210
<GenerateDebugInformation>false</GenerateDebugInformation>
211211
<SubSystem>Console</SubSystem>
@@ -264,7 +264,7 @@
264264
<DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
265265
</ClCompile>
266266
<Link>
267-
<AdditionalDependencies>kernel32.lib;advapi32.lib;ws2_32.lib;libpq.lib;libpgport.lib;libintl-8.lib</AdditionalDependencies>
267+
<AdditionalDependencies>advapi32.lib;ws2_32.lib;libpq.lib;libpgport.lib;libintl-8.lib</AdditionalDependencies>
268268
<OutputFile>$(OutDir)/$(TargetFileName)</OutputFile>
269269
<GenerateDebugInformation>false</GenerateDebugInformation>
270270
<SubSystem>Console</SubSystem>

‎msvc/lib.2010.vcxproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -106,17 +106,17 @@
106106
<PropertyGroup Label="UserMacros" />
107107
<PropertyGroup>
108108
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
109-
<OutDir Condition="'$(Configuration)|$(Platform)'=='9.0|Win32'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/lib/</OutDir>
109+
<OutDir Condition="'$(Configuration)|$(Platform)'=='9.0|Win32'">$(SolutionDir)/bin/x86/$(Configuration)/lib/</OutDir>
110110
<OutDir Condition="'$(Configuration)|$(Platform)'=='9.0|x64'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/lib/</OutDir>
111-
<OutDir Condition="'$(Configuration)|$(Platform)'=='8.4|Win32'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/lib/</OutDir>
111+
<OutDir Condition="'$(Configuration)|$(Platform)'=='8.4|Win32'">$(SolutionDir)/bin/x86/$(Configuration)/lib/</OutDir>
112112
<OutDir Condition="'$(Configuration)|$(Platform)'=='8.4|x64'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/lib/</OutDir>
113-
<OutDir Condition="'$(Configuration)|$(Platform)'=='8.3|Win32'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/lib/</OutDir>
113+
<OutDir Condition="'$(Configuration)|$(Platform)'=='8.3|Win32'">$(SolutionDir)/bin/x86/$(Configuration)/lib/</OutDir>
114114
<OutDir Condition="'$(Configuration)|$(Platform)'=='8.3|x64'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/lib/</OutDir>
115-
<IntDir Condition="'$(Configuration)|$(Platform)'=='9.0|Win32'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir>
115+
<IntDir Condition="'$(Configuration)|$(Platform)'=='9.0|Win32'">$(SolutionDir)/obj/x86/$(Configuration)/$(ProjectName)/</IntDir>
116116
<IntDir Condition="'$(Configuration)|$(Platform)'=='9.0|x64'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir>
117-
<IntDir Condition="'$(Configuration)|$(Platform)'=='8.4|Win32'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir>
117+
<IntDir Condition="'$(Configuration)|$(Platform)'=='8.4|Win32'">$(SolutionDir)/obj/x86/$(Configuration)/$(ProjectName)/</IntDir>
118118
<IntDir Condition="'$(Configuration)|$(Platform)'=='8.4|x64'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir>
119-
<IntDir Condition="'$(Configuration)|$(Platform)'=='8.3|Win32'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir>
119+
<IntDir Condition="'$(Configuration)|$(Platform)'=='8.3|Win32'">$(SolutionDir)/obj/x86/$(Configuration)/$(ProjectName)/</IntDir>
120120
<IntDir Condition="'$(Configuration)|$(Platform)'=='8.3|x64'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir>
121121
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='9.0|Win32'">false</LinkIncremental>
122122
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='9.0|x64'">false</LinkIncremental>
@@ -160,7 +160,7 @@
160160
<DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
161161
</ClCompile>
162162
<Link>
163-
<AdditionalDependencies>kernel32.lib;advapi32.lib;ws2_32.lib;postgres.lib</AdditionalDependencies>
163+
<AdditionalDependencies>postgres.lib</AdditionalDependencies>
164164
<OutputFile>$(OutDir)/$(TargetFileName)</OutputFile>
165165
<GenerateDebugInformation>false</GenerateDebugInformation>
166166
<SubSystem>Console</SubSystem>
@@ -186,7 +186,7 @@
186186
<DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
187187
</ClCompile>
188188
<Link>
189-
<AdditionalDependencies>kernel32.lib;advapi32.lib;ws2_32.lib;postgres.lib</AdditionalDependencies>
189+
<AdditionalDependencies>postgres.lib</AdditionalDependencies>
190190
<OutputFile>$(OutDir)/$(TargetFileName)</OutputFile>
191191
<GenerateDebugInformation>false</GenerateDebugInformation>
192192
<SubSystem>Console</SubSystem>
@@ -211,7 +211,7 @@
211211
<DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
212212
</ClCompile>
213213
<Link>
214-
<AdditionalDependencies>kernel32.lib;advapi32.lib;ws2_32.lib;postgres.lib;libpq.lib</AdditionalDependencies>
214+
<AdditionalDependencies>postgres.lib</AdditionalDependencies>
215215
<OutputFile>$(OutDir)/$(TargetFileName)</OutputFile>
216216
<GenerateDebugInformation>false</GenerateDebugInformation>
217217
<SubSystem>Console</SubSystem>
@@ -237,7 +237,7 @@
237237
<DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
238238
</ClCompile>
239239
<Link>
240-
<AdditionalDependencies>kernel32.lib;advapi32.lib;ws2_32.lib;postgres.lib;libpq.lib</AdditionalDependencies>
240+
<AdditionalDependencies>postgres.lib</AdditionalDependencies>
241241
<OutputFile>$(OutDir)/$(TargetFileName)</OutputFile>
242242
<GenerateDebugInformation>false</GenerateDebugInformation>
243243
<SubSystem>Console</SubSystem>
@@ -262,7 +262,7 @@
262262
<DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
263263
</ClCompile>
264264
<Link>
265-
<AdditionalDependencies>kernel32.lib;advapi32.lib;ws2_32.lib;postgres.lib;libpq.lib</AdditionalDependencies>
265+
<AdditionalDependencies>postgres.lib</AdditionalDependencies>
266266
<OutputFile>$(OutDir)/$(TargetFileName)</OutputFile>
267267
<GenerateDebugInformation>false</GenerateDebugInformation>
268268
<SubSystem>Console</SubSystem>
@@ -288,7 +288,7 @@
288288
<DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
289289
</ClCompile>
290290
<Link>
291-
<AdditionalDependencies>kernel32.lib;advapi32.lib;ws2_32.lib;postgres.lib;libpq.lib</AdditionalDependencies>
291+
<AdditionalDependencies>postgres.lib</AdditionalDependencies>
292292
<OutputFile>$(OutDir)/$(TargetFileName)</OutputFile>
293293
<GenerateDebugInformation>false</GenerateDebugInformation>
294294
<SubSystem>Console</SubSystem>

0 commit comments

Comments
 (0)