]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-sql/schema-map.c
cleanup
[openldap] / servers / slapd / back-sql / schema-map.c
index 2598849c481ec4c01562101b016b7532a4f1411a..3f75bb84ad5f4a8fccd3ed26822a4a80ada6a80a 100644 (file)
@@ -1,10 +1,21 @@
-/*
- *      Copyright 1999, Dmitry Kovalev <mit@openldap.org>, All rights reserved.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1999-2004 The OpenLDAP Foundation.
+ * Portions Copyright 1999 Dmitry Kovalev.
+ * All rights reserved.
  *
- *      Redistribution and use in source and binary forms are permitted only
- *      as authorized by the OpenLDAP Public License.  A copy of this
- *      license is available at http://www.OpenLDAP.org/license.html or
- *      in file LICENSE in the top-level directory of the distribution.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by Dmitry Kovalev for inclusion
+ * by OpenLDAP Software.
  */
 
 #include "portable.h"
 
 #include <stdio.h>
 #include <sys/types.h>
-#include <string.h>
+#include "ac/string.h"
 #include "slap.h"
+#include "lber_pvt.h"
+#include "ldap_pvt.h"
 #include "back-sql.h"
 #include "sql-wrap.h"
 #include "schema-map.h"
 #include "util.h"
 
-int backsql_dummy( void *, void * );
+#define BACKSQL_DUPLICATE      (-1)
 
-int
-backsql_cmp_oc_name( backsql_oc_map_rec *m1, backsql_oc_map_rec *m2 )
+/*
+ * Uses the pointer to the ObjectClass structure
+ */
+static int
+backsql_cmp_oc( const void *v_m1, const void *v_m2 )
 {
-       return strcasecmp( m1->name, m2->name );
+       const backsql_oc_map_rec *m1 = v_m1, *m2 = v_m2;
+
+       return SLAP_PTRCMP( m1->bom_oc, m2->bom_oc );
 }
 
-int
-backsql_cmp_oc_id( backsql_oc_map_rec *m1, backsql_oc_map_rec *m2 )
+static int
+backsql_cmp_oc_id( const void *v_m1, const void *v_m2 )
 {
-       if ( m1->id < m2->id ) {
-               return -1;
-       }
-       if ( m1->id > m2->id ) {
-               return 1;
-       }
-       return 0;
+       const backsql_oc_map_rec *m1 = v_m1, *m2 = v_m2;
+
+       return ( m1->bom_id < m2->bom_id ? -1 : ( m1->bom_id > m2->bom_id ? 1 : 0 ) );
+}
+
+/*
+ * Uses the pointer to the AttributeDescription structure
+ */
+static int
+backsql_cmp_attr( const void *v_m1, const void *v_m2 )
+{
+       const backsql_at_map_rec *m1 = v_m1, *m2 = v_m2;
+
+       return SLAP_PTRCMP( m1->bam_ad, m2->bam_ad );
 }
 
 int
-backsql_cmp_attr( 
-       backsql_at_map_rec      *m1, 
-       backsql_at_map_rec      *m2 )
+backsql_dup_attr( void *v_m1, void *v_m2 )
 {
-       return strcasecmp( m1->name, m2->name );
+       backsql_at_map_rec *m1 = v_m1, *m2 = v_m2;
+
+       assert( m1->bam_ad == m2->bam_ad );
+       
+       for ( ; m1->bam_next ; m1 = m1->bam_next );
+       m1->bam_next = m2;
+       m2->bam_next = NULL;
+
+       return BACKSQL_DUPLICATE;
 }
 
-char *
+static int
 backsql_make_attr_query( 
        backsql_oc_map_rec      *oc_map,
        backsql_at_map_rec      *at_map )
 {
-       struct berval   tmps = { 0, NULL };
-       int             tmpslen = 0;
-
-       backsql_strcat( &tmps, &tmpslen, "SELECT ", at_map->sel_expr, 
-                       " AS ", at_map->name, " FROM ", at_map->from_tbls,
-                       " WHERE ", oc_map->keytbl,".", oc_map->keycol,
-                       "=?", NULL );
-       if ( at_map->join_where != NULL ) {
-               backsql_strcat( &tmps, &tmpslen, " AND ", 
-                               at_map->join_where, NULL );
+       struct berbuf   bb = BB_NULL;
+
+       backsql_strfcat( &bb, "lblblblbcbl", 
+                       (ber_len_t)sizeof( "SELECT " ) - 1, "SELECT ", 
+                       &at_map->bam_sel_expr, 
+                       (ber_len_t)sizeof( " AS " ) - 1, " AS ", 
+                       &at_map->bam_ad->ad_cname,
+                       (ber_len_t)sizeof( " FROM " ) - 1, " FROM ", 
+                       &at_map->bam_from_tbls, 
+                       (ber_len_t)sizeof( " WHERE " ) - 1, " WHERE ", 
+                       &oc_map->bom_keytbl,
+                       '.', 
+                       &oc_map->bom_keycol,
+                       (ber_len_t)sizeof( "=?" ) - 1, "=?" );
+
+       if ( at_map->bam_join_where.bv_val != NULL ) {
+               backsql_strfcat( &bb, "lb",
+                               (ber_len_t)sizeof( " AND ") - 1, " AND ", 
+                               &at_map->bam_join_where );
        }
 
-       at_map->query = tmps.bv_val;
+       at_map->bam_query = bb.bb_val.bv_val;
        
-       return at_map->query;
+       return 0;
 }
 
-int
+static int
 backsql_add_sysmaps( backsql_oc_map_rec *oc_map )
 {
        backsql_at_map_rec      *at_map;
-       int                     len;
-       char                    s[ 30 ]; 
-       struct berval           bv;
+       char                    s[] = "+9223372036854775807L";
+       ber_len_t               slen;
+       struct berbuf           bb;
+       
 
-       snprintf( s, sizeof( s ), "%ld", oc_map->id );
+       snprintf( s, sizeof( s ), "%ld", oc_map->bom_id );
+       slen = strlen( s );
 
        at_map = (backsql_at_map_rec *)ch_calloc(1, 
                        sizeof( backsql_at_map_rec ) );
-       at_map->name = ch_strdup( "objectClass" );
-       at_map->sel_expr = ch_strdup( "ldap_entry_objclasses.oc_name" );
-       at_map->from_tbls = ch_strdup( "ldap_entry_objclasses,ldap_entries" );
-       len = strlen( at_map->from_tbls );
-       backsql_merge_from_clause( &at_map->from_tbls, &len, oc_map->keytbl );
-       len = 0;
-       bv.bv_val = NULL;
-       bv.bv_len = 0;
-       backsql_strcat( &bv, &len,
-                       "ldap_entries.id=ldap_entry_objclasses.entry_id "
-                       "and ldap_entries.keyval=",
-                       oc_map->keytbl, ".", oc_map->keycol,
-                       " and ldap_entries.oc_map_id=", s, NULL );
-       at_map->join_where = bv.bv_val;
-       at_map->add_proc = NULL;
-       at_map->delete_proc = NULL;
-       at_map->param_order = 0;
-       at_map->expect_return = 0;
+       at_map->bam_ad = slap_schema.si_ad_objectClass;
+       ber_str2bv( "ldap_entry_objclasses.oc_name", 0, 1,
+                       &at_map->bam_sel_expr );
+       ber_str2bv( "ldap_entry_objclasses,ldap_entries", 0, 1, 
+                       &at_map->bam_from_tbls );
+       
+       bb.bb_len = at_map->bam_from_tbls.bv_len + 1;
+       bb.bb_val = at_map->bam_from_tbls;
+       backsql_merge_from_clause( &bb, &oc_map->bom_keytbl );
+       at_map->bam_from_tbls = bb.bb_val;
+
+       bb.bb_val.bv_val = NULL;
+       bb.bb_val.bv_len = 0;
+       bb.bb_len = 0;
+       backsql_strfcat( &bb, "lbcbll",
+                       (ber_len_t)sizeof( "ldap_entries.id=ldap_entry_objclasses.entry_id and ldap_entries.keyval=" ) - 1,
+                               "ldap_entries.id=ldap_entry_objclasses.entry_id and ldap_entries.keyval=",
+                       &oc_map->bom_keytbl, 
+                       '.', 
+                       &oc_map->bom_keycol,
+                       (ber_len_t)sizeof( " and ldap_entries.oc_map_id=" ) - 1, 
+                               " and ldap_entries.oc_map_id=", 
+                       slen, s );
+
+       at_map->bam_oc = oc_map->bom_oc;
+       at_map->bam_join_where = bb.bb_val;
+       at_map->bam_add_proc = NULL;
+       at_map->bam_delete_proc = NULL;
+       at_map->bam_param_order = 0;
+       at_map->bam_expect_return = 0;
+       at_map->bam_next = NULL;
+
        backsql_make_attr_query( oc_map, at_map );
-       avl_insert( &oc_map->attrs, at_map, 
-                       (AVL_CMP)backsql_cmp_attr, backsql_dummy );
+       if ( avl_insert( &oc_map->bom_attrs, at_map, backsql_cmp_attr, backsql_dup_attr ) == BACKSQL_DUPLICATE ) {
+               Debug( LDAP_DEBUG_TRACE, "backsql_add_sysmaps(): "
+                               "duplicate attribute \"%s\" in objectClass \"%s\" map\n",
+                               at_map->bam_ad->ad_cname.bv_val,
+                               oc_map->bom_oc->soc_cname.bv_val, 0 );
+       }
 
        at_map = (backsql_at_map_rec *)ch_calloc( 1, 
                        sizeof( backsql_at_map_rec ) );
-       at_map->name = ch_strdup( "ref" );
-       at_map->sel_expr = ch_strdup( "ldap_referrals.url" );
-       at_map->from_tbls = ch_strdup( "ldap_referrals,ldap_entries" );
-       len = strlen( at_map->from_tbls );
-       backsql_merge_from_clause( &at_map->from_tbls, &len,oc_map->keytbl );
-
-       /* FIXME: no free? */
-       at_map->join_where = NULL;
-
-       len = 0;
-       bv.bv_val = NULL;
-       bv.bv_len = 0;
-       backsql_strcat( &bv, &len,
-                       "ldap_entries.id=ldap_referrals.entry_id "
-                       "and ldap_entries.keyval=",
-                       oc_map->keytbl, ".", oc_map->keycol,
-                       " and ldap_entries.oc_map_id=", s, NULL );
-       at_map->join_where = bv.bv_val;
-       at_map->add_proc = NULL;
-       at_map->delete_proc = NULL;
-       at_map->param_order = 0;
-       at_map->expect_return = 0;
+       at_map->bam_ad = slap_schema.si_ad_ref;
+       ber_str2bv( "ldap_referrals.url", 0, 1, &at_map->bam_sel_expr );
+       ber_str2bv( "ldap_referrals,ldap_entries", 0, 1, &at_map->bam_from_tbls );
+       
+       bb.bb_val.bv_val = NULL;
+       bb.bb_val.bv_len = 0;
+       bb.bb_len = at_map->bam_from_tbls.bv_len + 1;
+       backsql_merge_from_clause( &bb, &oc_map->bom_keytbl );
+       at_map->bam_from_tbls = bb.bb_val;
+
+       bb.bb_val.bv_val = NULL;
+       bb.bb_val.bv_len = 0;
+       bb.bb_len = 0;
+       backsql_strfcat( &bb, "lbcbll",
+                       (ber_len_t)sizeof( "ldap_entries.id=ldap_referrals.entry_id and ldap_entries.keyval=" ) - 1,
+                               "ldap_entries.id=ldap_referrals.entry_id and ldap_entries.keyval=",
+                       &oc_map->bom_keytbl, 
+                       '.', 
+                       &oc_map->bom_keycol,
+                       (ber_len_t)sizeof( " and ldap_entries.oc_map_id=" ) - 1, 
+                               " and ldap_entries.oc_map_id=", 
+                       slen, s );
+
+       at_map->bam_oc = NULL;
+       at_map->bam_join_where = bb.bb_val;
+       at_map->bam_add_proc = NULL;
+       at_map->bam_delete_proc = NULL;
+       at_map->bam_param_order = 0;
+       at_map->bam_expect_return = 0;
+       at_map->bam_next = NULL;
+
        backsql_make_attr_query( oc_map, at_map );
-       avl_insert( &oc_map->attrs, at_map, 
-                       (AVL_CMP)backsql_cmp_attr, backsql_dummy );
+       if ( avl_insert( &oc_map->bom_attrs, at_map, backsql_cmp_attr, backsql_dup_attr ) == BACKSQL_DUPLICATE ) {
+               Debug( LDAP_DEBUG_TRACE, "backsql_add_sysmaps(): "
+                               "duplicate attribute \"%s\" in objectClass \"%s\" map\n",
+                               at_map->bam_ad->ad_cname.bv_val,
+                               oc_map->bom_oc->soc_cname.bv_val, 0 );
+       }
 
        return 1;
 }
@@ -144,23 +217,23 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
        unsigned long           oc_id;
        backsql_oc_map_rec      *oc_map;
        backsql_at_map_rec      *at_map;
-       char                    *tmps;
-       int                     tmpslen;
 
        Debug( LDAP_DEBUG_TRACE, "==>load_schema_map()\n", 0, 0, 0 );
 
        /* 
         * TimesTen : See if the ldap_entries.dn_ru field exists in the schema
         */
-       if ( si->has_ldapinfo_dn_ru == -1 ) {
+       if ( !BACKSQL_DONTCHECK_LDAPINFO_DN_RU( si ) ) {
                rc = backsql_Prepare( dbh, &oc_sth, 
                                backsql_check_dn_ru_query, 0 );
                if ( rc == SQL_SUCCESS ) {
-                       si->has_ldapinfo_dn_ru = 1;  /* Yes, the field exists */
+                       /* Yes, the field exists */
+                       si->bsql_flags |= BSQLF_HAS_LDAPINFO_DN_RU;
                        Debug( LDAP_DEBUG_TRACE, "ldapinfo.dn_ru field exists "
                                "in the schema\n", 0, 0, 0 );
                } else {
-                       si->has_ldapinfo_dn_ru = 0;  /* No such field exists */
+                       /* No such field exists */
+                       si->bsql_flags &= ~BSQLF_HAS_LDAPINFO_DN_RU;
                }
 
                SQLFreeStmt( oc_sth, SQL_DROP );
@@ -173,7 +246,7 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
                        "error preparing oc_query: '%s'\n", 
                        si->oc_query, 0, 0 );
                backsql_PrintErrors( si->db_env, dbh, oc_sth, rc );
-               return -1;
+               return LDAP_OTHER;
        }
        Debug( LDAP_DEBUG_TRACE, "load_schema_map(): at_query '%s'\n", 
                        si->at_query, 0, 0 );
@@ -184,7 +257,7 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
                        "error preparing at_query: '%s'\n", 
                        si->at_query, 0, 0 );
                backsql_PrintErrors( si->db_env, dbh, at_sth, rc );
-               return -1;
+               return LDAP_OTHER;
        }
 
        rc = backsql_BindParamID( at_sth, 1, &oc_id );
@@ -192,7 +265,7 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
                Debug( LDAP_DEBUG_TRACE, "load_schema_map(): "
                        "error binding param for at_query: \n", 0, 0, 0 );
                backsql_PrintErrors( si->db_env, dbh, at_sth, rc );
-               return -1;
+               return LDAP_OTHER;
        }
 
        rc = SQLExecute( oc_sth );
@@ -200,48 +273,82 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
                Debug( LDAP_DEBUG_TRACE, "load_schema_map(): "
                        "error executing oc_query: \n", 0, 0, 0 );
                backsql_PrintErrors( si->db_env, dbh, oc_sth, rc );
-               return -1;
+               return LDAP_OTHER;
        }
 
        backsql_BindRowAsStrings( oc_sth, &oc_row );
        rc = SQLFetch( oc_sth );
        for ( ; BACKSQL_SUCCESS( rc ); rc = SQLFetch( oc_sth ) ) {
+               int     colnum;
+
                oc_map = (backsql_oc_map_rec *)ch_calloc( 1,
                                sizeof( backsql_oc_map_rec ) );
-               oc_map->id = atoi( oc_row.cols[ 0 ] );
-               oc_map->name = ch_strdup( oc_row.cols[ 1 ] );
-               oc_map->keytbl = ch_strdup( oc_row.cols[ 2 ] );
-               oc_map->keycol = ch_strdup( oc_row.cols[ 3 ] );
-               oc_map->create_proc = ( oc_row.is_null[ 4 ] < 0 ) ? NULL 
+
+               oc_map->bom_id = strtol( oc_row.cols[ 0 ], NULL, 0 );
+
+               oc_map->bom_oc = oc_find( oc_row.cols[ 1 ] );
+               if ( oc_map->bom_oc == NULL ) {
+                       Debug( LDAP_DEBUG_TRACE, "load_schema_map(): "
+                               "objectClass '%s' is not defined in schema\n", 
+                               oc_row.cols[ 1 ], 0, 0 );
+                       return LDAP_OTHER;      /* undefined objectClass ? */
+               }
+               
+               ber_str2bv( oc_row.cols[ 2 ], 0, 1, &oc_map->bom_keytbl );
+               ber_str2bv( oc_row.cols[ 3 ], 0, 1, &oc_map->bom_keycol );
+               oc_map->bom_create_proc = ( oc_row.value_len[ 4 ] < 0 ) ? NULL 
                        : ch_strdup( oc_row.cols[ 4 ] );
-               oc_map->delete_proc = ( oc_row.is_null[ 5 ] < 0 ) ? NULL 
-                       : ch_strdup( oc_row.cols[ 5 ] );
-               oc_map->expect_return = atoi( oc_row.cols[ 6 ] );
+
+               colnum = 5;
+               if ( BACKSQL_CREATE_NEEDS_SELECT( si ) ) {
+                       colnum = 6;
+                       oc_map->bom_create_keyval = ( oc_row.value_len[ 5 ] < 0 ) 
+                               ? NULL : ch_strdup( oc_row.cols[ 5 ] );
+               }
+               oc_map->bom_delete_proc = ( oc_row.value_len[ colnum ] < 0 ) ? NULL 
+                       : ch_strdup( oc_row.cols[ colnum ] );
+               oc_map->bom_expect_return = strtol( oc_row.cols[ colnum + 1 ], 
+                               NULL, 0 );
 
                /*
                 * FIXME: first attempt to check for offending
                 * instructions in {create|delete}_proc
                 */
 
-               oc_map->attrs = NULL;
-               avl_insert( &si->oc_by_name, oc_map,
-                               (AVL_CMP)backsql_cmp_oc_name, backsql_dummy );
-               avl_insert( &si->oc_by_id, oc_map,
-                               (AVL_CMP)backsql_cmp_oc_id, backsql_dummy );
-               oc_id = oc_map->id;
+               oc_map->bom_attrs = NULL;
+               if ( avl_insert( &si->oc_by_oc, oc_map, backsql_cmp_oc, avl_dup_error ) == -1 ) {
+                       Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): "
+                                       "duplicate objectClass \"%s\" in objectClass map\n",
+                                       oc_map->bom_oc->soc_cname.bv_val, 0, 0 );
+                       return LDAP_OTHER;
+               }
+               if ( avl_insert( &si->oc_by_id, oc_map, backsql_cmp_oc_id, avl_dup_error ) == -1 ) {
+                       Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): "
+                                       "duplicate objectClass \"%s\" in objectClass by ID map\n",
+                                       oc_map->bom_oc->soc_cname.bv_val, 0, 0 );
+                       return LDAP_OTHER;
+               }
+               oc_id = oc_map->bom_id;
                Debug( LDAP_DEBUG_TRACE, "load_schema_map(): "
                        "objectClass '%s': keytbl='%s' keycol='%s'\n",
-                       oc_map->name, oc_map->keytbl, oc_map->keycol );
-               if ( oc_map->delete_proc ) {
-                       Debug( LDAP_DEBUG_TRACE, "delete_proc='%s'\n", 
-                               oc_map->delete_proc, 0, 0 );
-               }
-               if ( oc_map->create_proc ) {
+                       BACKSQL_OC_NAME( oc_map ),
+                       oc_map->bom_keytbl.bv_val, oc_map->bom_keycol.bv_val );
+               if ( oc_map->bom_create_proc ) {
                        Debug( LDAP_DEBUG_TRACE, "create_proc='%s'\n",
-                               oc_map->create_proc, 0, 0 );
+                               oc_map->bom_create_proc, 0, 0 );
+               }
+               if ( oc_map->bom_create_keyval ) {
+                       Debug( LDAP_DEBUG_TRACE, "create_keyval='%s'\n",
+                               oc_map->bom_create_keyval, 0, 0 );
                }
-               Debug( LDAP_DEBUG_TRACE, "expect_return=%d; attributes:\n",
-                       oc_map->expect_return, 0, 0 );
+               if ( oc_map->bom_delete_proc ) {
+                       Debug( LDAP_DEBUG_TRACE, "delete_proc='%s'\n", 
+                               oc_map->bom_delete_proc, 0, 0 );
+               }
+               Debug( LDAP_DEBUG_TRACE, "expect_return: "
+                       "add=%d, del=%d; attributes:\n",
+                       BACKSQL_IS_ADD( oc_map->bom_expect_return ), 
+                       BACKSQL_IS_DEL( oc_map->bom_expect_return ), 0 );
 
                Debug( LDAP_DEBUG_TRACE, "load_schema_map(): "
                        "autoadding 'objectClass' and 'ref' mappings\n",
@@ -252,12 +359,16 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
                        Debug( LDAP_DEBUG_TRACE, "load_schema_map(): "
                                "error executing at_query: \n", 0, 0, 0 );
                        backsql_PrintErrors( SQL_NULL_HENV, dbh, at_sth, rc );
-                       return -1;
+                       return LDAP_OTHER;
                }
 
                backsql_BindRowAsStrings( at_sth, &at_row );
                rc = SQLFetch( at_sth );
                for ( ; BACKSQL_SUCCESS(rc); rc = SQLFetch( at_sth ) ) {
+                       const char      *text = NULL;
+                       struct berval   bv;
+                       struct berbuf   bb = BB_NULL;
+
                        Debug( LDAP_DEBUG_TRACE, "********'%s'\n",
                                at_row.cols[ 0 ], 0, 0 );
                        Debug( LDAP_DEBUG_TRACE, 
@@ -274,30 +385,60 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
                                        at_row.cols[ 8 ], 0, 0 );
                        at_map = (backsql_at_map_rec *)ch_calloc( 1,
                                        sizeof( backsql_at_map_rec ) );
-                       at_map->name = ch_strdup( at_row.cols[ 0 ] );
-                       at_map->sel_expr = ch_strdup( at_row.cols[ 1 ] );
-                       at_map->sel_expr_u = ( at_row.is_null[ 8 ] < 0 ) ? NULL
-                               : ch_strdup( at_row.cols[ 8 ] );
-                       tmps = NULL;
-                       tmpslen = 0;
-                       backsql_merge_from_clause( &tmps, &tmpslen,
-                                       at_row.cols[ 2 ] );
-                       at_map->from_tbls = tmps;
-                       at_map->join_where = ( at_row.is_null[ 3 ] < 0 ) ? NULL 
-                               : ch_strdup( at_row.cols[ 3 ] );
-                       at_map->add_proc = ( at_row.is_null[ 4 ] < 0 ) ? NULL
-                               : ch_strdup( at_row.cols[4] );
-                       at_map->delete_proc = ( at_row.is_null[ 5 ] < 0 ) ? NULL
-                               : ch_strdup( at_row.cols[ 5 ] );
-                       at_map->param_order = atoi( at_row.cols[ 6 ] );
-                       at_map->expect_return = atoi( at_row.cols[ 7 ] );
+                       rc = slap_str2ad( at_row.cols[ 0 ], 
+                                       &at_map->bam_ad, &text );
+                       if ( rc != LDAP_SUCCESS ) {
+                               Debug( LDAP_DEBUG_TRACE, "load_schema_map(): "
+                                       "attribute '%s' for objectClass '%s' "
+                                       "is not defined in schema: %s\n", 
+                                       at_row.cols[ 0 ],
+                                       BACKSQL_OC_NAME( oc_map ), text );
+                               return LDAP_CONSTRAINT_VIOLATION;
+                       }
+
+                       ber_str2bv( at_row.cols[ 1 ], 0, 1, &at_map->bam_sel_expr );
+                       if ( at_row.value_len[ 8 ] < 0 ) {
+                               at_map->bam_sel_expr_u.bv_val = NULL;
+                               at_map->bam_sel_expr_u.bv_len = 0;
+                       } else {
+                               ber_str2bv( at_row.cols[ 8 ], 0, 1, 
+                                               &at_map->bam_sel_expr_u );
+                       }
+
+                       ber_str2bv( at_row.cols[ 2 ], 0, 0, &bv );
+                       backsql_merge_from_clause( &bb, &bv );
+                       at_map->bam_from_tbls = bb.bb_val;
+                       if ( at_row.value_len[ 3 ] < 0 ) {
+                               at_map->bam_join_where.bv_val = NULL;
+                               at_map->bam_join_where.bv_len = 0;
+                       } else {
+                               ber_str2bv( at_row.cols[ 3 ], 0, 1, 
+                                               &at_map->bam_join_where );
+                       }
+                       at_map->bam_add_proc = NULL;
+                       if ( at_row.value_len[ 4 ] > 0 ) {
+                               at_map->bam_add_proc = ch_strdup( at_row.cols[4] );
+                       }
+                       at_map->bam_delete_proc = NULL;
+                       if ( at_row.value_len[ 5 ] > 0 ) {
+                               at_map->bam_delete_proc = ch_strdup( at_row.cols[ 5 ] );
+                       }
+                       at_map->bam_param_order = strtol( at_row.cols[ 6 ], 
+                                       NULL, 0 );
+                       at_map->bam_expect_return = strtol( at_row.cols[ 7 ],
+                                       NULL, 0 );
                        backsql_make_attr_query( oc_map, at_map );
                        Debug( LDAP_DEBUG_TRACE, "load_schema_map(): "
                                "preconstructed query '%s'\n",
-                               at_map->query, 0, 0 );
-                       avl_insert( &oc_map->attrs, at_map, 
-                                       (AVL_CMP)backsql_cmp_attr,
-                                       backsql_dummy );
+                               at_map->bam_query, 0, 0 );
+                       at_map->bam_next = NULL;
+                       if ( avl_insert( &oc_map->bom_attrs, at_map, backsql_cmp_attr, backsql_dup_attr ) == BACKSQL_DUPLICATE ) {
+                               Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): "
+                                               "duplicate attribute \"%s\" "
+                                               "in objectClass \"%s\" map\n",
+                                               at_map->bam_ad->ad_cname.bv_val,
+                                               oc_map->bom_oc->soc_cname.bv_val, 0 );
+                       }
                }
                backsql_FreeRow( &at_row );
                SQLFreeStmt( at_sth, SQL_CLOSE );
@@ -305,152 +446,261 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
        backsql_FreeRow( &oc_row );
        SQLFreeStmt( at_sth, SQL_DROP );
        SQLFreeStmt( oc_sth, SQL_DROP );
-       si->schema_loaded = 1;
+       si->bsql_flags |= BSQLF_SCHEMA_LOADED;
        Debug( LDAP_DEBUG_TRACE, "<==load_schema_map()\n", 0, 0, 0 );
-       return 1;
+       return LDAP_SUCCESS;
+}
+
+backsql_oc_map_rec *
+backsql_oc2oc( backsql_info *si, ObjectClass *oc )
+{
+       backsql_oc_map_rec      tmp, *res;
+
+#ifdef BACKSQL_TRACE
+       Debug( LDAP_DEBUG_TRACE, "==>backsql_oc2oc(): "
+               "searching for objectclass with name='%s'\n",
+               objclass, 0, 0 );
+#endif /* BACKSQL_TRACE */
+
+       tmp.bom_oc = oc;
+       res = (backsql_oc_map_rec *)avl_find( si->oc_by_oc, &tmp, backsql_cmp_oc );
+#ifdef BACKSQL_TRACE
+       if ( res != NULL ) {
+               Debug( LDAP_DEBUG_TRACE, "<==backsql_oc2oc(): "
+                       "found name='%s', id=%d\n", 
+                       BACKSQL_OC_NAME( res ), res->id, 0 );
+       } else {
+               Debug( LDAP_DEBUG_TRACE, "<==backsql_oc2oc(): "
+                       "not found\n", 0, 0, 0 );
+       }
+#endif /* BACKSQL_TRACE */
+       return res;
 }
 
 backsql_oc_map_rec *
-backsql_oc_with_name( backsql_info *si, char *objclass )
+backsql_name2oc( backsql_info *si, struct berval *oc_name )
 {
        backsql_oc_map_rec      tmp, *res;
 
-#if 0
+#ifdef BACKSQL_TRACE
        Debug( LDAP_DEBUG_TRACE, "==>oc_with_name(): "
                "searching for objectclass with name='%s'\n",
                objclass, 0, 0 );
-#endif
-       
-       tmp.name = objclass;
-       res = (backsql_oc_map_rec *)avl_find( si->oc_by_name, &tmp,
-                       (AVL_CMP)backsql_cmp_oc_name );
-#if 0
+#endif /* BACKSQL_TRACE */
+
+       tmp.bom_oc = oc_bvfind( oc_name );
+       if ( tmp.bom_oc == NULL ) {
+               return NULL;
+       }
+
+       res = (backsql_oc_map_rec *)avl_find( si->oc_by_oc, &tmp, backsql_cmp_oc );
+#ifdef BACKSQL_TRACE
        if ( res != NULL ) {
                Debug( LDAP_DEBUG_TRACE, "<==oc_with_name(): "
-                       "found name='%s', id=%d\n", res->name, res->id, 0 );
+                       "found name='%s', id=%d\n", 
+                       BACKSQL_OC_NAME( res ), res->bom_id, 0 );
        } else {
                Debug( LDAP_DEBUG_TRACE, "<==oc_with_name(): "
                        "not found\n", 0, 0, 0 );
        }
-#endif
+#endif /* BACKSQL_TRACE */
  
        return res;
 }
 
 backsql_oc_map_rec *
-backsql_oc_with_id( backsql_info *si, unsigned long id )
+backsql_id2oc( backsql_info *si, unsigned long id )
 {
        backsql_oc_map_rec      tmp, *res;
  
-#if 0
+#ifdef BACKSQL_TRACE
        Debug( LDAP_DEBUG_TRACE, "==>oc_with_id(): "
                "searching for objectclass with id='%d'\n", id, 0, 0 );
-#endif
+#endif /* BACKSQL_TRACE */
 
-       tmp.id = id;
+       tmp.bom_id = id;
        res = (backsql_oc_map_rec *)avl_find( si->oc_by_id, &tmp,
-                       (AVL_CMP)backsql_cmp_oc_id );
+                       backsql_cmp_oc_id );
 
-#if 0
+#ifdef BACKSQL_TRACE
        if ( res != NULL ) {
                Debug( LDAP_DEBUG_TRACE, "<==oc_with_name(): "
-                       "found name='%s', id=%d\n", res->name, res->id, 0 );
+                       "found name='%s', id=%d\n",
+                       BACKSQL_OC_NAME( res ), res->bom_id, 0 );
        } else {
                Debug( LDAP_DEBUG_TRACE, "<==oc_with_name(): "
                        "not found\n", 0, 0, 0 );
        }
-#endif
+#endif /* BACKSQL_TRACE */
        
        return res;
 }
 
 backsql_at_map_rec *
-backsql_at_with_name( backsql_oc_map_rec* objclass, char *attr )
+backsql_ad2at( backsql_oc_map_rec* objclass, AttributeDescription *ad )
 {
        backsql_at_map_rec      tmp, *res;
  
-#if 0
-       Debug( LDAP_DEBUG_TRACE, "==>at_with_name(): "
+#ifdef BACKSQL_TRACE
+       Debug( LDAP_DEBUG_TRACE, "==>backsql_ad2at(): "
                "searching for attribute '%s' for objectclass '%s'\n",
-               attr, objclass->name, 0 );
-#endif
-       tmp.name = attr;
-       res = (backsql_at_map_rec *)avl_find( objclass->attrs, &tmp,
-                       (AVL_CMP)backsql_cmp_attr );
+               attr, BACKSQL_OC_NAME( objclass ), 0 );
+#endif /* BACKSQL_TRACE */
 
-#if 0
+       tmp.bam_ad = ad;
+       res = (backsql_at_map_rec *)avl_find( objclass->bom_attrs, &tmp,
+                       backsql_cmp_attr );
+
+#ifdef BACKSQL_TRACE
        if ( res != NULL ) {
-               Debug( LDAP_DEBUG_TRACE, "<==at_with_name(): "
+               Debug( LDAP_DEBUG_TRACE, "<==backsql_ad2at(): "
                        "found name='%s', sel_expr='%s'\n",
-                       res->name, res->sel_expr, 0 );
+                       res->bam_ad->ad_cname.bv_val,
+                       res->bam_sel_expr.bv_val, 0 );
        } else {
-               Debug( LDAP_DEBUG_TRACE, "<==at_with_name(): "
+               Debug( LDAP_DEBUG_TRACE, "<==backsql_ad2at(): "
                        "not found\n", 0, 0, 0 );
        }
-#endif
+#endif /* BACKSQL_TRACE */
 
        return res;
 }
 
+/* attributeType inheritance */
+struct supad2at_t {
+       backsql_at_map_rec      **ret;
+       AttributeDescription    *ad;
+       unsigned                n;
+};
+
+#define SUPAD2AT_STOP  (-1)
+
+static int
+supad2at_f( void *v_at, void *v_arg )
+{
+       backsql_at_map_rec      *at = (backsql_at_map_rec *)v_at;
+       struct supad2at_t       *va = (struct supad2at_t *)v_arg;
+
+       if ( is_at_subtype( at->bam_ad->ad_type, va->ad->ad_type ) ) {
+               backsql_at_map_rec      **ret;
+
+               ret = ch_realloc( va->ret, sizeof( backsql_at_map_rec *) * ( va->n + 2 ) );
+               if ( ret == NULL ) {
+                       ch_free( va->ret );
+                       return SUPAD2AT_STOP;
+               }
+
+               ret[ va->n ] = at;
+               va->n++;
+               ret[ va->n ] = NULL;
+               va->ret = ret;
+       }
+
+       return 0;
+}
+
+/*
+ * stores in *pret a NULL terminated array of pointers
+ * to backsql_at_map_rec whose attributeType is supad->ad_type 
+ * or derived from it
+ */
 int
-backsql_free_attr( backsql_at_map_rec *at )
+backsql_supad2at( backsql_oc_map_rec *objclass, AttributeDescription *supad,
+               backsql_at_map_rec ***pret )
 {
-       Debug( LDAP_DEBUG_TRACE, "==>free_attr(): '%s'\n", at->name, 0, 0 );
-       ch_free( at->name );
-       ch_free( at->sel_expr );
-       if ( at->from_tbls != NULL ) {
-               ch_free( at->from_tbls );
+       struct supad2at_t       va;
+       int                     rc;
+
+       assert( objclass );
+       assert( supad );
+       assert( pret );
+
+       *pret = NULL;
+
+       va.ret = NULL;
+       va.ad = supad;
+       va.n = 0;
+       
+       rc = avl_apply( objclass->bom_attrs, supad2at_f, &va,
+                       SUPAD2AT_STOP, AVL_INORDER );
+       if ( rc == SUPAD2AT_STOP ) {
+               return -1;
        }
-       if ( at->join_where != NULL ) {
-               ch_free( at->join_where );
+
+       *pret = va.ret;
+
+       return 0;
+}
+
+static void
+backsql_free_attr( void *v_at )
+{
+       backsql_at_map_rec      *at = v_at;
+       
+       Debug( LDAP_DEBUG_TRACE, "==>free_attr(): '%s'\n", 
+                       at->bam_ad->ad_cname.bv_val, 0, 0 );
+       ch_free( at->bam_sel_expr.bv_val );
+       if ( at->bam_from_tbls.bv_val != NULL ) {
+               ch_free( at->bam_from_tbls.bv_val );
        }
-       if ( at->add_proc != NULL ) {
-               ch_free( at->add_proc );
+       if ( at->bam_join_where.bv_val != NULL ) {
+               ch_free( at->bam_join_where.bv_val );
        }
-       if ( at->delete_proc != NULL ) {
-               ch_free( at->delete_proc );
+       if ( at->bam_add_proc != NULL ) {
+               ch_free( at->bam_add_proc );
        }
-       if ( at->query ) {
-               ch_free( at->query );
+       if ( at->bam_delete_proc != NULL ) {
+               ch_free( at->bam_delete_proc );
+       }
+       if ( at->bam_query ) {
+               ch_free( at->bam_query );
        }
-       ch_free( at );
 
        /* TimesTen */
-       if ( at->sel_expr_u ) {
-               ch_free( at->sel_expr_u );
+       if ( at->bam_sel_expr_u.bv_val ) {
+               ch_free( at->bam_sel_expr_u.bv_val );
+       }
+
+       if ( at->bam_next ) {
+               backsql_free_attr( at->bam_next );
        }
        
-       Debug( LDAP_DEBUG_TRACE, "<==free_attr()\n", 0, 0, 0 );
+       ch_free( at );
 
-       return 1;
+       Debug( LDAP_DEBUG_TRACE, "<==free_attr()\n", 0, 0, 0 );
 }
 
-int
-backsql_free_oc( backsql_oc_map_rec *oc )
+static void
+backsql_free_oc( void *v_oc )
 {
-       Debug( LDAP_DEBUG_TRACE, "==>free_oc(): '%s'\n", oc->name, 0, 0 );
-       avl_free( oc->attrs, (AVL_FREE)backsql_free_attr );
-       ch_free( oc->name );
-       ch_free( oc->keytbl );
-       ch_free( oc->keycol );
-       if ( oc->create_proc != NULL ) {
-               ch_free( oc->create_proc );
+       backsql_oc_map_rec      *oc = v_oc;
+       
+       Debug( LDAP_DEBUG_TRACE, "==>free_oc(): '%s'\n", 
+                       BACKSQL_OC_NAME( oc ), 0, 0 );
+       avl_free( oc->bom_attrs, backsql_free_attr );
+       ch_free( oc->bom_keytbl.bv_val );
+       ch_free( oc->bom_keycol.bv_val );
+       if ( oc->bom_create_proc != NULL ) {
+               ch_free( oc->bom_create_proc );
+       }
+       if ( oc->bom_create_keyval != NULL ) {
+               ch_free( oc->bom_create_keyval );
        }
-       if ( oc->delete_proc != NULL ) {
-               ch_free( oc->delete_proc );
+       if ( oc->bom_delete_proc != NULL ) {
+               ch_free( oc->bom_delete_proc );
        }
        ch_free( oc );
 
        Debug( LDAP_DEBUG_TRACE, "<==free_oc()\n", 0, 0, 0 );
-       return 1;
 }
 
 int
 backsql_destroy_schema_map( backsql_info *si )
 {
        Debug( LDAP_DEBUG_TRACE, "==>destroy_schema_map()\n", 0, 0, 0 );
-       avl_free( si->oc_by_id, (AVL_FREE)backsql_free_oc );
-       avl_free( si->oc_by_name, (AVL_FREE)backsql_dummy );
+       avl_free( si->oc_by_oc, 0 );
+       avl_free( si->oc_by_id, backsql_free_oc );
        Debug( LDAP_DEBUG_TRACE, "<==destroy_schema_map()\n", 0, 0, 0 );
        return 0;
 }