use new connecT API

[oweals/gnunet.git] / src / my / test_my.c

diff --git a/src/my/test_my.c b/src/my/test_my.c
index 5f778ad462afe7183451d2f1430b79b0ff0bb3f0..4bea101caeaf036afc2a3c53eaf7d1861fec00ad 100644 (file)
--- a/src/my/test_my.c
+++ b/src/my/test_my.c
@@ -46,12 +46,16 @@ run_queries (struct GNUNET_MYSQL_Context *context)
   struct GNUNET_TIME_Absolute abs_time2;
   struct GNUNET_TIME_Absolute forever = GNUNET_TIME_UNIT_FOREVER_ABS;
   struct GNUNET_TIME_Absolute forever2;
+  const struct GNUNET_TIME_AbsoluteNBO abs_time_nbo = GNUNET_TIME_absolute_hton (abs_time);
   struct GNUNET_HashCode hc;
   struct GNUNET_HashCode hc2;
   const char msg[] = "hello";
-  void *msg2 = NULL;;
+  void *msg2 = NULL;
   size_t msg2_len;
 
+  const char msg3[] = "world";
+  char *msg4 = "";
+
   uint16_t u16;
   uint16_t u162;
   uint32_t u32;
@@ -71,27 +75,30 @@ run_queries (struct GNUNET_MYSQL_Context *context)
   pub =  GNUNET_CRYPTO_rsa_private_key_get_public (priv);
   memset (&hmsg, 42, sizeof(hmsg));
   sig = GNUNET_CRYPTO_rsa_sign_fdh (priv,
-                                        &hmsg);
+                                    &hmsg);
   u16 = 16;
   u32 = 32;
-  u64 = 64;
+  u64 = UINT64_MAX;
 
   memset (&hc, 0, sizeof(hc));
   memset (&hc2, 0, sizeof(hc2));
 
-  statements_handle_insert = GNUNET_MYSQL_statement_prepare (context,
-                                        "INSERT INTO test_my2 ("
-                                        " pub"
-                                        ",sig"
-                                        ",abs_time"
-                                        ",forever"
-                                        ",hash"
-                                        ",vsize"
-                                        ",u16"
-                                        ",u32"
-                                        ",u64"
-                                        ") VALUES "
-                                        "( ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+  statements_handle_insert
+    = GNUNET_MYSQL_statement_prepare (context,
+                                      "INSERT INTO test_my2 ("
+                                      " pub"
+                                      ",sig"
+                                      ",abs_time"
+                                      ",forever"
+                                      ",abs_time_nbo"
+                                      ",hash"
+                                      ",vsize"
+                                      ",str"
+                                      ",u16"
+                                      ",u32"
+                                      ",u64"
+                                      ") VALUES "
+                                      "( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
 
   if (NULL == statements_handle_insert)
   {
@@ -104,8 +111,10 @@ run_queries (struct GNUNET_MYSQL_Context *context)
     GNUNET_MY_query_param_rsa_signature (sig),
     GNUNET_MY_query_param_absolute_time (&abs_time),
     GNUNET_MY_query_param_absolute_time (&forever),
+    GNUNET_MY_query_param_absolute_time_nbo (&abs_time_nbo),
     GNUNET_MY_query_param_auto_from_type (&hc),
     GNUNET_MY_query_param_fixed_size (msg, strlen (msg)),
+    GNUNET_MY_query_param_string (msg3),
     GNUNET_MY_query_param_uint16 (&u16),
     GNUNET_MY_query_param_uint32 (&u32),
     GNUNET_MY_query_param_uint64 (&u64),
@@ -120,18 +129,20 @@ run_queries (struct GNUNET_MYSQL_Context *context)
       return 1;
   }
 
-  statements_handle_select = GNUNET_MYSQL_statement_prepare (context,
-                                                              "SELECT"
-                                                              " pub"
-                                                              ",sig"
-                                                              ",abs_time"
-                                                              ",forever"
-                                                              ",hash"
-                                                              ",vsize"
-                                                              ",u16"
-                                                              ",u32"
-                                                              ",u64"
-                                                              " FROM test_my2");
+  statements_handle_select
+    = GNUNET_MYSQL_statement_prepare (context,
+                                      "SELECT"
+                                      " pub"
+                                      ",sig"
+                                      ",abs_time"
+                                      ",forever"
+                                      ",hash"
+                                      ",vsize"
+                                      ",str"
+                                      ",u16"
+                                      ",u32"
+                                      ",u64"
+                                      " FROM test_my2");
 
   if (NULL == statements_handle_select)
   {
@@ -158,6 +169,7 @@ run_queries (struct GNUNET_MYSQL_Context *context)
     GNUNET_MY_result_spec_absolute_time (&forever2),
     GNUNET_MY_result_spec_auto_from_type (&hc2),
     GNUNET_MY_result_spec_variable_size (&msg2, &msg2_len),
+    GNUNET_MY_result_spec_string (&msg4),
     GNUNET_MY_result_spec_uint16 (&u162),
     GNUNET_MY_result_spec_uint32 (&u322),
     GNUNET_MY_result_spec_uint64 (&u642),
@@ -190,16 +202,21 @@ run_queries (struct GNUNET_MYSQL_Context *context)
                          msg2,
                          msg2_len));
 
+  GNUNET_break (strlen (msg3) == strlen(msg4));
+  GNUNET_break (0 ==
+                strcmp (msg3,
+                        msg4));
+
   GNUNET_break (16 == u162);
   GNUNET_break (32 == u322);
-  GNUNET_break (64 == u642);
+  GNUNET_break (UINT64_MAX == u642);
 
   GNUNET_MY_cleanup_result (results_select);
 
   GNUNET_CRYPTO_rsa_signature_free (sig);
   GNUNET_CRYPTO_rsa_private_key_free (priv);
-  GNUNET_CRYPTO_rsa_public_key_free (pub);     
-  
+  GNUNET_CRYPTO_rsa_public_key_free (pub);
+
   if (GNUNET_OK != ret)
     return 1;
 
@@ -210,8 +227,8 @@ run_queries (struct GNUNET_MYSQL_Context *context)
 int
 main (int argc, const char * const argv[])
 {
-  struct GNUNET_CONFIGURATION_Handle *config = NULL;
-  struct GNUNET_MYSQL_Context *context = NULL;
+  struct GNUNET_CONFIGURATION_Handle *config;
+  struct GNUNET_MYSQL_Context *context;
   int ret;
 
   GNUNET_log_setup ("test-my",
@@ -242,8 +259,10 @@ main (int argc, const char * const argv[])
                                               ",sig BLOB NOT NULL"
                                               ",abs_time BIGINT NOT NULL"
                                               ",forever BIGINT NOT NULL"
+                                              ",abs_time_nbo BIGINT NOT NULL"
                                               ",hash BLOB NOT NULL CHECK(LENGTH(hash)=64)"
                                               ",vsize BLOB NOT NULL"
+                                              ",str BLOB NOT NULL"
                                               ",u16 SMALLINT NOT NULL"
                                               ",u32 INT NOT NULL"
                                               ",u64 BIGINT NOT NULL"