-

Alain Prouté
1 parent 75039758
Showing 1 changed file with 34 additions and 20 deletions Show diff stats
anubis_dev/library/data_base/postgres_client.anubis
@@ -998,7 +998,7 @@ define Result(PG_Error,PG_Connection)
                                 {
                                   error(msg) then error(ssl_error(msg)), 
                                   ok(ssl_conn) then 
-                                    print("Connected under SSL.\n"); 
+                                    //print("Connected under SSL.\n"); 
                                     ok(pg_connection(
                                        (Int n) |-> read(ssl_conn,n,10),
                                        (ByteArray b) |-> if write(ssl_conn,b) is 
@@ -1040,7 +1040,7 @@ define (Word8, ByteArray, Backend_Message)   // (type, content, recognized messa
              failure then (type,
                            constant_byte_array(0,0),
                            unreadable_message(type,length,constant_byte_array(0,0))), 
-             success(content) then show(b+content); 
+             success(content) then //show(b+content); 
                                    (type, 
                                     content,
                                     recognize_raw_msg(type,length,content))
@@ -1076,11 +1076,11 @@ define Result(PG_Error,List(List(ByteArray)))
        List(List(ByteArray))    so_far
      ) =
    if get_next_response(show,read) is (type,content,msg) then 
-   if msg is ready_for_query(_)        then ok(reverse(so_far))                            else 
+   if msg is ready_for_query(_)        then ok(reverse(so_far))                                 else 
    if msg is data_row(l)               then read_complete_table_data(show,read,[l . so_far])    else
-   if msg is unreadable_message(t,l,b) then error(unreadable_message(t,b))                 else
-   if msg is unknown_message(t,l,b)    then error(unknown_message(t,b))                    else
-   if msg is error_response(s,c,m1,m2) then error(error_response(s,c,m1,m2))               else
+   if msg is unreadable_message(t,l,b) then error(unreadable_message(t,b))                      else
+   if msg is unknown_message(t,l,b)    then error(unknown_message(t,b))                         else
+   if msg is error_response(s,c,m1,m2) then error(error_response(s,c,m1,m2))                    else
    // all others are ignored:
    read_complete_table_data(show,read,so_far). 
@@ -1099,6 +1099,31 @@ define List((Word8,ByteArray))
       *** [2.4] Making the query function. 
+   An auxiliary function for getting all responses dropping those we don't care about. 
+
+define PG_Answer
+   get_all_responses
+     (
+       ByteArray -> One         show, 
+       Int -> Maybe(ByteArray)  read      
+     ) = 
+   if get_next_response(show,read) is (type,content,first_msg) then 
+   if first_msg is notice_response(_) then get_all_responses(show,read) else
+   if first_msg is row_description(cols) 
+     then if read_complete_table_data(show,read,[]) is
+       {
+         error(e) then forget(wait_for_ready(show,read)); error(e), 
+         ok(data) then table(cols,data)
+       } else 
+   if first_msg is command_complete(tag) 
+     then forget(wait_for_ready(show,read)); command_complete(tag) else
+   if first_msg is error_response(s,c,m1,m2) then 
+     (forget(wait_for_ready(show,read));  error(error_response(s,c,m1,m2))) 
+   else 
+     message_list(read_all_messages(show,read,[(type,content)])). 
+
+
+
 define (String query) -> PG_Answer
    make_query_function
      (
@@ -1112,19 +1137,8 @@ define (String query) -&gt; PG_Answer
         {
           failure then error(cannot_write_to_connection), 
           success(_) then 
-            show(fq); 
-            if get_next_response(show,read) is (type,content,first_msg) then 
-            if first_msg is row_description(cols) 
-              then if read_complete_table_data(show,read,[]) is
-                {
-                  error(e) then forget(wait_for_ready(show,read)); error(e), 
-                  ok(data) then table(cols,data)
-                } else 
-            if first_msg is command_complete(tag) 
-              then forget(wait_for_ready(show,read)); command_complete(tag) else
-            if first_msg is error_response(s,c,m1,m2) then 
-              (forget(wait_for_ready(show,read));  error(error_response(s,c,m1,m2))) else 
-            message_list(read_all_messages(show,read,[(type,content)]))
+            //show(fq); 
+            get_all_responses(show,read)
         }.
@@ -1192,7 +1206,7 @@ define Result(PG_Error,One)
      {
        failure then error(cannot_write_to_connection), 
        success(_) then 
-         show(constant_byte_array(1,'L')+msg); 
+         //show(constant_byte_array(1,'L')+msg); 
          if get_next_response(show,read) is (type,content,next) then  
          if next is unreadable_message(t,_,b)         then error(unreadable_message(t,b))   else
          if next is unknown_message(t,_,b)            then error(unknown_message(t,b))      else