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

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

diff --git a/servers/slapd/back-sql/init.c b/servers/slapd/back-sql/init.c
index 712ac7aef65658cdda027063dcc4fe8aeefa34e9..2e0c2829660c8330c8e30d6dd916a2602e26f907 100644 (file)
--- a/servers/slapd/back-sql/init.c
+++ b/servers/slapd/back-sql/init.c
@@ -23,7 +23,7 @@
 #ifdef SLAPD_SQL_DYNAMIC
 
 int
-backsql_LTX_init_module(
+init_module(
        int             argc, 
        char            *argv[] )
 {
@@ -388,14 +388,11 @@ backsql_db_open(
                        backsql_strcat( &bb, backsql_id_query,
                                        "dn_ru=?", NULL );
                } else {
-#if 0
                        if ( BACKSQL_USE_REVERSE_DN( si ) ) {
-#endif 
                                backsql_strfcat( &bb, "sbl",
                                                backsql_id_query,
                                                &si->upper_func, 
                                                (ber_len_t)sizeof( "(dn)=?" ) - 1, "(dn)=?" );
-#if 0
                        } else {
                                backsql_strfcat( &bb, "sblbcb",
                                                backsql_id_query,
@@ -405,7 +402,6 @@ backsql_db_open(
                                                '?', 
                                                &si->upper_func_close );
                        }
-#endif
                }
        }
        si->id_query = bb.bb_val.bv_val;
@@ -419,7 +415,7 @@ backsql_db_open(
        bb.bb_val.bv_len = 0;
        bb.bb_len = 0;
        backsql_strfcat( &bb, "sb",
-                       "SELECT COUNT(distinct subordinates.id) FROM ldap_entries,ldap_entries AS subordinates WHERE subordinates.parent=ldap_entries.id AND ",
+                       "SELECT COUNT(distinct subordinates.id) FROM ldap_entries,ldap_entries subordinates WHERE subordinates.parent=ldap_entries.id AND ",
 
                        &si->children_cond );
        si->has_children_query = bb.bb_val.bv_val;