use new connecT API
[oweals/gnunet.git] / src / my / test_my.c
index defaf6cbcaab7d607aa56c08db5bfd24e47b0201..4bea101caeaf036afc2a3c53eaf7d1861fec00ad 100644 (file)
@@ -28,6 +28,7 @@
 #include "gnunet_mysql_lib.h"
 #include "gnunet_util_lib.h"
 
+
 /**
   * Run actual test queries.
   *
@@ -45,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;
@@ -70,24 +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;
-
-  statements_handle_insert = GNUNET_MYSQL_statement_prepare (context,
-                                        "INSERT INTO test_my2 ("
-                                        " pub"
-                                        ",sig"
-                                        ",abs_time"
-                                        ",forever"
-                                        ",hash"
-                                        ",vsize"
-                                        ",u16"
-                                        ",u32"
-                                        ",u64"
-                                        ") VALUES "
-                                        "( ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+  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"
+                                      ",abs_time_nbo"
+                                      ",hash"
+                                      ",vsize"
+                                      ",str"
+                                      ",u16"
+                                      ",u32"
+                                      ",u64"
+                                      ") VALUES "
+                                      "( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
 
   if (NULL == statements_handle_insert)
   {
@@ -100,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),
@@ -116,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)
   {
@@ -136,28 +151,29 @@ run_queries (struct GNUNET_MYSQL_Context *context)
   }
 
   struct GNUNET_MY_QueryParam params_select[] = {
-        GNUNET_MY_query_param_end
+    GNUNET_MY_query_param_end
   };
 
   if (GNUNET_OK != GNUNET_MY_exec_prepared (context,
                                             statements_handle_select,
                                             params_select))
   {
-          fprintf (stderr, "Failed to execute prepared statement SELECT\n");
-          return 1;
+    fprintf (stderr, "Failed to execute prepared statement SELECT\n");
+    return 1;
   }
 
   struct GNUNET_MY_ResultSpec results_select[] = {
-        GNUNET_MY_result_spec_rsa_public_key (&pub2),
-        GNUNET_MY_result_spec_rsa_signature (&sig2),
-        GNUNET_MY_result_spec_absolute_time (&abs_time2),
-        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_uint16 (&u162),
-        GNUNET_MY_result_spec_uint32 (&u322),
-        GNUNET_MY_result_spec_uint64 (&u642),
-        GNUNET_MY_result_spec_end
+    GNUNET_MY_result_spec_rsa_public_key (&pub2),
+    GNUNET_MY_result_spec_rsa_signature (&sig2),
+    GNUNET_MY_result_spec_absolute_time (&abs_time2),
+    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),
+    GNUNET_MY_result_spec_end
   };
 
   ret = GNUNET_MY_extract_result (statements_handle_select,
@@ -174,29 +190,35 @@ run_queries (struct GNUNET_MYSQL_Context *context)
   GNUNET_assert (NULL != sig2);
   GNUNET_assert (NULL != pub2);
   GNUNET_break (0 ==
-            GNUNET_CRYPTO_rsa_signature_cmp (sig,
-                                 sig2));
+                GNUNET_CRYPTO_rsa_signature_cmp (sig,
+                                                 sig2));
   GNUNET_break (0 ==
-            GNUNET_CRYPTO_rsa_public_key_cmp (pub,
-                                  pub2));
+                GNUNET_CRYPTO_rsa_public_key_cmp (pub,
+                                                  pub2));
 
   GNUNET_break (strlen (msg) == msg2_len);
   GNUNET_break (0 ==
-            strncmp (msg,
-                  msg2,
-                  msg2_len));
+                strncmp (msg,
+                         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;
+    return 1;
 
   return 0;
 }
@@ -209,46 +231,49 @@ main (int argc, const char * const argv[])
   struct GNUNET_MYSQL_Context *context;
   int ret;
 
-  GNUNET_log_setup (  "test-my",
-                         "WARNING",
-                         NULL);
+  GNUNET_log_setup ("test-my",
+                    "WARNING",
+                    NULL);
 
   config = GNUNET_CONFIGURATION_create ();
   if (GNUNET_OK != GNUNET_CONFIGURATION_parse (config, "test_my.conf"))
   {
-      fprintf (stderr, "Failed to parse configuaration\n");
-      return 1;
+    fprintf (stderr, "Failed to parse configuaration\n");
+    return 1;
   }
 
   context = GNUNET_MYSQL_context_create (config,
-                                             "datastore-mysql");
+                                        "datastore-mysql");
   if (NULL == context)
   {
-      fprintf(stderr, "Failed to connect to database\n");
-      return 77;
+    fprintf(stderr, "Failed to connect to database\n");
+    return 77;
   }
 
   (void) GNUNET_MYSQL_statement_run (context,
-                                        "DROP TABLE test_my2;");
+                                    "DROP TABLE test_my2;");
+
   if (GNUNET_OK != GNUNET_MYSQL_statement_run (context,
-                                                  "CREATE TABLE IF NOT EXISTS test_my2("
-                                                  " pub BLOB NOT NULL"
-                                                  ",sig BLOB NOT NULL"
-                                                  ",abs_time BIGINT NOT NULL"
-                                                  ",forever BIGINT NOT NULL"
-                                                  ",hash BLOB NOT NULL CHECK(LENGTH(hash)=64)"
-                                                  ",vsize BLOB NOT NULL"
-                                                  ",u16 SMALLINT NOT NULL"
-                                                  ",u32 INT NOT NULL"
-                                                  ",u64 BIGINT NOT NULL"
-                                                  ")"))
+                                              "CREATE TABLE IF NOT EXISTS test_my2("
+                                              " pub BLOB NOT NULL"
+                                              ",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"
+                                              ")"))
   {
-      fprintf (stderr,
-                "Failed to create table \n");
-      GNUNET_MYSQL_statements_invalidate (context);
-      GNUNET_MYSQL_context_destroy (context);
+    fprintf (stderr,
+            "Failed to create table \n");
+    GNUNET_MYSQL_statements_invalidate (context);
+    GNUNET_MYSQL_context_destroy (context);
 
-      return 1;
+    return 1;
   }
 
   ret = run_queries (context);