adding more test

this tests only work on my box i'll provide a test.ldif in the future
guedes · Jan 25, 2013 · 5c9db48 · 5c9db48
1 parent e86b71c
commit 5c9db48
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 10 deletions.
diff --git a/src/ldap_fdw.c b/src/ldap_fdw.c
@@ -360,7 +360,7 @@ ldapIterateForeignScan(ForeignScanState *node)
   char                    *dn;
   char                    *attribute;
 
-  char                    object_body[1024];
+  char                    object_body[1024] = "";
   char                    **values;
   char                    **temp;
 
@@ -375,7 +375,7 @@ ldapIterateForeignScan(ForeignScanState *node)
           attribute = ldap_next_attribute(festate->ldap_connection, festate->ldap_entry, ber))
     {
       strcat(object_body, attribute);
-      strcat(object_body, ": ");
+      strcat(object_body, " => \"");
 
       if ((temp = ldap_get_values(festate->ldap_connection, festate->ldap_entry, attribute)) != NULL)
       {
@@ -385,9 +385,9 @@ ldapIterateForeignScan(ForeignScanState *node)
             strcat(object_body, ",");
 
           strcat(object_body, temp[i]);
-          strcat(object_body, "\n");
         }
 
+        strcat(object_body, "\",\n");
         ldap_value_free(temp);
       }
 
@@ -406,6 +406,7 @@ ldapIterateForeignScan(ForeignScanState *node)
     if (ber != NULL)
       ber_free(ber, 0);
 
+    pfree(values);
   }
 
   return slot;
@@ -422,6 +423,7 @@ ldapEndForeignScan(ForeignScanState *node)
 {
   LdapFdwExecutionState   *festate  = (LdapFdwExecutionState *) node->fdw_state;
 
+  ldap_memfree(festate->ldap_entry);
   ldap_unbind( festate->ldap_connection );
 }
 

diff --git a/test/expected/base.out b/test/expected/base.out
@@ -12,13 +12,29 @@ CREATE FOREIGN TABLE ldap_people (
 SERVER ldap_test_server
 OPTIONS (base_dn 'DC=guedesoft,DC=net');
 SELECT * FROM ldap_people WHERE dn = 'cn=admin,dc=guedesoft,dc=net';
-              dn              |                     object_body                      
-------------------------------+------------------------------------------------------
- cn=admin,dc=guedesoft,dc=net | objectClass: simpleSecurityObject                   +
-                              | ,organizationalRole                                 +
-                              | cn: admin                                           +
-                              | description: LDAP administrator                     +
-                              | userPassword: {SSHA}W0P/R7GRoqr1sl2JMMnG0TXn1UP1uVn6+
+              dn              |                        object_body                        
+------------------------------+-----------------------------------------------------------
+ cn=admin,dc=guedesoft,dc=net | objectClass => "simpleSecurityObject,organizationalRole",+
+                              | cn => "admin",                                           +
+                              | description => "LDAP administrator",                     +
+                              | userPassword => "{SSHA}W0P/R7GRoqr1sl2JMMnG0TXn1UP1uVn6" +
                               | 
 (1 row)
 
+SELECT * FROM ldap_people ;
+               dn               |                        object_body                        
+--------------------------------+-----------------------------------------------------------
+ cn=admin,dc=guedesoft,dc=net   | objectClass => "simpleSecurityObject,organizationalRole",+
+                                | cn => "admin",                                           +
+                                | description => "LDAP administrator",                     +
+                                | userPassword => "{SSHA}W0P/R7GRoqr1sl2JMMnG0TXn1UP1uVn6" +
+                                | 
+ ou=people,dc=guedesoft,dc=net  | objectClass => "organizationalUnit,top",                 +
+                                | ou => "people"                                           +
+                                | 
+ cn=usuario,dc=guedesoft,dc=net | gidNumber => "500",                                      +
+                                | cn => "usuario",                                         +
+                                | objectClass => "posixGroup,top"                          +
+                                | 
+(3 rows)
+
diff --git a/test/sql/base.sql b/test/sql/base.sql
@@ -16,3 +16,4 @@ SERVER ldap_test_server
 OPTIONS (base_dn 'DC=guedesoft,DC=net');
 
 SELECT * FROM ldap_people WHERE dn = 'cn=admin,dc=guedesoft,dc=net';
+SELECT * FROM ldap_people ;