From: Pierangelo Masarati Date: Tue, 24 Aug 2004 11:45:33 +0000 (+0000) Subject: ready for test... X-Git-Tag: OPENLDAP_REL_ENG_2_3_0ALPHA~658 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=be3c14e4f47a14d630c601e41f2af6c81b853c76;p=openldap ready for test... --- 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 c82e75002e..bf0756faec 100644 --- a/servers/slapd/back-sql/rdbms_depend/ibmdb2/backsql_create.sql +++ b/servers/slapd/back-sql/rdbms_depend/ibmdb2/backsql_create.sql @@ -6,7 +6,6 @@ create table ldap_oc_mappings keytbl varchar(64) not null, keycol varchar(64) not null, create_proc varchar(255), - create_keyval varchar(255), delete_proc varchar(255), expect_return integer not null ); @@ -18,7 +17,6 @@ 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 75553b013c..91af76c763 100644 --- a/servers/slapd/back-sql/rdbms_depend/ibmdb2/testdb_metadata.sql +++ b/servers/slapd/back-sql/rdbms_depend/ibmdb2/testdb_metadata.sql @@ -1,84 +1,115 @@ --mappings -insert into ldap_oc_mappings (id,name,keytbl,keycol,create_proc,create_keyval,delete_proc,expect_return) -values (1,'inetOrgPerson','persons','id','insert into persons (id,name,surname) values ((select max(id)+1 from persons),'''','''')','select max(id) from persons',NULL,0); - -insert into ldap_oc_mappings (id,name,keytbl,keycol,create_proc,create_keyval,delete_proc,expect_return) -values (2,'document','documents','id',NULL,NULL,NULL,0); - -insert into ldap_oc_mappings (id,name,keytbl,keycol,create_proc,create_keyval,delete_proc,expect_return) -values (3,'organization','institutes','id',NULL,NULL,NULL,0); - - +-- objectClass mappings: these may be viewed as structuralObjectClass, the ones that are used to decide how to build an entry +-- id a unique number identifying the objectClass +-- name the name of the objectClass; it MUST match the name of an objectClass that is loaded in slapd's schema +-- keytbl the name of the table that is referenced for the primary key of an entry +-- keycol the name of the column in "keytbl" that contains the primary key of an entry; the pair "keytbl.keycol" uniquely identifies an entry of objectClass "id" +-- create_proc a procedure to create the entry +-- delete_proc a procedure to delete the entry; it takes "keytbl.keycol" of the row to be deleted +-- expect_return a bitmap that marks whether create_proc (1) and delete_proc (2) return a value or not +insert into ldap_oc_mappings (id,name,keytbl,keycol,create_proc,delete_proc,expect_return) +values (1,'inetOrgPerson','persons','id','insert into persons (id,name,surname) values ((select max(id)+1 from persons),'''','''')', + 'delete from persons where id=?',0); + +insert into ldap_oc_mappings (id,name,keytbl,keycol,create_proc,delete_proc,expect_return) +values (2,'document','documents','id','insert into documents (id,title,abstract) values ((select max(id)+1 from documents),'''','''')', + 'delete from documents where id=?',0); + +insert into ldap_oc_mappings (id,name,keytbl,keycol,create_proc,delete_proc,expect_return) +values (3,'organization','institutes','id','insert into institutes (id,name) values ((select max(id)+1 from institutes),'''')', + 'delete from institutes where id=?',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 +-- name the name of the attributeType; it MUST match the name of an attributeType that is loaded in slapd's schema +-- sel_expr the expression that is used to select this attribute (the "select from ..." portion) +-- from_tbls the expression that defines the table(s) this attribute is taken from (the "select ... from where ..." portion) +-- join_where the expression that defines the condition to select this attribute (the "select ... where ..." portion) +-- add_proc a procedure to insert the attribute; it takes the value of the attribute that is added, and the "keytbl.keycol" of the entry it is associated to +-- delete_proc a procedure to delete the attribute; it takes the value of the attribute that is added, and the "keytbl.keycol" of the entry it is associated to +-- param_order a mask that marks if the "keytbl.keycol" value comes before or after the value in add_proc (1) and delete_proc (2) +-- expect_return a mask that marks whether add_proc (1) and delete_proc(2) are expected to return a value or not 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 (1,1,'cn','case when persons.name!='''' and persons.surname!='''' then persons.name||'' ''||persons.surname when persons.surname!='''' then persons.surname when persons.name!='''' then persons.name else '''' end','persons',NULL,NULL,NULL,3,0); +values (1,1,'cn','persons.name||'' ''||persons.surname','persons',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 (2,1,'telephoneNumber','phones.phone','persons,phones', - 'phones.pers_id=persons.id',NULL,NULL,3,0); + 'phones.pers_id=persons.id','insert into phones (id,phone,pers_id) values ((select max(id)+1 from phones),?,?)', + 'delete from phones where pers_id=? AND phone=?',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 (4,1,'givenName','persons.name','persons',NULL,'update persons set name=? 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 (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 (4,1,'givenName','persons.name','persons',NULL,'update persons set name=? where id=?',NULL,3,0); +values (5,1,'userPassword','persons.password','persons','persons.passwrod 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) -values (5,1,'userPassword','persons.password','persons',NULL,'update persons set password=? where id=?',NULL,3,0); +values (6,1,'seeAlso','seeAlso.dn','ldap_entries AS seeAlso,documents,authors_docs,persons', + 'seeAlso.keyval=documents.id AND seeAlso.oc_map_id=2 AND authors_docs.doc_id=documents.id AND authors_docs.pers_id=persons.id', + 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 (6,2,'description','documents.abstract','documents',NULL,NULL,NULL,3,0); +values (7,2,'description','documents.abstract','documents',NULL,'update documents set abstract=? 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 (7,2,'documentTitle','documents.title','documents',NULL,NULL,NULL,3,0); +values (8,2,'documentTitle','documents.title','documents',NULL,'update documents set title=? 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 (6,2,'documentAuthor','persons.name','persons,documents,authors_docs', --- 'persons.id=authors_docs.pers_id AND documents.id=authors_docs.doc_id', --- 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 (9,2,'documentAuthor','documentAuthor.dn','ldap_entries AS documentAuthor,documents,authors_docs,persons', + 'documentAuthor.keyval=persons.id AND documentAuthor.oc_map_id=1 AND authors_docs.doc_id=documents.id AND authors_docs.pers_id=persons.id', + 'insert into authors_docs (pers_id,doc_id) values ((select keyval from ldap_entries where ucase(?)=ucase(dn)),?)', + '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 (8,3,'o','institutes.name','institutes',NULL,NULL,NULL,3,0); +values (10,2,'documentIdentifier','''document ''||documents.id','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 (9,1,'documentAuthor','ldap_entries.dn','ldap_entries,documents,authors_docs,persons', - 'ldap_entries.keyval=documents.id AND ldap_entries.oc_map_id=2 AND authors_docs.doc_id=documents.id AND authors_docs.pers_id=persons.id', - NULL,NULL,3,0); +values (11,3,'o','institutes.name','institutes',NULL,'update institutes set name=? 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 (10,2,'documentAuthor','documentAuthor.dn','ldap_entries AS documentAuthor,documents,authors_docs,persons', - 'documentAuthor.keyval=persons.id AND documentAuthor.oc_map_id=1 AND authors_docs.doc_id=documents.id AND authors_docs.pers_id=persons.id', +values (12,3,'dc','lcase(institutes.name)','institutes,ldap_entries AS dcObject,ldap_entry_objclasses as auxObjectClass', + '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); - --- entries - -insert into ldap_entries (id,dn,oc_map_id,parent,keyval) -values (1,'o=Example,c=RU',3,0,1); -insert into ldap_entries (id,dn,oc_map_id,parent,keyval) -values (2,'cn=Mitya Kovalev,o=Example,c=RU',1,1,1); +-- 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 +-- oc_map_id the "ldap_oc_mappings.id" of the main objectClass of this entry (view it as the structuralObjectClass) +-- parent the "ldap_entries.id" of the parent of this objectClass; 0 if it is the "suffix" of the database +-- keyval the value of the "keytbl.keycol" defined for this objectClass +insert into ldap_entries (id,dn,oc_map_id,parent,keyval) values +(1,'dc=example,dc=com',3,0,1); + +insert into ldap_entries (id,dn,oc_map_id,parent,keyval) values +(2,'cn=Mitya Kovalev,dc=example,dc=com',1,1,1); -insert into ldap_entries (id,dn,oc_map_id,parent,keyval) -values (3,'cn=Torvlobnor Puzdoy,o=Example,c=RU',1,1,2); +insert into ldap_entries (id,dn,oc_map_id,parent,keyval) values +(3,'cn=Torvlobnor Puzdoy,dc=example,dc=com',1,1,2); -insert into ldap_entries (id,dn,oc_map_id,parent,keyval) -values (4,'cn=Akakiy Zinberstein,o=Example,c=RU',1,1,3); +insert into ldap_entries (id,dn,oc_map_id,parent,keyval) values +(4,'cn=Akakiy Zinberstein,dc=example,dc=com',1,1,3); -insert into ldap_entries (id,dn,oc_map_id,parent,keyval) -values (5,'documentTitle=book1,o=Example,c=RU',2,1,1); +insert into ldap_entries (id,dn,oc_map_id,parent,keyval) 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,o=Example,c=RU',2,1,2); - - --- referrals +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_entry_objclasses (entry_id,oc_name) -values (4,'referral'); +-- 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 +insert into ldap_entry_objclasses (entry_id,oc_name) values (1,'dcObject'); -insert into ldap_entry_objclasses (entry_id,oc_name) -values (2,'posixAccount'); +insert into ldap_entry_objclasses (entry_id,oc_name) values (4,'referral'); -insert into ldap_referrals (entry_id,url) -values (4,'http://localhost'); +-- 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/');