map referrals in regular metadata structure (need to remove some of the specific...

diff --git a/servers/slapd/back-sql/rdbms_depend/mysql/testdb_create.sql b/servers/slapd/back-sql/rdbms_depend/mysql/testdb_create.sql
index b83a4e9616ff54b007300a6db4f0eb4009127467..b4f96261dd82738ee61afab1bb988b5eb89ef5a2 100644 (file)
--- a/servers/slapd/back-sql/rdbms_depend/mysql/testdb_create.sql
+++ b/servers/slapd/back-sql/rdbms_depend/mysql/testdb_create.sql
@@ -66,3 +66,9 @@ ALTER TABLE phones  ADD
                id
        ); 
 
+drop table if exists referrals;
+CREATE TABLE referrals (
+       id int NOT NULL,
+       name varchar(255) NOT NULL
+);
+

diff --git a/servers/slapd/back-sql/rdbms_depend/mysql/testdb_data.sql b/servers/slapd/back-sql/rdbms_depend/mysql/testdb_data.sql
index 79f07d3078ceb7331f7f8a9bd14ccc2d9da79164..2084a187954863250f84c7436e64cff573ff87e8 100644 (file)
--- a/servers/slapd/back-sql/rdbms_depend/mysql/testdb_data.sql
+++ b/servers/slapd/back-sql/rdbms_depend/mysql/testdb_data.sql
@@ -14,3 +14,5 @@ insert into documents (id,abstract,title) values (2,'abstract2','book2');
 insert into authors_docs (pers_id,doc_id) values (1,1);
 insert into authors_docs (pers_id,doc_id) values (1,2);
 insert into authors_docs (pers_id,doc_id) values (2,1);
+
+insert into referrals (id,name) values (1,'Referral');

diff --git a/servers/slapd/back-sql/rdbms_depend/mysql/testdb_metadata.sql b/servers/slapd/back-sql/rdbms_depend/mysql/testdb_metadata.sql
index 6f81c99bee18a5261510bc3647d32a5a0b22b82f..2857ee656521aae2125943b52f9636db9c29d126 100644 (file)
--- a/servers/slapd/back-sql/rdbms_depend/mysql/testdb_metadata.sql
+++ b/servers/slapd/back-sql/rdbms_depend/mysql/testdb_metadata.sql
@@ -17,6 +17,9 @@ values (2,'document','documents','id',NULL,NULL,0);
 insert into ldap_oc_mappings (id,name,keytbl,keycol,create_proc,delete_proc,expect_return)
 values (3,'organization','institutes','id',NULL,NULL,0);
 
+insert into ldap_oc_mappings (id,name,keytbl,keycol,create_proc,delete_proc,expect_return)
+values (4,'referral','referrals','id',NULL,NULL,0);
+
 -- attributeType mappings: describe how an attributeType for a certain objectClass maps to the SQL data.
 --     id              a unique number identifying the attribute       
 --     oc_map_id       the value of "ldap_oc_mappings.id" that identifies the objectClass this attributeType is defined for
@@ -71,6 +74,9 @@ values (12,3,'dc','lower(institutes.name)','institutes,ldap_entries AS dcObject,
        'institutes.id=dcObject.keyval AND dcObject.oc_map_id=3 AND dcObject.id=auxObjectClass.entry_id AND auxObjectClass.oc_name=''dcObject''',
        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 (13,4,'ou','referrals.name','referrals',NULL,NULL,NULL,3,0);
+
 -- entries mapping: each entry must appear in this table, with a unique DN rooted at the database naming context
 --     id              a unique number > 0 identifying the entry
 --     dn              the DN of the entry, in "pretty" form
@@ -94,7 +100,9 @@ values (5,'documentTitle=book1,dc=example,dc=com',2,1,1);
 
 insert into ldap_entries (id,dn,oc_map_id,parent,keyval)
 values (6,'documentTitle=book2,dc=example,dc=com',2,1,2);
-       
+
+insert into ldap_entries (id,dn,oc_map_id,parent,keyval)
+values (7,'ou=Referral,dc=example,dc=com',4,1,1);
 
 -- objectClass mapping: entries that have multiple objectClass instances are listed here with the objectClass name (view them as auxiliary objectClass)
 --     entry_id        the "ldap_entries.id" of the entry this objectClass value must be added
@@ -103,11 +111,11 @@ insert into ldap_entry_objclasses (entry_id,oc_name)
 values (1,'dcObject');
 
 insert into ldap_entry_objclasses (entry_id,oc_name)
-values (4,'referral');
+values (7,'extensibleObject');
 
 -- referrals mapping: entries that should be treated as referrals are stored here
 --     entry_id        the "ldap_entries.id" of the entry that should be treated as a referral
 --     url             the URI of the referral
 insert into ldap_referrals (entry_id,url)
-values (4,'ldap://localhost:9010/');
+values (7,'ldap://localhost:9010/');
 

diff --git a/servers/slapd/back-sql/rdbms_depend/pgsql/testdb_metadata.sql b/servers/slapd/back-sql/rdbms_depend/pgsql/testdb_metadata.sql
index 11ec801c8a8623105ca18fc7e8ee9a1d5c37ef1d..66d783f6cc0d644df88494160d414330d41d08a0 100644 (file)
--- a/servers/slapd/back-sql/rdbms_depend/pgsql/testdb_metadata.sql
+++ b/servers/slapd/back-sql/rdbms_depend/pgsql/testdb_metadata.sql
@@ -53,7 +53,6 @@ insert into ldap_attr_mappings (id,oc_map_id,name,sel_expr,from_tbls,join_where,
 
 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 (13,4,'ou','referrals.name','referrals',NULL,'UPDATE referrals SET name=? WHERE id=?',NULL,3,0);
 
-
 -- entries mapping: each entry must appear in this table, with a unique DN rooted at the database naming context
 --     id              a unique number > 0 identifying the entry
 --     dn              the DN of the entry, in "pretty" form
@@ -73,8 +72,7 @@ insert into ldap_entries (id,dn,oc_map_id,parent,keyval) values (5,'documentTitl
 insert into ldap_entries (id,dn,oc_map_id,parent,keyval) values (6,'documentTitle=book2,dc=example,dc=com',2,1,2);
        
 insert into ldap_entries (id,dn,oc_map_id,parent,keyval) values (7,'ou=Referral,dc=example,dc=com',4,1,1);
-       
-       
+
 -- objectClass mapping: entries that have multiple objectClass instances are listed here with the objectClass name (view them as auxiliary objectClass)
 --     entry_id        the "ldap_entries.id" of the entry this objectClass value must be added
 --     oc_name         the name of the objectClass; it MUST match the name of an objectClass that is loaded in slapd's schema
@@ -82,7 +80,6 @@ insert into ldap_entry_objclasses (entry_id,oc_name) values (1,'dcObject');
 
 insert into ldap_entry_objclasses (entry_id,oc_name) values (7,'extensibleObject');
 
-
 -- referrals mapping: entries that should be treated as referrals are stored here
 --     entry_id        the "ldap_entries.id" of the entry that should be treated as a referral
 --     url             the URI of the referral