From 91bdea2817f496bb69a8db9b5f1465ebc17aac52 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Thu, 9 Jun 2005 11:03:06 +0000 Subject: [PATCH] use "pgsql" instead of "postgres" for consistency with the directory names in servers/slapd/back-sql/rdbms_depend --- servers/slapd/back-sql/rdbms_depend/README | 2 +- tests/data/slapd-sql-syncrepl-master.conf | 8 ++++---- tests/data/slapd-sql.conf | 8 ++++---- tests/scripts/sql-all | 2 +- tests/scripts/sql-test900-write | 2 +- tests/scripts/sql-test901-syncrepl | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/servers/slapd/back-sql/rdbms_depend/README b/servers/slapd/back-sql/rdbms_depend/README index 876b31c0ac..65af67a196 100644 --- a/servers/slapd/back-sql/rdbms_depend/README +++ b/servers/slapd/back-sql/rdbms_depend/README @@ -120,7 +120,7 @@ example=> 3.1.5) Run the test: [root@localhost]# cd $SOURCES/tests -[root@localhost]# SLAPD_USE_SQL=postgres ./run test031 +[root@localhost]# SLAPD_USE_SQL=pgsql ./run test031 3.2) MySQL diff --git a/tests/data/slapd-sql-syncrepl-master.conf b/tests/data/slapd-sql-syncrepl-master.conf index 4c3b65d70c..033b89a99b 100644 --- a/tests/data/slapd-sql-syncrepl-master.conf +++ b/tests/data/slapd-sql-syncrepl-master.conf @@ -63,10 +63,10 @@ dbpasswd secret #ibmdb2#insentry_stmt "insert into ldap_entries (id,dn,oc_map_id,parent,keyval) values ((select case when max(id) is null then 1 else max(id) + 1 end from ldap_entries),?,?,?,?)" # # PostgreSQL -#postgres#insentry_stmt "insert into ldap_entries (id,dn,oc_map_id,parent,keyval) values ((select case when max(id) is null then 1 else max(id) + 1 end from ldap_entries),?,?,?,?)" -#postgres#upper_func "upper" -#postgres#strcast_func "text" -#postgres#concat_pattern "?||?" +#pgsql#insentry_stmt "insert into ldap_entries (id,dn,oc_map_id,parent,keyval) values ((select case when max(id) is null then 1 else max(id) + 1 end from ldap_entries),?,?,?,?)" +#pgsql#upper_func "upper" +#pgsql#strcast_func "text" +#pgsql#concat_pattern "?||?" # # MySQL #mysql#concat_pattern "concat(?,?)" diff --git a/tests/data/slapd-sql.conf b/tests/data/slapd-sql.conf index 3d3adacb6e..08facd1f9e 100644 --- a/tests/data/slapd-sql.conf +++ b/tests/data/slapd-sql.conf @@ -63,10 +63,10 @@ dbpasswd secret #ibmdb2#insentry_stmt "insert into ldap_entries (id,dn,oc_map_id,parent,keyval) values ((select case when max(id) is null then 1 else max(id) + 1 end from ldap_entries),?,?,?,?)" # # PostgreSQL -#postgres#insentry_stmt "insert into ldap_entries (id,dn,oc_map_id,parent,keyval) values ((select case when max(id) is null then 1 else max(id) + 1 end from ldap_entries),?,?,?,?)" -#postgres#upper_func "upper" -#postgres#strcast_func "text" -#postgres#concat_pattern "?||?" +#pgsql#insentry_stmt "insert into ldap_entries (id,dn,oc_map_id,parent,keyval) values ((select case when max(id) is null then 1 else max(id) + 1 end from ldap_entries),?,?,?,?)" +#pgsql#upper_func "upper" +#pgsql#strcast_func "text" +#pgsql#concat_pattern "?||?" # # MySQL #mysql#concat_pattern "concat(?,?)" diff --git a/tests/scripts/sql-all b/tests/scripts/sql-all index 47d13e1d6a..95a5a6dbcd 100755 --- a/tests/scripts/sql-all +++ b/tests/scripts/sql-all @@ -31,7 +31,7 @@ echo "###" echo "### Set SLAPD_USE_SQL to the desired RDBMS to enable this test;" echo "###" echo "### Currently supported RDBMSes are:" -echo "### ibmdb2, mysql, postgres" +echo "### ibmdb2, mysql, pgsql" echo "###" echo "### Set SLAPD_USE_SQLWRITE=yes to enable the write tests" echo "###" diff --git a/tests/scripts/sql-test900-write b/tests/scripts/sql-test900-write index 549b79b97b..dd0020eca8 100755 --- a/tests/scripts/sql-test900-write +++ b/tests/scripts/sql-test900-write @@ -79,7 +79,7 @@ fi case ${RDBMS} in # list here the RDBMSes whose mapping allows writes -postgres|ibmdb2) +pgsql|ibmdb2) MANAGERDN="cn=Manager,${BASEDN}" echo "Testing add..." $LDAPMODIFY -v -c -D "$MANAGERDN" -w $PASSWD \ diff --git a/tests/scripts/sql-test901-syncrepl b/tests/scripts/sql-test901-syncrepl index 8e80f4db19..0ff9835e28 100755 --- a/tests/scripts/sql-test901-syncrepl +++ b/tests/scripts/sql-test901-syncrepl @@ -150,7 +150,7 @@ fi case ${RDBMS} in # list here the RDBMSes whose mapping allows writes -postgres|ibmdb2) +pgsql|ibmdb2) MANAGERDN="cn=Manager,${BASEDN}" echo "Testing add..." $LDAPMODIFY -v -c -D "$MANAGERDN" -w $PASSWD \ -- 2.39.5