X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-sql%2Fschema-map.c;h=44698952f50864c746a4384c2ff87f38d8dac606;hb=52165180f7713b5fdebef933a9dca8842daa2e2a;hp=618daf5d33cf630ff434a89741e36a6cf2b7d845;hpb=b4e37e518fa20227509b9bf464e1b6049ba82b0a;p=openldap diff --git a/servers/slapd/back-sql/schema-map.c b/servers/slapd/back-sql/schema-map.c index 618daf5d33..44698952f5 100644 --- a/servers/slapd/back-sql/schema-map.c +++ b/servers/slapd/back-sql/schema-map.c @@ -100,19 +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; -#ifdef BACKSQL_ALIASING_QUOTE - backsql_strfcat( &bb, "lblcbclblbcbl", + backsql_strfcat( &bb, "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 ", @@ -120,20 +121,6 @@ backsql_make_attr_query( '.', &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, - &at_map->bam_ad->ad_cname, - (ber_len_t)STRLENOF( " FROM " ), " 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", @@ -141,17 +128,11 @@ backsql_make_attr_query( &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", + backsql_strfcat( &bb, "lbbb", (ber_len_t)STRLENOF( " ORDER BY " ), " ORDER BY ", - &at_map->bam_sel_expr ); -#endif /* ! BACKSQL_ALIASING_QUOTE */ + &bi->sql_aliasing_quote, + &at_map->bam_ad->ad_cname, + &bi->sql_aliasing_quote ); at_map->bam_query = bb.bb_val.bv_val; @@ -182,7 +163,7 @@ backsql_make_attr_query( } 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"; @@ -190,8 +171,7 @@ backsql_add_sysmaps( backsql_oc_map_rec *oc_map ) 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 ), "%ld", oc_map->bom_id ); /* extra objectClasses */ at_map = (backsql_at_map_rec *)ch_calloc(1, @@ -204,7 +184,7 @@ 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; BER_BVZERO( &bb.bb_val ); @@ -261,7 +241,7 @@ backsql_add_sysmaps( backsql_oc_map_rec *oc_map ) 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", @@ -285,81 +265,6 @@ backsql_add_sysmaps( backsql_oc_map_rec *oc_map ) &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; } @@ -455,7 +360,7 @@ 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 ) { BER_BVZERO( &at_map->bam_join_where ); @@ -482,7 +387,7 @@ backsql_oc_get_attr_mapping( void *v_oc, void *v_bas ) if ( next == at_row.cols[ 7 ] || next[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 ); @@ -515,7 +420,7 @@ backsql_oc_get_attr_mapping( void *v_oc, void *v_bas ) "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; }