Skip to content

Commit 78629f9

Browse files
committed
Merge branch 'rum_arrays_v1.2'
2 parents cacbf1c + bdd83b1 commit 78629f9

File tree

7 files changed

+1123
-25
lines changed

7 files changed

+1123
-25
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ bin
1111
include
1212
lib
1313
pip-selfcheck.json
14+
regression*

‎Makefile

+8-2
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ DATA_built = rum--$(EXTVERSION).sql $(DATA_updates)
1818
INCLUDES = rum.h rumsort.h
1919
RELATIVE_INCLUDES = $(addprefix src/, $(INCLUDES))
2020

21+
LDFLAGS_SL += $(filter -lm, $(LIBS))
22+
2123
REGRESS = rum rum_hash ruminv timestamp orderby orderby_hash altorder \
2224
altorder_hash limits \
2325
int2 int4 int8 float4 float8 money oid \
2426
time timetz date interval \
2527
macaddr inet cidr text varchar char bytea bit varbit \
2628
numeric anyarray
2729

28-
LDFLAGS_SL += $(filter -lm, $(LIBS))
29-
3030
ifdef USE_PGXS
3131
PG_CONFIG = pg_config
3232
PGXS := $(shell $(PG_CONFIG) --pgxs)
@@ -38,6 +38,12 @@ include $(top_builddir)/src/Makefile.global
3838
include $(top_srcdir)/contrib/contrib-global.mk
3939
endif
4040

41+
ifeq ($(MAJORVERSION), 9.6)
42+
# arrays are not supported on 9.6
43+
else
44+
REGRESS += array
45+
endif
46+
4147
wal-check: temp-install
4248
$(prove_check)
4349

0 commit comments

Comments
 (0)