From: Pierangelo Masarati Date: Tue, 16 Mar 2004 15:15:14 +0000 (+0000) Subject: remove {} from procedures invocation, as noted in ITS#2641; copied annotations from... X-Git-Tag: OPENLDAP_REL_ENG_2_2_BP~274 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4fa18e1b371abedf5587fcea55b33acc08cc5807;p=openldap remove {} from procedures invocation, as noted in ITS#2641; copied annotations from postgres example --- diff --git a/servers/slapd/back-sql/rdbms_depend/oracle/testdb_metadata.sql b/servers/slapd/back-sql/rdbms_depend/oracle/testdb_metadata.sql index 7571527f22..75543232f0 100644 --- a/servers/slapd/back-sql/rdbms_depend/oracle/testdb_metadata.sql +++ b/servers/slapd/back-sql/rdbms_depend/oracle/testdb_metadata.sql @@ -1,34 +1,52 @@ --- mappings - +-- mappings + +-- 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,'person','persons','id','{call create_person(?)}','{call delete_person(?)}',0); +values (1,'person','persons','id','call create_person(?)','call delete_person(?)',0); insert into ldap_oc_mappings (id,name,keytbl,keycol,create_proc,delete_proc,expect_return) -values (2,'document','documents','id','{call create_document(?)}','{call delete_document(?)}',0); +values (2,'document','documents','id','call create_document(?)','call delete_document(?)',0); insert into ldap_oc_mappings (id,name,keytbl,keycol,create_proc,delete_proc,expect_return) -values (3,'organization','institutes','id','{call create_org(?)}','{call delete_org(?)}',0); - - +values (3,'organization','institutes','id','call create_org(?)','call delete_org(?)',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','persons.name','persons',NULL,'{call set_person_name(?,?)}', +values (1,1,'cn','persons.name','persons',NULL,'call set_person_name(?,?)', NULL,0,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','{call add_phone(?,?)}', - '{call delete_phone(?,?)}',0,0); + 'phones.pers_id=persons.id','call add_phone(?,?)', + 'call delete_phone(?,?)',0,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.name','persons',NULL,'{call set_person_name(?,?)}', +values (3,1,'sn','persons.name','persons',NULL,'call set_person_name(?,?)', NULL,0,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,2,'abstract','documents.abstract','documents',NULL,'{call set_doc_abstract(?,?)}', +values (4,2,'abstract','documents.abstract','documents',NULL,'call set_doc_abstract(?,?)', NULL,0,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,2,'documentTitle','documents.title','documents',NULL,'{call set_doc_title(?,?)}', +values (5,2,'documentTitle','documents.title','documents',NULL,'call set_doc_title(?,?)', NULL,0,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) @@ -37,22 +55,26 @@ values (5,2,'documentTitle','documents.title','documents',NULL,'{call set_doc_ti -- NULL,NULL,0,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,3,'o','institutes.name','institutes',NULL,'{call set_org_name(?,?)}', +values (7,3,'o','institutes.name','institutes',NULL,'call set_org_name(?,?)', NULL,0,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,1,'documentDN','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', - '{?=call make_doc_link(?,?)}','{?=call del_doc_link(?,?)}',0,3); + '?=call make_doc_link(?,?)','?=call del_doc_link(?,?)',0,3); 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','ldap_entries.dn','ldap_entries,documents,authors_docs,persons', 'ldap_entries.keyval=persons.id AND ldap_entries.oc_map_id=1 AND authors_docs.doc_id=documents.id AND authors_docs.pers_id=persons.id', - '{?=call make_author_link(?,?)}','{?=call del_author_link(?,?)}',0,3); + '?=call make_author_link(?,?)','?=call del_author_link(?,?)',0,3); --- entries - +-- 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 (ldap_entry_ids.nextval,'o=sql,c=RU',3,0,1); @@ -71,17 +93,21 @@ values (ldap_entry_ids.nextval,'documentTitle=book1,o=sql,c=RU',2,1,1); insert into ldap_entries (id,dn,oc_map_id,parent,keyval) values (ldap_entry_ids.nextval,'documentTitle=book2,o=sql,c=RU',2,1,2); --- referrals - +-- 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 (4,'referral'); +-- 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,'http://localhost'); -- procedures - +-- these procedures are specific for this RDBMS and are used in mapping objectClass and attributeType creation/modify/deletion CREATE OR REPLACE PROCEDURE create_person(keyval OUT NUMBER) AS BEGIN INSERT INTO persons (id,name) VALUES (person_ids.nextval,' ');