From: Pierangelo Masarati <ando@openldap.org>
Date: Tue, 24 Aug 2004 15:01:39 +0000 (+0000)
Subject: further fixes
X-Git-Tag: OPENLDAP_REL_ENG_2_3_0ALPHA~657
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=aaf52b28ff84a71185dfc9e086f2be3c852bacde;p=openldap

further fixes
---

diff --git a/servers/slapd/back-sql/rdbms_depend/ibmdb2/backsql_create.sql b/servers/slapd/back-sql/rdbms_depend/ibmdb2/backsql_create.sql
index bf0756faec..ca19bb1ed1 100644
--- a/servers/slapd/back-sql/rdbms_depend/ibmdb2/backsql_create.sql
+++ b/servers/slapd/back-sql/rdbms_depend/ibmdb2/backsql_create.sql
@@ -17,6 +17,7 @@ create table ldap_attr_mappings
 	oc_map_id integer not null references ldap_oc_mappings(id),
 	name varchar(255) not null,
 	sel_expr varchar(255) not null,
+	sel_expr_u varchar(255),
 	from_tbls varchar(255) not null,
 	join_where varchar(255),
 	add_proc varchar(255),
diff --git a/servers/slapd/back-sql/rdbms_depend/ibmdb2/testdb_metadata.sql b/servers/slapd/back-sql/rdbms_depend/ibmdb2/testdb_metadata.sql
index 91af76c763..57f7a4a926 100644
--- a/servers/slapd/back-sql/rdbms_depend/ibmdb2/testdb_metadata.sql
+++ b/servers/slapd/back-sql/rdbms_depend/ibmdb2/testdb_metadata.sql
@@ -46,7 +46,7 @@ insert into ldap_attr_mappings (id,oc_map_id,name,sel_expr,from_tbls,join_where,
 values (3,1,'sn','persons.surname','persons',NULL,'update persons set surname=? where id=?',NULL,3,0);
 
 insert into ldap_attr_mappings (id,oc_map_id,name,sel_expr,from_tbls,join_where,add_proc,delete_proc,param_order,expect_return)
-values (5,1,'userPassword','persons.password','persons','persons.passwrod IS NOT NULL','update persons set password=? where id=?',
+values (5,1,'userPassword','persons.password','persons','persons.password IS NOT NULL','update persons set password=? where id=?',
 	NULL,3,0);
 
 insert into ldap_attr_mappings (id,oc_map_id,name,sel_expr,from_tbls,join_where,add_proc,delete_proc,param_order,expect_return)
@@ -67,7 +67,7 @@ values (9,2,'documentAuthor','documentAuthor.dn','ldap_entries AS documentAuthor
 	'delete from authors_docs where pers_id = (select keyval from ldap_entries where ucase(?)=ucase(dn)) AND doc_id=?',3,0);
 
 insert into ldap_attr_mappings (id,oc_map_id,name,sel_expr,from_tbls,join_where,add_proc,delete_proc,param_order,expect_return)
-values (10,2,'documentIdentifier','''document ''||documents.id','documents',NULL,NULL,NULL,3,0);
+values (10,2,'documentIdentifier','''document ''||rtrim(cast(documents.id as char(16)))','documents',NULL,NULL,NULL,3,0);
 
 insert into ldap_attr_mappings (id,oc_map_id,name,sel_expr,from_tbls,join_where,add_proc,delete_proc,param_order,expect_return)
 values (11,3,'o','institutes.name','institutes',NULL,'update institutes set name=? where id=?',NULL,3,0);