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

[openldap] / servers / slapd / back-sql / sql-wrap.c

diff --git a/servers/slapd/back-sql/sql-wrap.c b/servers/slapd/back-sql/sql-wrap.c
index cde2d30ecb746fc60a95f508258f2ed5f67761ea..5a5f4cdc4e65b4fb92170bc43e5c27ad9337210e 100644 (file)
--- a/servers/slapd/back-sql/sql-wrap.c
+++ b/servers/slapd/back-sql/sql-wrap.c
@@ -65,13 +65,13 @@ backsql_Prepare( SQLHDBC dbh, SQLHSTMT *sth, char *query, int timeout )
        }
 
 #ifdef BACKSQL_TRACE
-       Debug( LDAP_DEBUG_TRACE, "==>_SQLPrepare()\n", 0, 0, 0 );
+       Debug( LDAP_DEBUG_TRACE, "==>backsql_Prepare()\n", 0, 0, 0 );
 #endif /* BACKSQL_TRACE */
 
        SQLGetInfo( dbh, SQL_DRIVER_NAME, drv_name, sizeof( drv_name ), &len );
 
 #ifdef BACKSQL_TRACE
-       Debug( LDAP_DEBUG_TRACE, "_SQLPrepare(): driver name='%s'\n",
+       Debug( LDAP_DEBUG_TRACE, "backsql_Prepare(): driver name='%s'\n",
                        drv_name, 0, 0 );
 #endif /* BACKSQL_TRACE */
 
@@ -89,7 +89,7 @@ backsql_Prepare( SQLHDBC dbh, SQLHSTMT *sth, char *query, int timeout )
                rc = SQLSetStmtOption( *sth, SQL_CONCURRENCY, 
                                SQL_CONCUR_ROWVER );
                if ( rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO ) {
-                       Debug( LDAP_DEBUG_TRACE, "_SQLPrepare(): "
+                       Debug( LDAP_DEBUG_TRACE, "backsql_Prepare(): "
                                "SQLSetStmtOption(SQL_CONCURRENCY,"
                                "SQL_CONCUR_ROWVER) failed:\n", 
                                0, 0, 0 );
@@ -108,7 +108,7 @@ backsql_Prepare( SQLHDBC dbh, SQLHSTMT *sth, char *query, int timeout )
        }
 
 #ifdef BACKSQL_TRACE
-       Debug( LDAP_DEBUG_TRACE, "<==_SQLPrepare() calling SQLPrepare()\n",
+       Debug( LDAP_DEBUG_TRACE, "<==backsql_Prepare() calling SQLPrepare()\n",
                        0, 0, 0 );
 #endif /* BACKSQL_TRACE */
 
@@ -160,7 +160,7 @@ backsql_BindRowAsStrings( SQLHSTMT sth, BACKSQL_ROW_NTS *row )
        rc = SQLNumResultCols( sth, &row->ncols );
        if ( rc != SQL_SUCCESS ) {
 #ifdef BACKSQL_TRACE
-               Debug( LDAP_DEBUG_TRACE, "_SQLBindRowAsStrings(): "
+               Debug( LDAP_DEBUG_TRACE, "backsql_BindRowAsStrings(): "
                        "SQLNumResultCols() failed:\n", 0, 0, 0 );
 #endif /* BACKSQL_TRACE */
                
@@ -177,7 +177,7 @@ backsql_BindRowAsStrings( SQLHSTMT sth, BACKSQL_ROW_NTS *row )
                                sizeof( char * ) );
                row->col_prec = (UDWORD *)ch_calloc( row->ncols,
                                sizeof( UDWORD ) );
-               row->is_null = (SQLINTEGER *)ch_calloc( row->ncols,
+               row->value_len = (SQLINTEGER *)ch_calloc( row->ncols,
                                sizeof( SQLINTEGER ) );
                for ( i = 1; i <= row->ncols; i++ ) {
                        rc = SQLDescribeCol( sth, (SQLSMALLINT)i, &colname[ 0 ],
@@ -213,7 +213,7 @@ backsql_BindRowAsStrings( SQLHSTMT sth, BACKSQL_ROW_NTS *row )
                                                SQL_C_CHAR,
                                                (SQLPOINTER)row->cols[ i - 1 ],
                                                col_prec + 1,
-                                               &row->is_null[ i - 1 ] );
+                                               &row->value_len[ i - 1 ] );
                        } else {
                                row->cols[ i - 1 ] = (char *)ch_calloc( col_prec + 1, sizeof( char ) );
                                row->col_prec[ i - 1 ] = col_prec;
@@ -221,7 +221,7 @@ backsql_BindRowAsStrings( SQLHSTMT sth, BACKSQL_ROW_NTS *row )
                                                SQL_C_CHAR,
                                                (SQLPOINTER)row->cols[ i - 1 ],
                                                col_prec + 1,
-                                               &row->is_null[ i - 1 ] );
+                                               &row->value_len[ i - 1 ] );
                        }
                }
 
@@ -247,14 +247,15 @@ backsql_FreeRow( BACKSQL_ROW_NTS *row )
        ber_bvarray_free( row->col_names );
        ldap_charray_free( row->cols );
        free( row->col_prec );
-       free( row->is_null );
+       free( row->value_len );
 
        return SQL_SUCCESS;
 }
 
 static int
-backsql_cmp_connid( backsql_db_conn *c1, backsql_db_conn *c2 )
+backsql_cmp_connid( const void *v_c1, const void *v_c2 )
 {
+       const backsql_db_conn *c1 = v_c1, *c2 = v_c2;
        if ( c1->ldap_cid > c2->ldap_cid ) {
                return 1;
        }
@@ -390,7 +391,7 @@ backsql_open_db_conn( backsql_info *si, int ldap_cid, backsql_db_conn **pdbc )
        Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn(): "
                "connected, adding to tree\n", 0, 0, 0 );
        ldap_pvt_thread_mutex_lock( &si->dbconn_mutex );
-       avl_insert( &si->db_conns, dbc, (AVL_CMP)backsql_cmp_connid, NULL );
+       avl_insert( &si->db_conns, dbc, backsql_cmp_connid, NULL );
        ldap_pvt_thread_mutex_unlock( &si->dbconn_mutex );
        Debug( LDAP_DEBUG_TRACE, "<==backsql_open_db_conn()\n", 0, 0, 0 );
 
@@ -400,16 +401,15 @@ backsql_open_db_conn( backsql_info *si, int ldap_cid, backsql_db_conn **pdbc )
 }
 
 int
-backsql_free_db_conn( Backend *be, Connection *ldapc )
+backsql_free_db_conn( Operation *op )
 {
-       backsql_info            *si = (backsql_info *)be->be_private;
+       backsql_info            *si = (backsql_info *)op->o_bd->be_private;
        backsql_db_conn         tmp, *conn;
 
        Debug( LDAP_DEBUG_TRACE, "==>backsql_free_db_conn()\n", 0, 0, 0 );
-       tmp.ldap_cid = ldapc->c_connid;
+       tmp.ldap_cid = op->o_connid;
        ldap_pvt_thread_mutex_lock( &si->dbconn_mutex );
-       conn = (backsql_db_conn *)avl_delete( &si->db_conns, &tmp,
-                       (AVL_CMP)backsql_cmp_connid );
+       conn = avl_delete( &si->db_conns, &tmp, backsql_cmp_connid );
        ldap_pvt_thread_mutex_unlock( &si->dbconn_mutex );
 
        /*
@@ -426,9 +426,9 @@ backsql_free_db_conn( Backend *be, Connection *ldapc )
 }
 
 int
-backsql_get_db_conn( Backend *be, Connection *ldapc, SQLHDBC *dbh )
+backsql_get_db_conn( Operation *op, SQLHDBC *dbh )
 {
-       backsql_info            *si = (backsql_info *)be->be_private;
+       backsql_info            *si = (backsql_info *)op->o_bd->be_private;
        backsql_db_conn         *dbc;
        backsql_db_conn         tmp;
        int                     rc = LDAP_SUCCESS;
@@ -438,16 +438,15 @@ backsql_get_db_conn( Backend *be, Connection *ldapc, SQLHDBC *dbh )
        assert( dbh );
        *dbh = SQL_NULL_HDBC;
 
-       tmp.ldap_cid = ldapc->c_connid;
+       tmp.ldap_cid = op->o_connid;
 
        /*
         * we have one thread per connection, as I understand -- 
         * so we do not need locking here
         */
-       dbc = (backsql_db_conn *)avl_find( si->db_conns, &tmp,
-                       (AVL_CMP)backsql_cmp_connid );
+       dbc = avl_find( si->db_conns, &tmp, backsql_cmp_connid );
        if ( !dbc ) {
-               rc = backsql_open_db_conn( si, ldapc->c_connid, &dbc );
+               rc = backsql_open_db_conn( si, op->o_connid, &dbc );
                if ( rc != LDAP_SUCCESS) {
                        Debug( LDAP_DEBUG_TRACE, "backsql_get_db_conn(): "
                                "could not get connection handle "
@@ -463,7 +462,7 @@ backsql_get_db_conn( Backend *be, Connection *ldapc, SQLHDBC *dbh )
                rc = backsql_load_schema_map( si, dbc->dbh );
                if ( rc != LDAP_SUCCESS ) {
                        ldap_pvt_thread_mutex_unlock( &si->schema_mutex );
-                       backsql_free_db_conn( be, ldapc );
+                       backsql_free_db_conn( op );
                        return rc;
                }
        }