Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitdb202ed

Browse files
authored
Merge pull request#47 from postgrespro/PGPRO-8144
Fixes in Makefile
2 parents277fbbe +2694842 commitdb202ed

10 files changed

+27
-10
lines changed

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pg_query_state is released under the PostgreSQL License, a liberal Open Source license, similar to the BSD or MIT licenses.
22

3-
Copyright (c) 2016-2019, Postgres Professional
3+
Copyright (c) 2016-2023, Postgres Professional
44
Portions Copyright (c) 1996-2019, PostgreSQL Global Development Group
55
Portions Copyright (c) 1994, The Regents of the University of California
66

‎Makefile

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,20 @@ EXTVERSION = 1.1
88
DATA = pg_query_state--1.0--1.1.sql
99
DATA_built =$(EXTENSION)--$(EXTVERSION).sql
1010
PGFILEDESC = "pg_query_state - facility to track progress of plan execution"
11-
EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/test.conf
11+
1212
EXTRA_CLEAN = ./isolation_output$(EXTENSION)--$(EXTVERSION).sql\
1313
Dockerfile ./tests/*.pyc ./tmp_stress
1414

15+
ISOLATION = corner_cases
16+
#
17+
# PG11 doesn't support ISOLATION_OPTS variable. We have to use
18+
# "CREATE/DROP EXTENTION" command in spec.
19+
#
20+
# One day, when we'll get rid of PG11, it will be possible to uncomment this
21+
# variable and remove "CREATE EXTENTION" from spec.
22+
#
23+
# ISOLATION_OPTS = --load-extension=pg_query_state
24+
1525
ifdefUSE_PGXS
1626
PG_CONFIG ?= pg_config
1727
PGXS :=$(shell$(PG_CONFIG) --pgxs)
@@ -21,11 +31,17 @@ subdir = contrib/pg_query_state
2131
top_builddir = ../..
2232
include$(top_builddir)/src/Makefile.global
2333
include$(top_srcdir)/contrib/contrib-global.mk
34+
# need this to provide make check in case of "in source" build
35+
EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/test.conf
2436
endif
2537

2638
$(EXTENSION)--$(EXTVERSION).sql: init.sql
2739
cat$^>$@
2840

41+
#
42+
# Make conditional targets to save backward compatibility with PG11.
43+
#
44+
ifeq ($(MAJORVERSION),11)
2945
ISOLATIONCHECKS = corner_cases
3046

3147
check: isolationcheck
@@ -46,3 +62,4 @@ submake-isolation:
4662
$(MAKE) -C$(top_builddir)/src/test/isolation all
4763

4864
temp-install: EXTRA_INSTALL=contrib/pg_query_state
65+
endif

‎pg_query_state.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* pg_query_state.c
33
*Extract information about query state from other backend
44
*
5-
* Copyright (c) 2016-2016, Postgres Professional
5+
* Copyright (c) 2016-2023, Postgres Professional
66
*
77
* contrib/pg_query_state/pg_query_state.c
88
* IDENTIFICATION

‎pg_query_state.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* pg_query_state.h
33
*Headers for pg_query_state extension.
44
*
5-
* Copyright (c) 2016-2016, Postgres Professional
5+
* Copyright (c) 2016-2023, Postgres Professional
66
*
77
* IDENTIFICATION
88
* contrib/pg_query_state/pg_query_state.h

‎run_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
#
4-
# Copyright (c) 2019, Postgres Professional
4+
# Copyright (c) 2019-2023, Postgres Professional
55
#
66
# supported levels:
77
#* standard

‎signal_handler.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* signal_handler.c
33
*Collect current query state and send it to requestor in custom signal handler
44
*
5-
* Copyright (c) 2016-2016, Postgres Professional
5+
* Copyright (c) 2016-2023, Postgres Professional
66
*
77
* IDENTIFICATION
88
* contrib/pg_query_state/signal_handler.c

‎tests/common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'''
22
common.py
3-
Copyright (c) 2016-2020, Postgres Professional
3+
Copyright (c) 2016-2023, Postgres Professional
44
'''
55

66
importpsycopg2

‎tests/pg_qs_test_runner.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'''
22
pg_qs_test_runner.py
3-
Copyright (c) 2016-2021, Postgres Professional
3+
Copyright (c) 2016-2023, Postgres Professional
44
'''
55

66
importargparse

‎tests/test_cases.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'''
22
test_cases.py
3-
Copyright (c) 2016-2021, Postgres Professional
3+
Copyright (c) 2016-2023, Postgres Professional
44
'''
55

66
importjson

‎tests/tpcds.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'''
22
test_cases.py
3-
Copyright (c) 2016-2020, Postgres Professional
3+
Copyright (c) 2016-2023, Postgres Professional
44
'''
55

66
importos

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp