/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1999-2004 The OpenLDAP Foundation.
+ * Copyright 1999-2012 The OpenLDAP Foundation.
* Portions Copyright 1999 Dmitry Kovalev.
+ * Portions Copyright 2002 Pierangelo Masarati.
* Portions Copyright 2004 Mark Adamson.
* All rights reserved.
*
*/
/* 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"
#include <sys/types.h>
#include "ac/string.h"
+#include "lutil.h"
#include "slap.h"
#include "proto-sql.h"
const backsql_at_map_rec *m1 = v_m1,
*m2 = v_m2;
+ if ( slap_ad_is_binary( m1->bam_ad ) || slap_ad_is_binary( m2->bam_ad ) ) {
+#ifdef BACKSQL_USE_PTR_CMP
+ return SLAP_PTRCMP( m1->bam_ad->ad_type, m2->bam_ad->ad_type );
+#else /* ! BACKSQL_USE_PTR_CMP */
+ return ber_bvcmp( &m1->bam_ad->ad_type->sat_cname, &m2->bam_ad->ad_type->sat_cname );
+#endif /* ! BACKSQL_USE_PTR_CMP */
+ }
+
#ifdef BACKSQL_USE_PTR_CMP
return SLAP_PTRCMP( m1->bam_ad, m2->bam_ad );
#else /* ! BACKSQL_USE_PTR_CMP */
backsql_at_map_rec *m1 = v_m1,
*m2 = v_m2;
- assert( m1->bam_ad == m2->bam_ad );
+ if ( slap_ad_is_binary( m1->bam_ad ) || slap_ad_is_binary( m2->bam_ad ) ) {
+#ifdef BACKSQL_USE_PTR_CMP
+ assert( m1->bam_ad->ad_type == m2->bam_ad->ad_type );
+#else /* ! BACKSQL_USE_PTR_CMP */
+ assert( ber_bvcmp( &m1->bam_ad->ad_type->sat_cname, &m2->bam_ad->ad_type->sat_cname ) == 0 );
+#endif /* ! BACKSQL_USE_PTR_CMP */
+
+ } else {
+#ifdef BACKSQL_USE_PTR_CMP
+ assert( m1->bam_ad == m2->bam_ad );
+#else /* ! BACKSQL_USE_PTR_CMP */
+ assert( ber_bvcmp( &m1->bam_ad->ad_cname, &m2->bam_ad->ad_cname ) == 0 );
+#endif /* ! BACKSQL_USE_PTR_CMP */
+ }
/* 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;
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;
-#ifdef BACKSQL_ALIASING_QUOTE
- backsql_strfcat( &bb, "lblcbclblbcbl",
+ backsql_strfcat_x( &bb, NULL, "lblbbbblblbcbl",
(ber_len_t)STRLENOF( "SELECT " ), "SELECT ",
&at_map->bam_sel_expr,
- (ber_len_t)STRLENOF( " " BACKSQL_ALIASING ), " " BACKSQL_ALIASING,
- BACKSQL_ALIASING_QUOTE,
+ (ber_len_t)STRLENOF( " " ), " ",
+ &bi->sql_aliasing,
+ &bi->sql_aliasing_quote,
&at_map->bam_ad->ad_cname,
- BACKSQL_ALIASING_QUOTE,
+ &bi->sql_aliasing_quote,
(ber_len_t)STRLENOF( " FROM " ), " FROM ",
&at_map->bam_from_tbls,
(ber_len_t)STRLENOF( " WHERE " ), " WHERE ",
'.',
&oc_map->bom_keycol,
(ber_len_t)STRLENOF( "=?" ), "=?" );
-#else /* ! BACKSQL_ALIASING_QUOTE */
- backsql_strfcat( &bb, "lblblblbcbl",
- (ber_len_t)STRLENOF( "SELECT " ), "SELECT ",
- &at_map->bam_sel_expr,
- (ber_len_t)STRLENOF( " " BACKSQL_ALIASING ), " " BACKSQL_ALIASING,
+
+ 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,
- (ber_len_t)STRLENOF( " FROM " ), " FROM ",
+ &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.
+
+ SELECT COUNT(*) FROM <from_tbls> WHERE <keytbl>.<keycol>=?
+ [ AND <join_where> ]
+
+ */
+ 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( "=?" ), "=?" );
-#endif /* ! BACKSQL_ALIASING_QUOTE */
if ( !BER_BVISNULL( &at_map->bam_join_where ) ) {
- backsql_strfcat( &bb, "lb",
+ backsql_strfcat_x( &bb, NULL, "lb",
(ber_len_t)STRLENOF( " AND " ), " AND ",
&at_map->bam_join_where );
}
-#ifdef BACKSQL_ALIASING_QUOTE
- backsql_strfcat( &bb, "lcbc",
- (ber_len_t)STRLENOF( " ORDER BY " ), " ORDER BY ",
- BACKSQL_ALIASING_QUOTE,
- &at_map->bam_sel_expr,
- BACKSQL_ALIASING_QUOTE );
-#else /* ! BACKSQL_ALIASING_QUOTE */
- backsql_strfcat( &bb, "lb",
- (ber_len_t)STRLENOF( " ORDER BY " ), " ORDER BY ",
- &at_map->bam_sel_expr );
-#endif /* ! BACKSQL_ALIASING_QUOTE */
+ at_map->bam_countquery = bb.bb_val.bv_val;
+#endif /* BACKSQL_COUNTQUERY */
- at_map->bam_query = bb.bb_val.bv_val;
-
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";
+ char s[LDAP_PVT_INTTYPE_CHARS(long)];
struct berval sbv;
struct berbuf bb;
sbv.bv_val = s;
- snprintf( s, sizeof( s ), "%ld", oc_map->bom_id );
- sbv.bv_len = strlen( s );
+ sbv.bv_len = snprintf( s, sizeof( s ), BACKSQL_IDNUMFMT, oc_map->bom_id );
/* 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;
+ at_map->bam_true_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,
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;
BER_BVZERO( &bb.bb_val );
bb.bb_len = 0;
- backsql_strfcat( &bb, "lbcblb",
+ 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,
at_map->bam_add_proc = NULL;
{
- char tmp[] =
- "INSERT INTO ldap_entry_objclasses "
+ char tmp[STRLENOF("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=?),?)";
+ "WHERE oc_map_id= "
+ "AND keyval=?),?)") + LDAP_PVT_INTTYPE_CHARS(unsigned long)];
snprintf( tmp, sizeof(tmp),
"INSERT INTO ldap_entry_objclasses "
"(entry_id,oc_name) VALUES "
"((SELECT id FROM ldap_entries "
- "WHERE oc_map_id=%lu "
+ "WHERE oc_map_id=" BACKSQL_IDNUMFMT " "
"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 "
+ char tmp[STRLENOF("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=?";
+ "WHERE oc_map_id= "
+ "AND keyval=?) AND oc_name=?") + LDAP_PVT_INTTYPE_CHARS(unsigned long)];
snprintf( tmp, sizeof(tmp),
"DELETE FROM ldap_entry_objclasses "
"WHERE entry_id=(SELECT id FROM ldap_entries "
- "WHERE oc_map_id=%lu"
+ "WHERE oc_map_id=" BACKSQL_IDNUMFMT " "
"AND keyval=?) AND oc_name=?",
oc_map->bom_id );
at_map->bam_delete_proc = ch_strdup( tmp );
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",
ch_free( at_map->bam_join_where.bv_val );
BER_BVZERO( &bb.bb_val );
bb.bb_len = 0;
- backsql_strfcat( &bb, "lbcblb",
+ 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,
&sbv );
at_map->bam_join_where = bb.bb_val;
- /* referral attribute */
- 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_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;
-
- BER_BVZERO( &bb.bb_val );
- bb.bb_len = 0;
- backsql_strfcat( &bb, "lbcblb",
- (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=",
- &oc_map->bom_keytbl,
- '.',
- &oc_map->bom_keycol,
- (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_oc = NULL;
-
- at_map->bam_add_proc = NULL;
- {
- char tmp[] =
- "INSERT INTO ldap_referrals "
- "(entry_id,url) VALUES "
- "((SELECT id FROM ldap_entries "
- "WHERE oc_map_id="
- "18446744073709551615UL " /* 64 bit ULONG */
- "AND keyval=?),?)";
- snprintf( tmp, sizeof(tmp),
- "INSERT INTO ldap_referrals "
- "(entry_id,url) 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_referrals "
- "WHERE entry_id=(SELECT id FROM ldap_entries "
- "WHERE oc_map_id="
- "18446744073709551615UL " /* 64 bit ULONG */
- "AND keyval=?) and url=?";
- snprintf( tmp, sizeof(tmp),
- "DELETE FROM ldap_referrals "
- "WHERE entry_id=(SELECT id FROM ldap_entries "
- "WHERE oc_map_id=%lu"
- "AND keyval=?) and url=?",
- 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 );
- 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;
}
backsql_info *bas_bi;
SQLHDBC bas_dbh;
SQLHSTMT bas_sth;
- unsigned long *bas_oc_id;
+ backsql_key_t *bas_oc_id;
int bas_rc;
};
"executing at_query\n"
" \"%s\"\n"
" for objectClass \"%s\"\n"
- " with param oc_id=\"%lu\"\n",
+ " with param oc_id=" BACKSQL_IDNUMFMT "\n",
bas->bas_bi->sql_at_query,
BACKSQL_OC_NAME( oc_map ),
*bas->bas_oc_id );
"error executing at_query\n"
" \"%s\"\n"
" for objectClass \"%s\"\n"
- " with param oc_id=\"%lu\"\n",
+ " with param oc_id=" BACKSQL_IDNUMFMT "\n",
bas->bas_bi->sql_at_query,
BACKSQL_OC_NAME( oc_map ),
*bas->bas_oc_id );
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;
+ AttributeDescription *ad = 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 );
+ {
+ struct {
+ int idx;
+ char *name;
+ } required[] = {
+ { 0, "name" },
+ { 1, "sel_expr" },
+ { 2, "from" },
+ { -1, NULL },
+ };
+ int i;
+
+ for ( i = 0; required[ i ].name != NULL; i++ ) {
+ if ( at_row.value_len[ i ] <= 0 ) {
+ Debug( LDAP_DEBUG_ANY,
+ "backsql_oc_get_attr_mapping(): "
+ "required column #%d \"%s\" is empty\n",
+ required[ i ].idx, required[ i ].name, 0 );
+ bas->bas_rc = LDAP_OTHER;
+ return BACKSQL_AVL_STOP;
+ }
+ }
+ }
+
+ {
+ char buf[ SLAP_TEXT_BUFLEN ];
+
+ snprintf( buf, sizeof( buf ),
+ "attributeType: "
+ "name=\"%s\" "
+ "sel_expr=\"%s\" "
+ "from=\"%s\" "
+ "join_where=\"%s\" "
+ "add_proc=\"%s\" "
+ "delete_proc=\"%s\" "
+ "sel_expr_u=\"%s\"",
+ at_row.cols[ 0 ],
+ at_row.cols[ 1 ],
+ at_row.cols[ 2 ],
+ at_row.cols[ 3 ] ? at_row.cols[ 3 ] : "",
+ at_row.cols[ 4 ] ? at_row.cols[ 4 ] : "",
+ at_row.cols[ 5 ] ? at_row.cols[ 5 ] : "",
+ at_row.cols[ 8 ] ? at_row.cols[ 8 ] : "");
+ Debug( LDAP_DEBUG_TRACE, "%s\n", buf, 0, 0 );
+ }
+
+ rc = slap_str2ad( at_row.cols[ 0 ], &ad, &text );
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_attr_mapping(): "
"attribute \"%s\" for objectClass \"%s\" "
bas->bas_rc = LDAP_CONSTRAINT_VIOLATION;
return BACKSQL_AVL_STOP;
}
+ at_map = (backsql_at_map_rec *)ch_calloc( 1,
+ sizeof( backsql_at_map_rec ) );
+ at_map->bam_ad = ad;
+ at_map->bam_true_ad = ad;
+ if ( slap_syntax_is_binary( ad->ad_type->sat_syntax )
+ && !slap_ad_is_binary( ad ) )
+ {
+ char buf[ SLAP_TEXT_BUFLEN ];
+ struct berval bv;
+ const char *text = NULL;
+
+ bv.bv_val = buf;
+ bv.bv_len = snprintf( buf, sizeof( buf ), "%s;binary",
+ ad->ad_cname.bv_val );
+ at_map->bam_true_ad = NULL;
+ bas->bas_rc = slap_bv2ad( &bv, &at_map->bam_true_ad, &text );
+ if ( bas->bas_rc != LDAP_SUCCESS ) {
+ Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_attr_mapping(): "
+ "unable to fetch attribute \"%s\": %s (%d)\n",
+ buf, text, rc );
+ return BACKSQL_AVL_STOP;
+ }
+ }
ber_str2bv( at_row.cols[ 1 ], 0, 1, &at_map->bam_sel_expr );
- if ( at_row.value_len[ 8 ] < 0 ) {
+ if ( at_row.value_len[ 8 ] <= 0 ) {
BER_BVZERO( &at_map->bam_sel_expr_u );
} else {
}
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 ) {
+ if ( at_row.value_len[ 3 ] <= 0 ) {
BER_BVZERO( &at_map->bam_join_where );
} else {
}
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_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 ],
- &next, 0 );
- if ( next == at_row.cols[ 6 ] || next[0] != '\0' ) {
+ if ( lutil_atoix( &at_map->bam_param_order, at_row.cols[ 6 ], 0 ) != 0 ) {
/* error */
}
- at_map->bam_expect_return = strtol( at_row.cols[ 7 ],
- &next, 0 );
- if ( next == at_row.cols[ 7 ] || next[0] != '\0' ) {
+ if ( lutil_atoix( &at_map->bam_expect_return, at_row.cols[ 7 ], 0 ) != 0 ) {
/* error */
}
- backsql_make_attr_query( oc_map, at_map );
+ 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 );
{
struct berbuf bb = BB_NULL;
- backsql_strfcat( &bb, "bcbc",
+ backsql_strfcat_x( &bb, NULL, "bcbc",
&bas->bas_bi->sql_upper_func,
'(' /* ) */ ,
&at_map->bam_sel_expr,
"autoadding 'objectClass' and 'ref' mappings\n",
BACKSQL_OC_NAME( oc_map ), 0, 0 );
- (void)backsql_add_sysmaps( oc_map );
+ (void)backsql_add_sysmaps( bas->bas_bi, oc_map );
return BACKSQL_AVL_CONTINUE;
}
SQLHSTMT sth = SQL_NULL_HSTMT;
RETCODE rc;
BACKSQL_ROW_NTS oc_row;
- unsigned long oc_id;
+ backsql_key_t oc_id;
backsql_oc_map_rec *oc_map;
struct backsql_attr_schema_info bas;
+ int delete_proc_idx = 5;
+ int create_hint_idx = delete_proc_idx + 2;
+
Debug( LDAP_DEBUG_TRACE, "==>backsql_load_schema_map()\n", 0, 0, 0 );
/*
backsql_BindRowAsStrings( sth, &oc_row );
rc = SQLFetch( sth );
+
+ if ( BACKSQL_CREATE_NEEDS_SELECT( bi ) ) {
+ delete_proc_idx++;
+ create_hint_idx++;
+ }
+
for ( ; BACKSQL_SUCCESS( rc ); rc = SQLFetch( sth ) ) {
- int colnum;
+ {
+ struct {
+ int idx;
+ char *name;
+ } required[] = {
+ { 0, "id" },
+ { 1, "name" },
+ { 2, "keytbl" },
+ { 3, "keycol" },
+ { -1, "expect_return" },
+ { -1, NULL },
+ };
+ int i;
+
+ required[4].idx = delete_proc_idx + 1;
+
+ for ( i = 0; required[ i ].name != NULL; i++ ) {
+ if ( oc_row.value_len[ required[ i ].idx ] <= 0 ) {
+ Debug( LDAP_DEBUG_ANY,
+ "backsql_load_schema_map(): "
+ "required column #%d \"%s\" is empty\n",
+ required[ i ].idx, required[ i ].name, 0 );
+ return LDAP_OTHER;
+ }
+ }
+ }
+
+ {
+ char buf[ SLAP_TEXT_BUFLEN ];
+
+ snprintf( buf, sizeof( buf ),
+ "objectClass: "
+ "id=\"%s\" "
+ "name=\"%s\" "
+ "keytbl=\"%s\" "
+ "keycol=\"%s\" "
+ "create_proc=\"%s\" "
+ "create_keyval=\"%s\" "
+ "delete_proc=\"%s\" "
+ "expect_return=\"%s\""
+ "create_hint=\"%s\" ",
+ oc_row.cols[ 0 ],
+ oc_row.cols[ 1 ],
+ oc_row.cols[ 2 ],
+ oc_row.cols[ 3 ],
+ oc_row.cols[ 4 ] ? oc_row.cols[ 4 ] : "",
+ ( BACKSQL_CREATE_NEEDS_SELECT( bi ) && oc_row.cols[ 5 ] ) ? oc_row.cols[ 5 ] : "",
+ oc_row.cols[ delete_proc_idx ] ? oc_row.cols[ delete_proc_idx ] : "",
+ oc_row.cols[ delete_proc_idx + 1 ],
+ ( ( oc_row.ncols > create_hint_idx ) && oc_row.cols[ create_hint_idx ] ) ? oc_row.cols[ create_hint_idx ] : "" );
+ Debug( LDAP_DEBUG_TRACE, "%s\n", buf, 0, 0 );
+ }
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 ( BACKSQL_STR2ID( &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 ) {
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
+ oc_map->bom_create_proc = ( oc_row.value_len[ 4 ] <= 0 ) ? NULL
: ch_strdup( oc_row.cols[ 4 ] );
- colnum = 5;
if ( BACKSQL_CREATE_NEEDS_SELECT( bi ) ) {
- colnum = 6;
- oc_map->bom_create_keyval = ( oc_row.value_len[ 5 ] < 0 )
+ 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 );
-
- colnum += 2;
- if ( ( oc_row.ncols > colnum ) &&
- ( oc_row.value_len[ colnum ] > 0 ) )
+ oc_map->bom_delete_proc = ( oc_row.value_len[ delete_proc_idx ] <= 0 ) ? NULL
+ : ch_strdup( oc_row.cols[ delete_proc_idx ] );
+ if ( lutil_atoix( &oc_map->bom_expect_return, oc_row.cols[ delete_proc_idx + 1 ], 0 ) != 0 ) {
+ Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): "
+ "unable to parse expect_return=\"%s\" for objectClass \"%s\"\n",
+ oc_row.cols[ delete_proc_idx + 1 ], oc_row.cols[ 1 ], 0 );
+ return LDAP_OTHER;
+ }
+
+ if ( ( oc_row.ncols > create_hint_idx ) &&
+ ( oc_row.value_len[ create_hint_idx ] > 0 ) )
{
const char *text;
oc_map->bom_create_hint = NULL;
- rc = slap_str2ad( oc_row.cols[ colnum ],
+ rc = slap_str2ad( oc_row.cols[ create_hint_idx ],
&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 ],
+ oc_row.cols[ create_hint_idx ],
text, rc );
backsql_PrintErrors( bi->sql_db_env, dbh,
sth, rc );
return LDAP_OTHER;
}
- rc = backsql_BindParamInt( sth, 1, SQL_PARAM_INPUT, &oc_id );
+ rc = backsql_BindParamNumID( 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 );
#ifdef BACKSQL_TRACE
Debug( LDAP_DEBUG_TRACE, "==>oc_with_id(): "
- "searching for objectclass with id='%d'\n", id, 0, 0 );
+ "searching for objectclass with id=%lu\n", id, 0, 0 );
#endif /* BACKSQL_TRACE */
tmp.bom_id = id;
#ifdef BACKSQL_TRACE
if ( res != NULL ) {
- Debug( LDAP_DEBUG_TRACE, "<==oc_with_name(): "
- "found name=\"%s\", id=%d\n",
+ Debug( LDAP_DEBUG_TRACE, "<==oc_with_id(): "
+ "found name=\"%s\", id=%lu\n",
BACKSQL_OC_NAME( res ), res->bom_id, 0 );
} else {
- Debug( LDAP_DEBUG_TRACE, "<==oc_with_name(): "
- "not found\n", 0, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE, "<==oc_with_id(): "
+ "id=%lu not found\n", res->bom_id, 0, 0 );
}
#endif /* BACKSQL_TRACE */
backsql_at_map_rec *
backsql_ad2at( backsql_oc_map_rec* objclass, AttributeDescription *ad )
{
- backsql_at_map_rec tmp, *res;
+ backsql_at_map_rec tmp = { 0 }, *res;
#ifdef BACKSQL_TRACE
Debug( LDAP_DEBUG_TRACE, "==>backsql_ad2at(): "
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) */
}
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;
}
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 );
ch_free( at->bam_query );
}
+#ifdef BACKSQL_COUNTQUERY
+ if ( at->bam_countquery != NULL ) {
+ ch_free( at->bam_countquery );
+ }
+#endif /* BACKSQL_COUNTQUERY */
+
/* TimesTen */
if ( !BER_BVISNULL( &at->bam_sel_expr_u ) ) {
ch_free( at->bam_sel_expr_u.bv_val );
projects / openldap / blobdiff