X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-sql%2Fschema-map.c;h=44698952f50864c746a4384c2ff87f38d8dac606;hb=52165180f7713b5fdebef933a9dca8842daa2e2a;hp=739f62ef025d56f6c3bc431930820ea32f3a5624;hpb=b76bfe63516ebeca865774b029ce615fc67b6b12;p=openldap
diff --git a/servers/slapd/back-sql/schema-map.c b/servers/slapd/back-sql/schema-map.c
index 739f62ef02..44698952f5 100644
--- a/servers/slapd/back-sql/schema-map.c
+++ b/servers/slapd/back-sql/schema-map.c
@@ -1,8 +1,10 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software .
*
- * 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
@@ -15,39 +17,49 @@
*/
/* 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
#include
#include "ac/string.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 +70,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,16 +100,20 @@ 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",
+ backsql_strfcat( &bb, "lblbbbblblbcbl",
(ber_len_t)STRLENOF( "SELECT " ), "SELECT ",
&at_map->bam_sel_expr,
- (ber_len_t)STRLENOF( " AS " ), " AS ",
+ (ber_len_t)STRLENOF( " " ), " ",
+ &bi->sql_aliasing,
+ &bi->sql_aliasing_quote,
&at_map->bam_ad->ad_cname,
+ &bi->sql_aliasing_quote,
(ber_len_t)STRLENOF( " FROM " ), " FROM ",
&at_map->bam_from_tbls,
(ber_len_t)STRLENOF( " WHERE " ), " WHERE ",
@@ -97,29 +122,58 @@ backsql_make_attr_query(
&oc_map->bom_keycol,
(ber_len_t)STRLENOF( "=?" ), "=?" );
- if ( at_map->bam_join_where.bv_val != NULL ) {
+ if ( !BER_BVISNULL( &at_map->bam_join_where ) ) {
backsql_strfcat( &bb, "lb",
(ber_len_t)STRLENOF( " AND " ), " AND ",
&at_map->bam_join_where );
}
+ backsql_strfcat( &bb, "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( &bb, "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( &bb, "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 +184,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)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=",
+ backsql_strfcat( &bb, "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)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,52 +249,27 @@ 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)STRLENOF( "ldap_entries.id=ldap_referrals.entry_id and ldap_entries.keyval=" ),
- "ldap_entries.id=ldap_referrals.entry_id and ldap_entries.keyval=",
+ backsql_strfcat( &bb, "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)STRLENOF( " and ldap_entries.oc_map_id=" ),
- " 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_si;
+ backsql_info *bas_bi;
SQLHDBC bas_dbh;
SQLHSTMT bas_sth;
unsigned long *bas_oc_id;
@@ -231,7 +293,7 @@ backsql_oc_get_attr_mapping( void *v_oc, void *v_bas )
" \"%s\"\n"
" for objectClass \"%s\"\n"
" with param oc_id=\"%lu\"\n",
- bas->bas_si->at_query,
+ bas->bas_bi->sql_at_query,
BACKSQL_OC_NAME( oc_map ),
*bas->bas_oc_id );
@@ -242,10 +304,11 @@ backsql_oc_get_attr_mapping( void *v_oc, void *v_bas )
" \"%s\"\n"
" for objectClass \"%s\"\n"
" with param oc_id=\"%lu\"\n",
- bas->bas_si->at_query,
+ bas->bas_bi->sql_at_query,
BACKSQL_OC_NAME( oc_map ),
*bas->bas_oc_id );
- backsql_PrintErrors( SQL_NULL_HENV, bas->bas_dbh, bas->bas_sth, rc );
+ backsql_PrintErrors( bas->bas_bi->sql_db_env,
+ bas->bas_dbh, bas->bas_sth, rc );
bas->bas_rc = LDAP_OTHER;
return BACKSQL_AVL_STOP;
}
@@ -253,6 +316,7 @@ backsql_oc_get_attr_mapping( void *v_oc, void *v_bas )
backsql_BindRowAsStrings( bas->bas_sth, &at_row );
for ( ; rc = SQLFetch( bas->bas_sth ), BACKSQL_SUCCESS( rc ); ) {
const char *text = NULL;
+ char *next = NULL;
struct berval bv;
struct berbuf bb = BB_NULL;
@@ -288,8 +352,7 @@ backsql_oc_get_attr_mapping( void *v_oc, void *v_bas )
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;
+ BER_BVZERO( &at_map->bam_sel_expr_u );
} else {
ber_str2bv( at_row.cols[ 8 ], 0, 1,
@@ -297,11 +360,10 @@ backsql_oc_get_attr_mapping( void *v_oc, void *v_bas )
}
ber_str2bv( at_row.cols[ 2 ], 0, 0, &bv );
- backsql_merge_from_clause( &bb, &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 ) {
- at_map->bam_join_where.bv_val = NULL;
- at_map->bam_join_where.bv_len = 0;
+ BER_BVZERO( &at_map->bam_join_where );
} else {
ber_str2bv( at_row.cols[ 3 ], 0, 1,
@@ -316,10 +378,16 @@ backsql_oc_get_attr_mapping( void *v_oc, void *v_bas )
at_map->bam_delete_proc = ch_strdup( at_row.cols[ 5 ] );
}
at_map->bam_param_order = strtol( at_row.cols[ 6 ],
- NULL, 0 );
+ &next, 0 );
+ if ( next == at_row.cols[ 6 ] || next[0] != '\0' ) {
+ /* error */
+ }
at_map->bam_expect_return = strtol( at_row.cols[ 7 ],
- NULL, 0 );
- backsql_make_attr_query( oc_map, at_map );
+ &next, 0 );
+ if ( next == at_row.cols[ 7 ] || next[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 );
@@ -332,11 +400,13 @@ backsql_oc_get_attr_mapping( void *v_oc, void *v_bas )
oc_map->bom_oc->soc_cname.bv_val, 0 );
}
- if ( bas->bas_si->upper_func.bv_val && at_map->bam_sel_expr_u.bv_val == NULL ) {
+ if ( !BER_BVISNULL( &bas->bas_bi->sql_upper_func ) &&
+ BER_BVISNULL( &at_map->bam_sel_expr_u ) )
+ {
struct berbuf bb = BB_NULL;
backsql_strfcat( &bb, "bcbc",
- &bas->bas_si->upper_func,
+ &bas->bas_bi->sql_upper_func,
'(' /* ) */ ,
&at_map->bam_sel_expr,
/* ( */ ')' );
@@ -346,14 +416,20 @@ backsql_oc_get_attr_mapping( void *v_oc, void *v_bas )
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 sth;
+ SQLHSTMT sth = SQL_NULL_HSTMT;
RETCODE rc;
BACKSQL_ROW_NTS oc_row;
unsigned long oc_id;
@@ -365,31 +441,31 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
/*
* TimesTen : See if the ldap_entries.dn_ru field exists in the schema
*/
- if ( !BACKSQL_DONTCHECK_LDAPINFO_DN_RU( si ) ) {
+ 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( sth, SQL_DROP );
}
Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): oc_query \"%s\"\n",
- si->oc_query, 0, 0 );
+ bi->sql_oc_query, 0, 0 );
- rc = backsql_Prepare( dbh, &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, sth, rc );
+ bi->sql_oc_query, 0, 0 );
+ backsql_PrintErrors( bi->sql_db_env, dbh, sth, rc );
return LDAP_OTHER;
}
@@ -397,7 +473,7 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
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, sth, rc );
+ backsql_PrintErrors( bi->sql_db_env, dbh, sth, rc );
return LDAP_OTHER;
}
@@ -425,7 +501,7 @@ 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 ] );
@@ -435,19 +511,41 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
oc_map->bom_expect_return = strtol( oc_row.cols[ colnum + 1 ],
NULL, 0 );
+ 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
* instructions in {create|delete}_proc
*/
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 );
@@ -455,31 +553,30 @@ 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 );
-
- Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): "
- "autoadding 'objectClass' and 'ref' mappings\n",
- 0, 0, 0 );
-
- backsql_add_sysmaps( oc_map );
}
backsql_FreeRow( &oc_row );
@@ -487,37 +584,38 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
/* prepare for attribute fetching */
Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): at_query \"%s\"\n",
- si->at_query, 0, 0 );
+ bi->sql_at_query, 0, 0 );
- rc = backsql_Prepare( dbh, &sth, si->at_query, 0 );
+ rc = backsql_Prepare( dbh, &sth, bi->sql_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, sth, rc );
+ bi->sql_at_query, 0, 0 );
+ backsql_PrintErrors( bi->sql_db_env, dbh, sth, rc );
return LDAP_OTHER;
}
- rc = backsql_BindParamID( sth, 1, &oc_id );
+ 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( si->db_env, dbh, sth, rc );
+ backsql_PrintErrors( bi->sql_db_env, dbh, sth, rc );
+ SQLFreeStmt( sth, SQL_DROP );
return LDAP_OTHER;
}
- bas.bas_si = si;
+ bas.bas_bi = bi;
bas.bas_dbh = dbh;
bas.bas_sth = sth;
bas.bas_oc_id = &oc_id;
bas.bas_rc = LDAP_SUCCESS;
- (void)avl_apply( si->oc_by_oc, backsql_oc_get_attr_mapping,
+ (void)avl_apply( bi->sql_oc_by_oc, backsql_oc_get_attr_mapping,
&bas, BACKSQL_AVL_STOP, AVL_INORDER );
SQLFreeStmt( sth, SQL_DROP );
- si->bsql_flags |= BSQLF_SCHEMA_LOADED;
+ bi->sql_flags |= BSQLF_SCHEMA_LOADED;
Debug( LDAP_DEBUG_TRACE, "<==backsql_load_schema_map()\n", 0, 0, 0 );
@@ -525,23 +623,23 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh )
}
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 );
@@ -552,14 +650,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 );
@@ -567,7 +665,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(): "
@@ -583,7 +681,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;
@@ -593,7 +691,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
@@ -618,7 +716,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;
@@ -656,7 +754,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) */
@@ -673,9 +771,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;
}
@@ -697,7 +797,7 @@ 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 );
@@ -706,9 +806,7 @@ backsql_supad2at( backsql_oc_map_rec *objclass, AttributeDescription *supad,
*pret = NULL;
- va.ret = NULL;
va.ad = supad;
- va.n = 0;
rc = avl_apply( objclass->bom_attrs, supad2at_f, &va,
SUPAD2AT_STOP, AVL_INORDER );
@@ -729,10 +827,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 ) {
@@ -741,12 +839,12 @@ 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 );
}
/* 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 );
}
@@ -784,14 +882,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 */
-