Commit32bab2d

committed

Merge branch 'rel_future_beta' into rel_future_ri, fix conflicts

2 parents4792314 +d13e38f commit32bab2dCopy full SHA for 32bab2d

File tree

+1999

-1532

lines changed

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

+1999

-1532

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"name":"pg_pathman",`
`3`	`3`	`"abstract":"Partitioning tool",`
`4`	`4`	"description":"The `pg_pathman` module provides optimized partitioning mechanism and functions to manage partitions.",
`5`		`-"version":"1.3.1",`
	`5`	`+"version":"1.3.2",`
`6`	`6`	`"maintainer": [`
`7`	`7`	`"Ildar Musin <i.musin@postgrespro.ru>",`
`8`	`8`	`"Dmitry Ivanov <d.ivanov@postgrespro.ru>",`
`@@ -24,7 +24,7 @@`
`24`	`24`	`"pg_pathman": {`
`25`	`25`	`"file":"pg_pathman--1.3.sql",`
`26`	`26`	`"docfile":"README.md",`
`27`		`-"version":"1.3.1",`
	`27`	`+"version":"1.3.2",`
`28`	`28`	`"abstract":"Partitioning tool"`
`29`	`29`	`}`
`30`	`30`	`},`

Lines changed: 9 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,21 +31,21 @@ REGRESS = pathman_basic \`
`31`	`31`	`pathman_column_type\`
`32`	`32`	`pathman_cte\`
`33`	`33`	`pathman_domains\`
	`34`	`+ pathman_expressions\`
`34`	`35`	`pathman_foreign_keys\`
`35`	`36`	`pathman_inserts\`
`36`	`37`	`pathman_interval\`
`37`	`38`	`pathman_join_clause\`
`38`	`39`	`pathman_lateral\`
	`40`	`+ pathman_mergejoin\`
`39`	`41`	`pathman_only\`
`40`	`42`	`pathman_permissions\`
	`43`	`+ pathman_ri\`
`41`	`44`	`pathman_rowmarks\`
`42`	`45`	`pathman_runtime_nodes\`
`43`	`46`	`pathman_update_trigger\`
`44`	`47`	`pathman_updates\`
`45`		`- pathman_utility_stmt\`
`46`		`- pathman_calamity\`
`47`		`- pathman_ri\`
`48`		`- pathman_expressions`
	`48`	`+ pathman_utility_stmt`
`49`	`49`
`50`	`50`	`EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/conf.add`
`51`	`51`
`@@ -76,5 +76,9 @@ isolationcheck: \| submake-isolation`
`76`	`76`	`--temp-config=$(top_srcdir)/$(subdir)/conf.add\`
`77`	`77`	`--outputdir=./isolation_output\`
`78`	`78`	`$(ISOLATIONCHECKS)`
`79`		`-partitioning_tests:`
	`79`	`+`
	`80`	`+python_tests:`
`80`	`81`	`$(MAKE) -C tests/python partitioning_tests`
	`82`	`+`
	`83`	`+cmocka_tests:`
	`84`	`+$(MAKE) -C tests/cmocka check`

Comments

(0)