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 bf0756faec1b84235de93674a29ae846f117b7b3..ca19bb1ed162d76bbb3a086be179107d24103adc 100644 (file)
--- 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 91af76c76360bdf67fa5d46a871c8ce90b9ff434..57f7a4a9265b22d00b851b2e151a1b41d6a15281 100644 (file)
--- 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);