]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-sql/schema-map.c
use helper to destroy modrdn modifications; send result after commit\!...
[openldap] / servers / slapd / back-sql / schema-map.c
index 143fd494f4ce18e56f487e854ea4187baf5f4d4c..24342fcc665d988023e4deb02e1c13b41c809ab1 100644 (file)
@@ -1,8 +1,10 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2004 The OpenLDAP Foundation.
+ * Copyright 1999-2005 The OpenLDAP Foundation.
  * Portions Copyright 1999 Dmitry Kovalev.
+ * Portions Copyright 2002 Pierangelo Masarati.
+ * Portions Copyright 2004 Mark Adamson.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  */
 /* ACKNOWLEDGEMENTS:
  * This work was initially developed by Dmitry Kovalev for inclusion
- * by OpenLDAP Software.
+ * by OpenLDAP Software.  Additional significant contributors include
+ * Pierangelo Masarati and Mark Adamson.
  */
 
 #include "portable.h"
 
-#ifdef SLAPD_SQL
-
 #include <stdio.h>
 #include <sys/types.h>
 #include "ac/string.h"
 
+#include "lutil.h"
 #include "slap.h"
-#include "lber_pvt.h"
-#include "ldap_pvt.h"
 #include "proto-sql.h"
 
 #define BACKSQL_DUPLICATE      (-1)
 
+/* NOTE: by default, cannot just compare pointers because
+ * objectClass/attributeType order would be machine-dependent
+ * (and tests would fail!); however, if you don't want to run
+ * tests, or see attributeTypes written in the same order
+ * they are defined, define */
+/* #undef BACKSQL_USE_PTR_CMP */
+
 /*
  * Uses the pointer to the ObjectClass structure
  */
 static int
 backsql_cmp_oc( const void *v_m1, const void *v_m2 )
 {
-       const backsql_oc_map_rec *m1 = v_m1, *m2 = v_m2;
+       const backsql_oc_map_rec        *m1 = v_m1,
+                                       *m2 = v_m2;
 
+#ifdef BACKSQL_USE_PTR_CMP
        return SLAP_PTRCMP( m1->bom_oc, m2->bom_oc );
+#else /* ! BACKSQL_USE_PTR_CMP */
+       return ber_bvcmp( &m1->bom_oc->soc_cname, &m2->bom_oc->soc_cname );
+#endif /* ! BACKSQL_USE_PTR_CMP */
 }
 
 static int
 backsql_cmp_oc_id( const void *v_m1, const void *v_m2 )
 {
-       const backsql_oc_map_rec *m1 = v_m1, *m2 = v_m2;
+       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 ) );
 }
@@ -58,18 +71,27 @@ backsql_cmp_oc_id( const void *v_m1, const void *v_m2 )
 static int
 backsql_cmp_attr( const void *v_m1, const void *v_m2 )
 {
-       const backsql_at_map_rec *m1 = v_m1, *m2 = v_m2;
+       const backsql_at_map_rec        *m1 = v_m1,
+                                       *m2 = v_m2;
 
+#ifdef BACKSQL_USE_PTR_CMP
        return SLAP_PTRCMP( m1->bam_ad, m2->bam_ad );
+#else /* ! BACKSQL_USE_PTR_CMP */
+       return ber_bvcmp( &m1->bam_ad->ad_cname, &m2->bam_ad->ad_cname );
+#endif /* ! BACKSQL_USE_PTR_CMP */
 }
 
 int
 backsql_dup_attr( void *v_m1, void *v_m2 )
 {
-       backsql_at_map_rec *m1 = v_m1, *m2 = v_m2;
+       backsql_at_map_rec              *m1 = v_m1,
+                                       *m2 = v_m2;
 
        assert( m1->bam_ad == m2->bam_ad );
-       
+
+       /* duplicate definitions of attributeTypes are appended;
+        * this allows to define multiple rules for the same 
+        * attributeType.  Use with care! */
        for ( ; m1->bam_next ; m1 = m1->bam_next );
        m1->bam_next = m2;
        m2->bam_next = NULL;
@@ -79,47 +101,80 @@ backsql_dup_attr( void *v_m1, void *v_m2 )
 
 static int
 backsql_make_attr_query( 
+       backsql_info            *bi,
        backsql_oc_map_rec      *oc_map,
        backsql_at_map_rec      *at_map )
 {
        struct berbuf   bb = BB_NULL;
 
-       backsql_strfcat( &bb, "lblblblbcbl", 
-                       (ber_len_t)sizeof( "SELECT " ) - 1, "SELECT ", 
+       backsql_strfcat_x( &bb, NULL, "lblbbbblblbcbl", 
+                       (ber_len_t)STRLENOF( "SELECT " ), "SELECT ", 
                        &at_map->bam_sel_expr, 
-                       (ber_len_t)sizeof( " AS " ) - 1, " AS ", 
+                       (ber_len_t)STRLENOF( " " ), " ",
+                       &bi->sql_aliasing,
+                       &bi->sql_aliasing_quote, 
                        &at_map->bam_ad->ad_cname,
-                       (ber_len_t)sizeof( " FROM " ) - 1, " FROM ", 
+                       &bi->sql_aliasing_quote,
+                       (ber_len_t)STRLENOF( " FROM " ), " FROM ", 
                        &at_map->bam_from_tbls, 
-                       (ber_len_t)sizeof( " WHERE " ) - 1, " WHERE ", 
+                       (ber_len_t)STRLENOF( " WHERE " ), " WHERE ", 
                        &oc_map->bom_keytbl,
                        '.', 
                        &oc_map->bom_keycol,
-                       (ber_len_t)sizeof( "=?" ) - 1, "=?" );
+                       (ber_len_t)STRLENOF( "=?" ), "=?" );
 
-       if ( at_map->bam_join_where.bv_val != NULL ) {
-               backsql_strfcat( &bb, "lb",
-                               (ber_len_t)sizeof( " AND ") - 1, " AND ", 
+       if ( !BER_BVISNULL( &at_map->bam_join_where ) ) {
+               backsql_strfcat_x( &bb, NULL, "lb",
+                               (ber_len_t)STRLENOF( " AND " ), " AND ", 
                                &at_map->bam_join_where );
        }
 
+       backsql_strfcat_x( &bb, NULL, "lbbb", 
+                       (ber_len_t)STRLENOF( " ORDER BY " ), " ORDER BY ",
+                       &bi->sql_aliasing_quote,
+                       &at_map->bam_ad->ad_cname,
+                       &bi->sql_aliasing_quote );
+
        at_map->bam_query = bb.bb_val.bv_val;
-       
+
+#ifdef BACKSQL_COUNTQUERY
+       /* Query to count how many rows will be returned. */
+       BER_BVZERO( &bb.bb_val );
+       bb.bb_len = 0;
+       backsql_strfcat_x( &bb, NULL, "lblbcbl", 
+                       (ber_len_t)STRLENOF( "SELECT COUNT(*) FROM " ),
+                               "SELECT COUNT(*) FROM ", 
+                       &at_map->bam_from_tbls, 
+                       (ber_len_t)STRLENOF( " WHERE " ), " WHERE ", 
+                       &oc_map->bom_keytbl,
+                       '.', 
+                       &oc_map->bom_keycol,
+                       (ber_len_t)STRLENOF( "=?" ), "=?" );
+
+       if ( !BER_BVISNULL( &at_map->bam_join_where ) ) {
+               backsql_strfcat_x( &bb, NULL, "lb",
+                               (ber_len_t)STRLENOF( " AND " ), " AND ", 
+                               &at_map->bam_join_where );
+       }
+
+       at_map->bam_countquery = bb.bb_val.bv_val;
+#endif /* BACKSQL_COUNTQUERY */
+
        return 0;
 }
 
 static int
-backsql_add_sysmaps( backsql_oc_map_rec *oc_map )
+backsql_add_sysmaps( backsql_info *bi, backsql_oc_map_rec *oc_map )
 {
        backsql_at_map_rec      *at_map;
        char                    s[] = "+9223372036854775807L";
-       ber_len_t               slen;
+       struct berval           sbv;
        struct berbuf           bb;
        
+       sbv.bv_val = s;
+       sbv.bv_len = snprintf( s, sizeof( s ), "%ld", oc_map->bom_id );
 
-       snprintf( s, sizeof( s ), "%ld", oc_map->bom_id );
-       slen = strlen( s );
-
+       /* extra objectClasses */
        at_map = (backsql_at_map_rec *)ch_calloc(1, 
                        sizeof( backsql_at_map_rec ) );
        at_map->bam_ad = slap_schema.si_ad_objectClass;
@@ -130,31 +185,64 @@ backsql_add_sysmaps( backsql_oc_map_rec *oc_map )
        
        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 );
+       backsql_merge_from_clause( bi, &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;
+       BER_BVZERO( &bb.bb_val );
        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=",
+       backsql_strfcat_x( &bb, NULL, "lbcblb",
+                       (ber_len_t)STRLENOF( "ldap_entries.id=ldap_entry_objclasses.entry_id AND ldap_entries.keyval=" ),
+                               "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
+                       (ber_len_t)STRLENOF( " and ldap_entries.oc_map_id=" )
                                " and ldap_entries.oc_map_id=", 
-                       slen, s );
+                       &sbv );
+       at_map->bam_join_where = bb.bb_val;
 
        at_map->bam_oc = oc_map->bom_oc;
-       at_map->bam_join_where = bb.bb_val;
+
        at_map->bam_add_proc = NULL;
+       {
+               char    tmp[] =
+                       "INSERT INTO ldap_entry_objclasses "
+                       "(entry_id,oc_name) VALUES "
+                       "((SELECT id FROM ldap_entries "
+                       "WHERE oc_map_id="
+                       "18446744073709551615UL "       /* 64 bit ULONG */
+                       "AND keyval=?),?)";
+               snprintf( tmp, sizeof(tmp), 
+                       "INSERT INTO ldap_entry_objclasses "
+                       "(entry_id,oc_name) VALUES "
+                       "((SELECT id FROM ldap_entries "
+                       "WHERE oc_map_id=%lu "
+                       "AND keyval=?),?)", oc_map->bom_id );
+               at_map->bam_add_proc = ch_strdup( tmp );
+       }
+
        at_map->bam_delete_proc = NULL;
+       {
+               char    tmp[] =
+                       "DELETE FROM ldap_entry_objclasses "
+                       "WHERE entry_id=(SELECT id FROM ldap_entries "
+                       "WHERE oc_map_id="
+                       "18446744073709551615UL "       /* 64 bit ULONG */
+                       "AND keyval=?) AND oc_name=?";
+               snprintf( tmp, sizeof(tmp), 
+                       "DELETE FROM ldap_entry_objclasses "
+                       "WHERE entry_id=(SELECT id FROM ldap_entries "
+                       "WHERE oc_map_id=%lu "
+                       "AND keyval=?) AND oc_name=?",
+                       oc_map->bom_id );
+               at_map->bam_delete_proc = ch_strdup( tmp );
+       }
+
        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 );
+       backsql_make_attr_query( bi, oc_map, at_map );
        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",
@@ -162,127 +250,243 @@ backsql_add_sysmaps( backsql_oc_map_rec *oc_map )
                                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->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;
+       /* FIXME: we need to correct the objectClass join_where 
+        * after the attribute query is built */
+       ch_free( at_map->bam_join_where.bv_val );
+       BER_BVZERO( &bb.bb_val );
        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=",
+       backsql_strfcat_x( &bb, NULL, "lbcblb",
+                       (ber_len_t)STRLENOF( /* "ldap_entries.id=ldap_entry_objclasses.entry_id AND " */ "ldap_entries.keyval=" ),
+                               /* "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 = NULL;
+                       (ber_len_t)STRLENOF( " AND ldap_entries.oc_map_id=" ), 
+                               " AND ldap_entries.oc_map_id=", 
+                       &sbv );
        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 );
-       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;
+}
+
+struct backsql_attr_schema_info {
+       backsql_info    *bas_bi;
+       SQLHDBC         bas_dbh;
+       SQLHSTMT        bas_sth;
+       unsigned long   *bas_oc_id;
+       int             bas_rc;
+};
+
+static int
+backsql_oc_get_attr_mapping( void *v_oc, void *v_bas )
+{
+       RETCODE                         rc;
+       BACKSQL_ROW_NTS                 at_row;
+       backsql_oc_map_rec              *oc_map = (backsql_oc_map_rec *)v_oc;
+       backsql_at_map_rec              *at_map;
+       struct backsql_attr_schema_info *bas = (struct backsql_attr_schema_info *)v_bas;
+
+       /* bas->bas_oc_id has been bound to bas->bas_sth */
+       *bas->bas_oc_id = oc_map->bom_id;
+
+       Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_attr_mapping(): "
+               "executing at_query\n"
+               "    \"%s\"\n"
+               "    for objectClass \"%s\"\n"
+               "    with param oc_id=\"%lu\"\n",
+               bas->bas_bi->sql_at_query,
+               BACKSQL_OC_NAME( oc_map ),
+               *bas->bas_oc_id );
+
+       rc = SQLExecute( bas->bas_sth );
+       if ( rc != SQL_SUCCESS ) {
+               Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_attr_mapping(): "
+                       "error executing at_query\n"
+                       "    \"%s\"\n"
+                       "    for objectClass \"%s\"\n"
+                       "    with param oc_id=\"%lu\"\n",
+                       bas->bas_bi->sql_at_query,
+                       BACKSQL_OC_NAME( oc_map ),
+                       *bas->bas_oc_id );
+               backsql_PrintErrors( bas->bas_bi->sql_db_env,
+                               bas->bas_dbh, bas->bas_sth, rc );
+               bas->bas_rc = LDAP_OTHER;
+               return BACKSQL_AVL_STOP;
        }
 
-       return 1;
+       backsql_BindRowAsStrings( bas->bas_sth, &at_row );
+       for ( ; rc = SQLFetch( bas->bas_sth ), BACKSQL_SUCCESS( rc ); ) {
+               const char      *text = NULL;
+               struct berval   bv;
+               struct berbuf   bb = BB_NULL;
+
+               Debug( LDAP_DEBUG_TRACE, 
+                       "attributeType:\n"
+                       "\tname=\"%s\"\n"
+                       "\tsel_expr=\"%s\"\n"
+                       "\tfrom=\"%s\"\n",
+                       at_row.cols[ 0 ], at_row.cols[ 1 ],
+                       at_row.cols[ 2 ] );
+               Debug( LDAP_DEBUG_TRACE, 
+                       "\tjoin_where=\"%s\"\n"
+                       "\tadd_proc=\"%s\"\n"
+                       "\tdelete_proc=\"%s\"\n",
+                       at_row.cols[ 3 ], at_row.cols[ 4 ],
+                       at_row.cols[ 5 ]);
+               /* TimesTen */
+               Debug( LDAP_DEBUG_TRACE, "\tsel_expr_u=\"%s\"\n",
+                               at_row.cols[ 8 ], 0, 0 );
+               at_map = (backsql_at_map_rec *)ch_calloc( 1,
+                               sizeof( backsql_at_map_rec ) );
+               rc = slap_str2ad( at_row.cols[ 0 ], 
+                               &at_map->bam_ad, &text );
+               if ( rc != LDAP_SUCCESS ) {
+                       Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_attr_mapping(): "
+                               "attribute \"%s\" for objectClass \"%s\" "
+                               "is not defined in schema: %s\n", 
+                               at_row.cols[ 0 ],
+                               BACKSQL_OC_NAME( oc_map ), text );
+                       bas->bas_rc = LDAP_CONSTRAINT_VIOLATION;
+                       return BACKSQL_AVL_STOP;
+               }
+
+               ber_str2bv( at_row.cols[ 1 ], 0, 1, &at_map->bam_sel_expr );
+               if ( at_row.value_len[ 8 ] < 0 ) {
+                       BER_BVZERO( &at_map->bam_sel_expr_u );
+
+               } 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( bas->bas_bi, &bb, &bv );
+               at_map->bam_from_tbls = bb.bb_val;
+               if ( at_row.value_len[ 3 ] < 0 ) {
+                       BER_BVZERO( &at_map->bam_join_where );
+
+               } 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 ] );
+               }
+               if ( lutil_atoix( &at_map->bam_param_order, at_row.cols[ 6 ], 0 ) != 0 ) {
+                       /* error */
+               }
+               if ( lutil_atoix( &at_map->bam_expect_return, at_row.cols[ 7 ], 0 ) != 0 ) {
+                       /* error */
+               }
+               backsql_make_attr_query( bas->bas_bi, oc_map, at_map );
+               Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_attr_mapping(): "
+                       "preconstructed query \"%s\"\n",
+                       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_oc_get_attr_mapping(): "
+                                       "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 );
+               }
+
+               if ( !BER_BVISNULL( &bas->bas_bi->sql_upper_func ) &&
+                               BER_BVISNULL( &at_map->bam_sel_expr_u ) )
+               {
+                       struct berbuf   bb = BB_NULL;
+
+                       backsql_strfcat_x( &bb, NULL, "bcbc",
+                                       &bas->bas_bi->sql_upper_func,
+                                       '(' /* ) */ ,
+                                       &at_map->bam_sel_expr,
+                                       /* ( */ ')' );
+                       at_map->bam_sel_expr_u = bb.bb_val;
+               }
+       }
+       backsql_FreeRow( &at_row );
+       SQLFreeStmt( bas->bas_sth, SQL_CLOSE );
+
+       Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(\"%s\"): "
+               "autoadding 'objectClass' and 'ref' mappings\n",
+               BACKSQL_OC_NAME( oc_map ), 0, 0 );
+
+       (void)backsql_add_sysmaps( bas->bas_bi, oc_map );
+
+       return BACKSQL_AVL_CONTINUE;
 }
 
+
 int
-backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
+backsql_load_schema_map( backsql_info *bi, SQLHDBC dbh )
 {
-       SQLHSTMT                oc_sth, at_sth;
-       RETCODE                 rc;
-       BACKSQL_ROW_NTS         oc_row, at_row;
-       unsigned long           oc_id;
-       backsql_oc_map_rec      *oc_map;
-       backsql_at_map_rec      *at_map;
+       SQLHSTMT                        sth = SQL_NULL_HSTMT;
+       RETCODE                         rc;
+       BACKSQL_ROW_NTS                 oc_row;
+       unsigned long                   oc_id;
+       backsql_oc_map_rec              *oc_map;
+       struct backsql_attr_schema_info bas;
 
        Debug( LDAP_DEBUG_TRACE, "==>backsql_load_schema_map()\n", 0, 0, 0 );
 
        /* 
         * TimesTen : See if the ldap_entries.dn_ru field exists in the schema
         */
-       if ( !BACKSQL_DONTCHECK_LDAPINFO_DN_RU( si ) ) {
-               rc = backsql_Prepare( dbh, &oc_sth, 
+       if ( !BACKSQL_DONTCHECK_LDAPINFO_DN_RU( bi ) ) {
+               rc = backsql_Prepare( dbh, &sth, 
                                backsql_check_dn_ru_query, 0 );
                if ( rc == SQL_SUCCESS ) {
                        /* Yes, the field exists */
-                       si->bsql_flags |= BSQLF_HAS_LDAPINFO_DN_RU;
+                       bi->sql_flags |= BSQLF_HAS_LDAPINFO_DN_RU;
                        Debug( LDAP_DEBUG_TRACE, "ldapinfo.dn_ru field exists "
                                "in the schema\n", 0, 0, 0 );
                } else {
                        /* No such field exists */
-                       si->bsql_flags &= ~BSQLF_HAS_LDAPINFO_DN_RU;
+                       bi->sql_flags &= ~BSQLF_HAS_LDAPINFO_DN_RU;
                }
 
-               SQLFreeStmt( oc_sth, SQL_DROP );
+               SQLFreeStmt( sth, SQL_DROP );
        }
 
+       Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): oc_query \"%s\"\n", 
+                       bi->sql_oc_query, 0, 0 );
 
-       rc = backsql_Prepare( dbh, &oc_sth, si->oc_query, 0 );
+       rc = backsql_Prepare( dbh, &sth, bi->sql_oc_query, 0 );
        if ( rc != SQL_SUCCESS ) {
                Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): "
                        "error preparing oc_query: \"%s\"\n", 
-                       si->oc_query, 0, 0 );
-               backsql_PrintErrors( si->db_env, dbh, oc_sth, rc );
+                       bi->sql_oc_query, 0, 0 );
+               backsql_PrintErrors( bi->sql_db_env, dbh, sth, rc );
                return LDAP_OTHER;
        }
-       Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): at_query \"%s\"\n", 
-                       si->at_query, 0, 0 );
 
-       rc = backsql_Prepare( dbh, &at_sth, si->at_query, 0 );
-       if ( rc != SQL_SUCCESS ) {
-               Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): "
-                       "error preparing at_query: \"%s\"\n", 
-                       si->at_query, 0, 0 );
-               backsql_PrintErrors( si->db_env, dbh, at_sth, rc );
-               return LDAP_OTHER;
-       }
-
-       rc = backsql_BindParamID( at_sth, 1, &oc_id );
-       if ( rc != SQL_SUCCESS ) {
-               Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): "
-                       "error binding param for at_query: \n", 0, 0, 0 );
-               backsql_PrintErrors( si->db_env, dbh, at_sth, rc );
-               return LDAP_OTHER;
-       }
-
-       rc = SQLExecute( oc_sth );
+       rc = SQLExecute( sth );
        if ( rc != SQL_SUCCESS ) {
                Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): "
                        "error executing oc_query: \n", 0, 0, 0 );
-               backsql_PrintErrors( si->db_env, dbh, oc_sth, rc );
+               backsql_PrintErrors( bi->sql_db_env, dbh, sth, rc );
                return LDAP_OTHER;
        }
 
-       backsql_BindRowAsStrings( oc_sth, &oc_row );
-       rc = SQLFetch( oc_sth );
-       for ( ; BACKSQL_SUCCESS( rc ); rc = SQLFetch( oc_sth ) ) {
+       backsql_BindRowAsStrings( sth, &oc_row );
+       rc = SQLFetch( sth );
+       for ( ; BACKSQL_SUCCESS( rc ); rc = SQLFetch( sth ) ) {
                int     colnum;
 
                oc_map = (backsql_oc_map_rec *)ch_calloc( 1,
                                sizeof( backsql_oc_map_rec ) );
 
-               oc_map->bom_id = strtol( oc_row.cols[ 0 ], NULL, 0 );
+               if ( lutil_atoulx( &oc_map->bom_id, oc_row.cols[ 0 ], 0 ) != 0 ) {
+                       Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): "
+                               "unable to parse id=\"%s\"\n", 
+                               oc_row.cols[ 0 ], 0, 0 );
+                       return LDAP_OTHER;
+               }
 
                oc_map->bom_oc = oc_find( oc_row.cols[ 1 ] );
                if ( oc_map->bom_oc == NULL ) {
@@ -298,15 +502,41 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
                        : ch_strdup( oc_row.cols[ 4 ] );
 
                colnum = 5;
-               if ( BACKSQL_CREATE_NEEDS_SELECT( si ) ) {
+               if ( BACKSQL_CREATE_NEEDS_SELECT( bi ) ) {
                        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 );
+               if ( lutil_atoix( &oc_map->bom_expect_return, oc_row.cols[ colnum + 1 ], 0 ) != 0 ) {
+                       Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): "
+                               "unable to parse expect_return=\"%s\" for objectClass \"%s\"\n", 
+                               oc_row.cols[ colnum + 1 ], oc_row.cols[ 1 ], 0 );
+                       return LDAP_OTHER;
+               }
+
+               colnum += 2;
+               if ( ( oc_row.ncols > colnum ) &&
+                               ( oc_row.value_len[ colnum ] > 0 ) )
+               {
+                       const char      *text;
+
+                       oc_map->bom_create_hint = NULL;
+                       rc = slap_str2ad( oc_row.cols[ colnum ],
+                                       &oc_map->bom_create_hint, &text );
+                       if ( rc != SQL_SUCCESS ) {
+                               Debug( LDAP_DEBUG_TRACE, "load_schema_map(): "
+                                               "error matching "
+                                               "AttributeDescription %s "
+                                               "in create_hint: %s (%d)\n",
+                                               oc_row.cols[ colnum ],
+                                               text, rc );
+                               backsql_PrintErrors( bi->sql_db_env, dbh,
+                                               sth, rc );
+                               return LDAP_OTHER;
+                       }
+               }
 
                /*
                 * FIXME: first attempt to check for offending
@@ -314,13 +544,13 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
                 */
 
                oc_map->bom_attrs = NULL;
-               if ( avl_insert( &si->oc_by_oc, oc_map, backsql_cmp_oc, avl_dup_error ) == -1 ) {
+               if ( avl_insert( &bi->sql_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 ) {
+               if ( avl_insert( &bi->sql_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 );
@@ -328,160 +558,93 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
                }
                oc_id = oc_map->bom_id;
                Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): "
-                       "objectClass \"%s\": keytbl=\"%s\" keycol=\"%s\"\n",
+                       "objectClass \"%s\":\n    keytbl=\"%s\" keycol=\"%s\"\n",
                        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",
+                       Debug( LDAP_DEBUG_TRACE, "    create_proc=\"%s\"\n",
                                oc_map->bom_create_proc, 0, 0 );
                }
                if ( oc_map->bom_create_keyval ) {
-                       Debug( LDAP_DEBUG_TRACE, "create_keyval=\"%s\"\n",
+                       Debug( LDAP_DEBUG_TRACE, "    create_keyval=\"%s\"\n",
                                oc_map->bom_create_keyval, 0, 0 );
                }
+               if ( oc_map->bom_create_hint ) {
+                       Debug( LDAP_DEBUG_TRACE, "    create_hint=\"%s\"\n", 
+                               oc_map->bom_create_hint->ad_cname.bv_val,
+                               0, 0 );
+               }
                if ( oc_map->bom_delete_proc ) {
-                       Debug( LDAP_DEBUG_TRACE, "delete_proc=\"%s\"\n", 
+                       Debug( LDAP_DEBUG_TRACE, "    delete_proc=\"%s\"\n", 
                                oc_map->bom_delete_proc, 0, 0 );
                }
-               Debug( LDAP_DEBUG_TRACE, "expect_return: "
+               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 );
+       }
+
+       backsql_FreeRow( &oc_row );
+       SQLFreeStmt( sth, SQL_DROP );
+
+       /* prepare for attribute fetching */
+       Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): at_query \"%s\"\n", 
+                       bi->sql_at_query, 0, 0 );
 
+       rc = backsql_Prepare( dbh, &sth, bi->sql_at_query, 0 );
+       if ( rc != SQL_SUCCESS ) {
                Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): "
-                       "autoadding 'objectClass' and 'ref' mappings\n",
-                       0, 0, 0 );
-               backsql_add_sysmaps( oc_map );
-               rc = SQLExecute( at_sth );
-               if ( rc != SQL_SUCCESS ) {
-                       Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): "
-                               "error executing at_query\n"
-                               "    \"%s\"\n"
-                               "    with param oc_id=\"%lu\": \n",
-                               si->at_query, oc_id, 0 );
-                       backsql_PrintErrors( SQL_NULL_HENV, dbh, at_sth, rc );
-                       return LDAP_OTHER;
-               }
+                       "error preparing at_query: \"%s\"\n", 
+                       bi->sql_at_query, 0, 0 );
+               backsql_PrintErrors( bi->sql_db_env, dbh, sth, rc );
+               return LDAP_OTHER;
+       }
 
-               backsql_BindRowAsStrings( at_sth, &at_row );
-               for ( ; rc = SQLFetch( at_sth ), BACKSQL_SUCCESS( rc ); ) {
-                       const char      *text = NULL;
-                       struct berval   bv;
-                       struct berbuf   bb = BB_NULL;
+       rc = backsql_BindParamInt( sth, 1, SQL_PARAM_INPUT, &oc_id );
+       if ( rc != SQL_SUCCESS ) {
+               Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): "
+                       "error binding param \"oc_id\" for at_query\n", 0, 0, 0 );
+               backsql_PrintErrors( bi->sql_db_env, dbh, sth, rc );
+               SQLFreeStmt( sth, SQL_DROP );
+               return LDAP_OTHER;
+       }
 
-                       Debug( LDAP_DEBUG_TRACE, 
-                               "attributeType:\n"
-                               "\tname=\"%s\"\n"
-                               "\tsel_expr=\"%s\"\n"
-                               "\tfrom=\"%s\"\n",
-                               at_row.cols[ 0 ], at_row.cols[ 1 ],
-                               at_row.cols[ 2 ] );
-                       Debug( LDAP_DEBUG_TRACE, 
-                               "\tjoin_where=\"%s\"\n"
-                               "\tadd_proc=\"%s\"\n"
-                               "\tdelete_proc=\"%s\"\n",
-                               at_row.cols[ 3 ], at_row.cols[ 4 ],
-                               at_row.cols[ 5 ]);
-                       /* TimesTen */
-                       Debug( LDAP_DEBUG_TRACE, "\tsel_expr_u=\"%s\"\n",
-                                       at_row.cols[ 8 ], 0, 0 );
-                       at_map = (backsql_at_map_rec *)ch_calloc( 1,
-                                       sizeof( backsql_at_map_rec ) );
-                       rc = slap_str2ad( at_row.cols[ 0 ], 
-                                       &at_map->bam_ad, &text );
-                       if ( rc != LDAP_SUCCESS ) {
-                               Debug( LDAP_DEBUG_TRACE, "backsql_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;
-                       }
+       bas.bas_bi = bi;
+       bas.bas_dbh = dbh;
+       bas.bas_sth = sth;
+       bas.bas_oc_id = &oc_id;
+       bas.bas_rc = LDAP_SUCCESS;
 
-                       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 );
-                       }
+       (void)avl_apply( bi->sql_oc_by_oc, backsql_oc_get_attr_mapping,
+                       &bas, BACKSQL_AVL_STOP, AVL_INORDER );
 
-                       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, "backsql_load_schema_map(): "
-                               "preconstructed query \"%s\"\n",
-                               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 );
-                       }
+       SQLFreeStmt( sth, SQL_DROP );
 
-                       if ( si->upper_func.bv_val && at_map->bam_sel_expr_u.bv_val == NULL ) {
-                               struct berbuf   bb = BB_NULL;
+       bi->sql_flags |= BSQLF_SCHEMA_LOADED;
 
-                               backsql_strfcat( &bb, "bcbc",
-                                               &si->upper_func,
-                                               '(' /* ) */ ,
-                                               &at_map->bam_sel_expr,
-                                               /* ( */ ')' );
-                               at_map->bam_sel_expr_u = bb.bb_val;
-                       }
-               }
-               backsql_FreeRow( &at_row );
-               SQLFreeStmt( at_sth, SQL_CLOSE );
-       }
-       backsql_FreeRow( &oc_row );
-       SQLFreeStmt( at_sth, SQL_DROP );
-       SQLFreeStmt( oc_sth, SQL_DROP );
-       si->bsql_flags |= BSQLF_SCHEMA_LOADED;
        Debug( LDAP_DEBUG_TRACE, "<==backsql_load_schema_map()\n", 0, 0, 0 );
-       return LDAP_SUCCESS;
+
+       return bas.bas_rc;
 }
 
 backsql_oc_map_rec *
-backsql_oc2oc( backsql_info *si, ObjectClass *oc )
+backsql_oc2oc( backsql_info *bi, 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 );
+               oc->soc_cname.bv_val, 0, 0 );
 #endif /* BACKSQL_TRACE */
 
        tmp.bom_oc = oc;
-       res = (backsql_oc_map_rec *)avl_find( si->oc_by_oc, &tmp, backsql_cmp_oc );
+       res = (backsql_oc_map_rec *)avl_find( bi->sql_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 );
+                       BACKSQL_OC_NAME( res ), res->bom_id, 0 );
        } else {
                Debug( LDAP_DEBUG_TRACE, "<==backsql_oc2oc(): "
                        "not found\n", 0, 0, 0 );
@@ -492,14 +655,14 @@ backsql_oc2oc( backsql_info *si, ObjectClass *oc )
 }
 
 backsql_oc_map_rec *
-backsql_name2oc( backsql_info *si, struct berval *oc_name )
+backsql_name2oc( backsql_info *bi, struct berval *oc_name )
 {
        backsql_oc_map_rec      tmp, *res;
 
 #ifdef BACKSQL_TRACE
        Debug( LDAP_DEBUG_TRACE, "==>oc_with_name(): "
                "searching for objectclass with name=\"%s\"\n",
-               objclass, 0, 0 );
+               oc_name->bv_val, 0, 0 );
 #endif /* BACKSQL_TRACE */
 
        tmp.bom_oc = oc_bvfind( oc_name );
@@ -507,7 +670,7 @@ backsql_name2oc( backsql_info *si, struct berval *oc_name )
                return NULL;
        }
 
-       res = (backsql_oc_map_rec *)avl_find( si->oc_by_oc, &tmp, backsql_cmp_oc );
+       res = (backsql_oc_map_rec *)avl_find( bi->sql_oc_by_oc, &tmp, backsql_cmp_oc );
 #ifdef BACKSQL_TRACE
        if ( res != NULL ) {
                Debug( LDAP_DEBUG_TRACE, "<==oc_with_name(): "
@@ -523,7 +686,7 @@ backsql_name2oc( backsql_info *si, struct berval *oc_name )
 }
 
 backsql_oc_map_rec *
-backsql_id2oc( backsql_info *si, unsigned long id )
+backsql_id2oc( backsql_info *bi, unsigned long id )
 {
        backsql_oc_map_rec      tmp, *res;
  
@@ -533,7 +696,7 @@ backsql_id2oc( backsql_info *si, unsigned long id )
 #endif /* BACKSQL_TRACE */
 
        tmp.bom_id = id;
-       res = (backsql_oc_map_rec *)avl_find( si->oc_by_id, &tmp,
+       res = (backsql_oc_map_rec *)avl_find( bi->sql_oc_by_id, &tmp,
                        backsql_cmp_oc_id );
 
 #ifdef BACKSQL_TRACE
@@ -558,7 +721,7 @@ backsql_ad2at( backsql_oc_map_rec* objclass, AttributeDescription *ad )
 #ifdef BACKSQL_TRACE
        Debug( LDAP_DEBUG_TRACE, "==>backsql_ad2at(): "
                "searching for attribute \"%s\" for objectclass \"%s\"\n",
-               attr, BACKSQL_OC_NAME( objclass ), 0 );
+               ad->ad_cname.bv_val, BACKSQL_OC_NAME( objclass ), 0 );
 #endif /* BACKSQL_TRACE */
 
        tmp.bam_ad = ad;
@@ -596,7 +759,7 @@ supad2at_f( void *v_at, void *v_arg )
        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;
+               backsql_at_map_rec      **ret = NULL;
                unsigned                i;
 
                /* if already listed, holler! (should never happen) */
@@ -613,9 +776,11 @@ supad2at_f( void *v_at, void *v_arg )
                }
 
                ret = ch_realloc( va->ret,
-                               sizeof( backsql_at_map_rec *) * ( va->n + 2 ) );
+                               sizeof( backsql_at_map_rec * ) * ( va->n + 2 ) );
                if ( ret == NULL ) {
                        ch_free( va->ret );
+                       va->ret = NULL;
+                       va->n = 0;
                        return SUPAD2AT_STOP;
                }
 
@@ -637,18 +802,16 @@ int
 backsql_supad2at( backsql_oc_map_rec *objclass, AttributeDescription *supad,
                backsql_at_map_rec ***pret )
 {
-       struct supad2at_t       va;
+       struct supad2at_t       va = { 0 };
        int                     rc;
 
-       assert( objclass );
-       assert( supad );
-       assert( pret );
+       assert( objclass != NULL );
+       assert( supad != NULL );
+       assert( pret != NULL );
 
        *pret = NULL;
 
-       va.ret = NULL;
        va.ad = supad;
-       va.n = 0;
 
        rc = avl_apply( objclass->bom_attrs, supad2at_f, &va,
                        SUPAD2AT_STOP, AVL_INORDER );
@@ -669,10 +832,10 @@ backsql_free_attr( void *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 ) {
+       if ( !BER_BVISNULL( &at->bam_from_tbls ) ) {
                ch_free( at->bam_from_tbls.bv_val );
        }
-       if ( at->bam_join_where.bv_val != NULL ) {
+       if ( !BER_BVISNULL( &at->bam_join_where ) ) {
                ch_free( at->bam_join_where.bv_val );
        }
        if ( at->bam_add_proc != NULL ) {
@@ -681,12 +844,18 @@ backsql_free_attr( void *v_at )
        if ( at->bam_delete_proc != NULL ) {
                ch_free( at->bam_delete_proc );
        }
-       if ( at->bam_query ) {
+       if ( at->bam_query != NULL ) {
                ch_free( at->bam_query );
        }
 
+#ifdef BACKSQL_COUNTQUERY
+       if ( at->bam_countquery != NULL ) {
+               ch_free( at->bam_countquery );
+       }
+#endif /* BACKSQL_COUNTQUERY */
+
        /* TimesTen */
-       if ( at->bam_sel_expr_u.bv_val ) {
+       if ( !BER_BVISNULL( &at->bam_sel_expr_u ) ) {
                ch_free( at->bam_sel_expr_u.bv_val );
        }
 
@@ -724,14 +893,12 @@ backsql_free_oc( void *v_oc )
 }
 
 int
-backsql_destroy_schema_map( backsql_info *si )
+backsql_destroy_schema_map( backsql_info *bi )
 {
        Debug( LDAP_DEBUG_TRACE, "==>destroy_schema_map()\n", 0, 0, 0 );
-       avl_free( si->oc_by_oc, 0 );
-       avl_free( si->oc_by_id, backsql_free_oc );
+       avl_free( bi->sql_oc_by_oc, 0 );
+       avl_free( bi->sql_oc_by_id, backsql_free_oc );
        Debug( LDAP_DEBUG_TRACE, "<==destroy_schema_map()\n", 0, 0, 0 );
        return 0;
 }
 
-#endif /* SLAPD_SQL */
-