apparently Oracle does not support AS in joins (ITS#2642)

[openldap] / servers / slapd / back-sql / entry-id.c

diff --git a/servers/slapd/back-sql/entry-id.c b/servers/slapd/back-sql/entry-id.c
index ccc4f1391e35d3c7506457e144d203435815d26b..81729c8f309a183ea0f055bc2739f79b53a7e947 100644 (file)
--- a/servers/slapd/back-sql/entry-id.c
+++ b/servers/slapd/back-sql/entry-id.c
@@ -263,13 +263,16 @@ backsql_has_children(
        return rc;
 }
 
-int
-backsql_get_attr_vals( backsql_at_map_rec *at, backsql_srch_info *bsi )
+static int
+backsql_get_attr_vals( void *v_at, void *v_bsi )
 {
-       RETCODE         rc;
-       SQLHSTMT        sth;
-       BACKSQL_ROW_NTS row;
-       int             i;
+       backsql_at_map_rec      *at = v_at;
+       backsql_srch_info       *bsi = v_bsi;
+       backsql_info            *bi = (backsql_info *)bsi->op->o_bd->be_private;
+       RETCODE                 rc;
+       SQLHSTMT                sth;
+       BACKSQL_ROW_NTS         row;
+       int                     i;
 
        assert( at );
        assert( bsi );
@@ -283,7 +286,7 @@ backsql_get_attr_vals( backsql_at_map_rec *at, backsql_srch_info *bsi )
        if ( rc != SQL_SUCCESS ) {
                Debug( LDAP_DEBUG_TRACE, "backsql_get_attr_values(): "
                        "error preparing query: %s\n", at->query, 0, 0 );
-               backsql_PrintErrors( bsi->bi->db_env, bsi->dbh, sth, rc );
+               backsql_PrintErrors( bi->db_env, bsi->dbh, sth, rc );
                return 1;
        }
 
@@ -299,7 +302,7 @@ backsql_get_attr_vals( backsql_at_map_rec *at, backsql_srch_info *bsi )
                Debug( LDAP_DEBUG_TRACE, "backsql_get_attr_values(): "
                        "error executing attribute query '%s'\n",
                        at->query, 0, 0 );
-               backsql_PrintErrors( bsi->bi->db_env, bsi->dbh, sth, rc );
+               backsql_PrintErrors( bi->db_env, bsi->dbh, sth, rc );
                SQLFreeStmt( sth, SQL_DROP );
                return 1;
        }
@@ -323,7 +326,8 @@ backsql_get_attr_vals( backsql_at_map_rec *at, backsql_srch_info *bsi )
                                bv.bv_len = strlen( row.cols[ i ] );
 #endif
                                        backsql_entry_addattr( bsi->e, 
-                                               &row.col_names[ i ], &bv );
+                                               &row.col_names[ i ], &bv,
+                                               bsi->op->o_tmpmemctx );
 
 #ifdef BACKSQL_TRACE
                                Debug( LDAP_DEBUG_TRACE, "prec=%d\n",
@@ -354,19 +358,18 @@ backsql_id2entry( backsql_srch_info *bsi, Entry *e, backsql_entryID *eid )
 
        Debug( LDAP_DEBUG_TRACE, "==>backsql_id2entry()\n", 0, 0, 0 );
 
-       rc = dnPrettyNormal( NULL, &eid->dn, &e->e_name, &e->e_nname );
+       rc = dnPrettyNormal( NULL, &eid->dn, &e->e_name, &e->e_nname,
+                       bsi->op->o_tmpmemctx );
        if ( rc != LDAP_SUCCESS ) {
                return NULL;
        }
 
-       bsi->oc = backsql_id2oc( bsi->bi, eid->oc_id );
+       bsi->oc = backsql_id2oc( bsi->op->o_bd->be_private, eid->oc_id );
        bsi->e = e;
        bsi->c_eid = eid;
        e->e_attrs = NULL;
        e->e_private = NULL;
  
-       /* if ( bsi->base_dn != NULL)??? */
-       
        e->e_id = eid->id;
  
        if ( bsi->attrs != NULL ) {
@@ -375,16 +378,7 @@ backsql_id2entry( backsql_srch_info *bsi, Entry *e, backsql_entryID *eid )
                for ( i = 0; bsi->attrs[ i ].an_name.bv_val; i++ ) {
                        AttributeName *attr = &bsi->attrs[ i ];
 
-                       if ( attr->an_desc == ad_oc
-#if 0  /* FIXME: what is 0.10 ? */
-                                       || !BACKSQL_NCMP( &attr->an_name, &bv_n_0_10 ) 
-#endif
-                                       ) {
-#if 0
-                               backsql_entry_addattr( bsi->e, 
-                                               &bv_n_objectclass,
-                                               BACKSQL_OC_NAME( bsi->oc ) );
-#endif
+                       if ( attr->an_desc == ad_oc ) {
                                continue;
                        }
 
@@ -403,11 +397,12 @@ backsql_id2entry( backsql_srch_info *bsi, Entry *e, backsql_entryID *eid )
        } else {
                Debug( LDAP_DEBUG_TRACE, "backsql_id2entry(): "
                        "retrieving all attributes\n", 0, 0, 0 );
-               avl_apply( bsi->oc->attrs, (AVL_APPLY)backsql_get_attr_vals,
+               avl_apply( bsi->oc->attrs, backsql_get_attr_vals,
                                bsi, 0, AVL_INORDER );
        }
 
-       if ( attr_merge_one( bsi->e, ad_oc, &bsi->oc->oc->soc_cname ) ) {
+       if ( attr_merge_normalize_one( bsi->e, ad_oc, &bsi->oc->oc->soc_cname,
+                               bsi->op->o_tmpmemctx ) ) {
                entry_free( e );
                return NULL;
        }
@@ -416,21 +411,26 @@ backsql_id2entry( backsql_srch_info *bsi, Entry *e, backsql_entryID *eid )
                const char      *text = NULL;
                char            textbuf[ 1024 ];
                size_t          textlen = sizeof( textbuf );
-               struct berval   bv[ 2 ] = { bsi->oc->oc->soc_cname, BER_BVNULL };
+               struct berval   bv[ 2 ];
                struct berval   soc;
-               AttributeDescription    *ad_soc
-                       = slap_schema.si_ad_structuralObjectClass;
+               int rc;
+
+               bv[ 0 ] = bsi->oc->oc->soc_cname;
+               bv[ 1 ].bv_val = NULL;
 
-               int rc = structural_class( bv, &soc, NULL, 
+               rc = structural_class( bv, &soc, NULL, 
                                &text, textbuf, textlen );
                if ( rc != LDAP_SUCCESS ) {
                        entry_free( e );
                        return NULL;
                }
 
-               if ( bsi->bsi_flags | BSQL_SF_ALL_OPER 
+               if ( ( bsi->bsi_flags | BSQL_SF_ALL_OPER )
                                || an_find( bsi->attrs, &AllOper ) ) {
-                       if ( attr_merge_one( bsi->e, ad_soc, &soc ) ) {
+                       rc = attr_merge_normalize_one( bsi->e,
+                                       slap_schema.si_ad_structuralObjectClass,
+                                       &soc, bsi->op->o_tmpmemctx );
+                       if ( rc != LDAP_SUCCESS ) {
                                entry_free( e );
                                return NULL;
                        }