Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 419400c

Browse files
committed
Remove some ancient and unmaintained encoding-conversion test cruft.
In commit 9211919 I claimed that we weren't testing encoding conversion functions, but further poking around reveals that we did have an equivalent though hard-wired set of tests in conversion.sql. AFAICS there is no advantage to doing it like that as compared to letting the catalog contents drive the test, so let the opr_sanity addition stand and remove the now-redundant tests in conversion.sql. Also, remove some infrastructure in src/backend/utils/mb/conversion_procs for building conversion.sql's list of tests. That was unmaintained, and had not corresponded to the actual contents of conversion.sql since 2007 or perhaps even further back.
1 parent 3343ea9 commit 419400c

File tree

5 files changed

+8
-1229
lines changed

5 files changed

+8
-1229
lines changed

src/backend/utils/mb/conversion_procs/Makefile

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ include $(top_builddir)/src/Makefile.global
1414

1515
SQLSCRIPT = conversion_create.sql
1616

17-
# This file can be placed as src/test/regress/sql/conversion.sql
18-
REGRESSION_SCRIPT = conversion.sql
19-
2017
SUBDIRS = \
2118
ascii_and_mic cyrillic_and_mic euc_cn_and_mic euc_jp_and_sjis \
2219
euc_kr_and_mic euc_tw_and_big5 latin2_and_win1250 latin_and_mic \
@@ -184,23 +181,6 @@ $(SQLSCRIPT): Makefile
184181
echo; \
185182
done > $@
186183

187-
$(REGRESSION_SCRIPT): Makefile
188-
@set -e; \
189-
cp regress_prolog $@; \
190-
set $(CONVERSIONS) ; \
191-
while [ "$$#" -gt 0 ] ; \
192-
do \
193-
name=$$1;shift; \
194-
se=$$1;shift; \
195-
de=$$1; shift; \
196-
func=$$1; shift; \
197-
obj=$$1; shift; \
198-
echo "-- $$se --> $$de"; \
199-
echo "SELECT CONVERT('foo' USING $$name);"; \
200-
echo "SELECT CONVERT('foo', '$$se', '$$de');"; \
201-
done >> $@; \
202-
cat regress_epilogue >> $@;
203-
204184
install: $(SQLSCRIPT) installdirs
205185
$(INSTALL_DATA) $(SQLSCRIPT) '$(DESTDIR)$(datadir)'
206186

src/backend/utils/mb/conversion_procs/regress_epilogue

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/backend/utils/mb/conversion_procs/regress_prolog

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)