Commit 541e601

committed

Add support for locale and encoding, fix #406

1 parent 83c71ac commit 541e601Copy full SHA for 541e601

File tree

+27

-1

lines changed

+27

-1

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -74,6 +74,13 @@ initialization by passing `-e VAR=VALUE` to the Docker run command.
`74`	`74`	`POSTGRESQL_ADMIN_PASSWORD`
`75`	`75`	Password for the `postgres` admin account (optional)
`76`	`76`
	`77`	`+The following environment variables are optional, and only used when the database is initialzed`
	`78`	`+`
	`79`	+`POSTGRESQL_ENCODING`
	`80`	`+ Database encoding. Default to utf8`
	`81`	`+`
	`82`	+`POSTGRESQL_LOCALE`
	`83`	`+ Database locale. Default to en_US`
`77`	`84`
`78`	`85`	`Alternatively, the following options are related to migration scenario:`
`79`	`86`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,9 @@ initdb_wrapper ()`
`190`	`190`	`# Initialize the database cluster with utf8 support enabled by default.`
`191`	`191`	`# This might affect performance, see:`
`192`	`192`	`# http://www.postgresql.org/docs/{{ spec.version }}/static/locale.html`
`193`		`- LANG=${LANG:-en_US.utf8} "$@"`
	`193`	`+ ENCODING=${POSTGRESQL_ENCODING:-utf8}`
	`194`	`+ LOCALE=${POSTGRESQL_LOCALE:-en_US}`
	`195`	`+ LANG=${LANG:-$LOCALE.$ENCODING} "$@"`
`194`	`196`	`}`
`195`	`197`
`196`	`198`	`function initialize_database() {`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ run_s2i_enable_ssl_test`
`29`	`29`	`run_upgrade_test`
`30`	`30`	`run_migration_test`
`31`	`31`	`run_pgaudit_test`
	`32`	`+run_locales_test`
`32`	`33`	`"`
`33`	`34`
`34`	`35`	`test $# -eq 1 -a "${1-}" == --list && echo "$TEST_LIST" && exit 0`
`@@ -898,6 +899,22 @@ EOSQL"`
`898`	`899`	`grep -E 'AUDIT: SESSION,.,.,READ,SELECT,,,SELECT' "${data_dir}"/userdata/log/postgresql-*.log`
`899`	`900`	`}`
`900`	`901`
	`902`	`+function run_locales_test() {`
	`903`	`+ local name=pg-test-locales`
	`904`	`+ DOCKER_ARGS="-e POSTGRESQL_ENCODING=ISO_8859_6 -e POSTGRESQL_LOCALE=C" create_container $name`
	`905`	`+ wait_ready "$name"`
	`906`	`+`
	`907`	`+ docker exec -i $(get_cid "$name") bash -c "psql <<EOSQL`
	`908`	`+ SHOW SERVER_ENCODING;`
	`909`	`+EOSQL" \| grep ISO_8859_6`
	`910`	`+`
	`911`	`+ docker exec -i $(get_cid "$name") bash -c "psql <<EOSQL`
	`912`	`+ SHOW SHOW LC_COLLATE;`
	`913`	`+EOSQL" \| grep -vi LC_COLLA \| grep C`
	`914`	`+`
	`915`	`+ docker stop "$(get_cid "$name")"`
	`916`	`+}`
	`917`	`+`
`901`	`918`	`function run_all_tests() {`
`902`	`919`	`for test_case in $TEST_LIST; do`
`903`	`920`	`: "Running test $test_case"`

Comments

(0)