use "pgsql" instead of "postgres" for consistency with the directory names in servers...

diff --git a/servers/slapd/back-sql/rdbms_depend/README b/servers/slapd/back-sql/rdbms_depend/README
index 876b31c0acb9d16fc78760f49dcd81e3b8a1212a..65af67a196732b5a03238411a647df98a9929c71 100644 (file)
--- a/servers/slapd/back-sql/rdbms_depend/README
+++ b/servers/slapd/back-sql/rdbms_depend/README
@@ -120,7 +120,7 @@ example=> <control-D>
 
 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 4c3b65d70c0f94789b53190cd0c6e1ab637879e2..033b89a99b199a826949d168d1e4fecf2d50e1de 100644 (file)
--- 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 3d3adacb6ec2688e004eda70c9d2092f665ed355..08facd1f9ede536bceac08b05ccba2c3f7923877 100644 (file)
--- 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 47d13e1d6a39b13f570a03bd6620e778bb846755..95a5a6dbcdd01bcac70404456407b5eb24e6de5e 100755 (executable)
--- 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 549b79b97bb4f53bc23f7472868018d6ee7bdb1f..dd0020eca82e2e9fdff8132398dd207ee300918b 100755 (executable)
--- 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 8e80f4db19c08f118e8c1b58e6d60b1f068d31d7..0ff9835e280f753fee9ffb003ee757bc66c17c0e 100755 (executable)
--- 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 \