/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1999-2003 The OpenLDAP Foundation.
+ * Copyright 1999-2004 The OpenLDAP Foundation.
* Portions Copyright 1999 Dmitry Kovalev.
* All rights reserved.
*
#include <stdio.h>
#include <sys/types.h>
#include "ac/string.h"
+
#include "lber_pvt.h"
#include "ldap_pvt.h"
#include "slap.h"
-#include "back-sql.h"
-#include "sql-wrap.h"
-#include "schema-map.h"
-#include "entry-id.h"
-#include "util.h"
+#include "proto-sql.h"
backsql_entryID *
backsql_free_entryID( backsql_entryID *id, int freeit )
char *end;
*nchildren = strtol( row.cols[ 0 ], &end, 0 );
- if ( end[ 0 ] != '\0' ) {
+ if ( end[ 0 ] != '\0' && end[0] != '.' ) {
+ /* FIXME: braindead RDBMSes return
+ * a fractional number from COUNT!
+ */
res = LDAP_OTHER;
}
{
backsql_at_map_rec *at = v_at;
backsql_srch_info *bsi = v_bsi;
- backsql_info *bi = (backsql_info *)bsi->op->o_bd->be_private;
+ backsql_info *bi = (backsql_info *)bsi->bsi_op->o_bd->be_private;
RETCODE rc;
SQLHSTMT sth;
BACKSQL_ROW_NTS row;
Debug( LDAP_DEBUG_TRACE, "==>backsql_get_attr_vals(): "
"oc='%s' attr='%s' keyval=%ld\n",
- BACKSQL_OC_NAME( bsi->oc ), at->ad->ad_cname.bv_val,
- bsi->c_eid->keyval );
+ BACKSQL_OC_NAME( bsi->bsi_oc ), at->bam_ad->ad_cname.bv_val,
+ bsi->bsi_c_eid->keyval );
- rc = backsql_Prepare( bsi->dbh, &sth, at->query, 0 );
+ rc = backsql_Prepare( bsi->bsi_dbh, &sth, at->bam_query, 0 );
if ( rc != SQL_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, "backsql_get_attr_values(): "
- "error preparing query: %s\n", at->query, 0, 0 );
- backsql_PrintErrors( bi->db_env, bsi->dbh, sth, rc );
+ "error preparing query: %s\n", at->bam_query, 0, 0 );
+ backsql_PrintErrors( bi->db_env, bsi->bsi_dbh, sth, rc );
return 1;
}
- rc = backsql_BindParamID( sth, 1, &bsi->c_eid->keyval );
+ rc = backsql_BindParamID( sth, 1, &bsi->bsi_c_eid->keyval );
if ( rc != SQL_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, "backsql_get_attr_values(): "
"error binding key value parameter\n", 0, 0, 0 );
if ( ! BACKSQL_SUCCESS( rc ) ) {
Debug( LDAP_DEBUG_TRACE, "backsql_get_attr_values(): "
"error executing attribute query '%s'\n",
- at->query, 0, 0 );
- backsql_PrintErrors( bi->db_env, bsi->dbh, sth, rc );
+ at->bam_query, 0, 0 );
+ backsql_PrintErrors( bi->db_env, bsi->bsi_dbh, sth, rc );
SQLFreeStmt( sth, SQL_DROP );
return 1;
}
*/
bv.bv_len = strlen( row.cols[ i ] );
#endif
- backsql_entry_addattr( bsi->e,
+ backsql_entry_addattr( bsi->bsi_e,
&row.col_names[ i ], &bv,
- bsi->op->o_tmpmemctx );
+ bsi->bsi_op->o_tmpmemctx );
#ifdef BACKSQL_TRACE
Debug( LDAP_DEBUG_TRACE, "prec=%d\n",
SQLFreeStmt( sth, SQL_DROP );
Debug( LDAP_DEBUG_TRACE, "<==backsql_get_attr_vals()\n", 0, 0, 0 );
+ if ( at->bam_next ) {
+ return backsql_get_attr_vals( at->bam_next, v_bsi );
+ }
+
return 1;
}
backsql_id2entry( backsql_srch_info *bsi, Entry *e, backsql_entryID *eid )
{
int i;
- backsql_at_map_rec *at;
int rc;
AttributeDescription *ad_oc = slap_schema.si_ad_objectClass;
Debug( LDAP_DEBUG_TRACE, "==>backsql_id2entry()\n", 0, 0, 0 );
rc = dnPrettyNormal( NULL, &eid->dn, &e->e_name, &e->e_nname,
- bsi->op->o_tmpmemctx );
+ bsi->bsi_op->o_tmpmemctx );
if ( rc != LDAP_SUCCESS ) {
return NULL;
}
- bsi->oc = backsql_id2oc( bsi->op->o_bd->be_private, eid->oc_id );
- bsi->e = e;
- bsi->c_eid = eid;
+ bsi->bsi_oc = backsql_id2oc( bsi->bsi_op->o_bd->be_private, eid->oc_id );
+ bsi->bsi_e = e;
+ bsi->bsi_c_eid = eid;
e->e_attrs = NULL;
e->e_private = NULL;
e->e_id = eid->id;
- if ( bsi->attrs != NULL ) {
+ if ( bsi->bsi_attrs != NULL ) {
Debug( LDAP_DEBUG_TRACE, "backsql_id2entry(): "
"custom attribute list\n", 0, 0, 0 );
- for ( i = 0; bsi->attrs[ i ].an_name.bv_val; i++ ) {
- AttributeName *attr = &bsi->attrs[ i ];
+ for ( i = 0; bsi->bsi_attrs[ i ].an_name.bv_val; i++ ) {
+ backsql_at_map_rec **vat;
+ AttributeName *attr = &bsi->bsi_attrs[ i ];
+ int j;
if ( attr->an_desc == ad_oc ) {
continue;
}
- at = backsql_ad2at( bsi->oc, attr->an_desc );
- if ( at != NULL ) {
- backsql_get_attr_vals( at, bsi );
- } else {
+ rc = backsql_supad2at( bsi->bsi_oc, attr->an_desc, &vat );
+ if ( rc != 0 || vat == NULL ) {
Debug( LDAP_DEBUG_TRACE, "backsql_id2entry(): "
- "attribute '%s' is not defined "
- "for objectlass '%s'\n",
- attr->an_name.bv_val,
- BACKSQL_OC_NAME( bsi->oc ), 0 );
+ "attribute '%s' is not defined "
+ "for objectlass '%s'\n",
+ attr->an_name.bv_val,
+ BACKSQL_OC_NAME( bsi->bsi_oc ), 0 );
+ continue;
+ }
+
+ for ( j = 0; vat[j]; j++ ) {
+ backsql_get_attr_vals( vat[j], bsi );
}
+
+ ch_free( vat );
}
} else {
Debug( LDAP_DEBUG_TRACE, "backsql_id2entry(): "
"retrieving all attributes\n", 0, 0, 0 );
- avl_apply( bsi->oc->attrs, backsql_get_attr_vals,
+ avl_apply( bsi->bsi_oc->bom_attrs, backsql_get_attr_vals,
bsi, 0, AVL_INORDER );
}
- if ( attr_merge_normalize_one( bsi->e, ad_oc, &bsi->oc->oc->soc_cname,
- bsi->op->o_tmpmemctx ) ) {
+ if ( attr_merge_normalize_one( bsi->bsi_e, ad_oc,
+ &bsi->bsi_oc->bom_oc->soc_cname,
+ bsi->bsi_op->o_tmpmemctx ) ) {
entry_free( e );
return NULL;
}
struct berval soc;
int rc;
- bv[ 0 ] = bsi->oc->oc->soc_cname;
+ bv[ 0 ] = bsi->bsi_oc->bom_oc->soc_cname;
bv[ 1 ].bv_val = NULL;
rc = structural_class( bv, &soc, NULL,
}
if ( ( bsi->bsi_flags | BSQL_SF_ALL_OPER )
- || an_find( bsi->attrs, &AllOper ) ) {
- rc = attr_merge_normalize_one( bsi->e,
+ || an_find( bsi->bsi_attrs, &AllOper ) ) {
+ rc = attr_merge_normalize_one( bsi->bsi_e,
slap_schema.si_ad_structuralObjectClass,
- &soc, bsi->op->o_tmpmemctx );
+ &soc, bsi->bsi_op->o_tmpmemctx );
if ( rc != LDAP_SUCCESS ) {
entry_free( e );
return NULL;
projects / openldap / blobdiff