open caqti_type; use Q module for discuss

src/user.ml

@@ -12,101 +12,80 @@ type t =
 
 module Q = struct
   open Caqti_request.Infix
+  open Caqti_type
 
   let create_user_table =
-    (Caqti_type.unit ->. Caqti_type.unit)
+    (unit ->. unit)
       "CREATE TABLE IF NOT EXISTS user (user_id TEXT, nick TEXT, password \
        TEXT, email TEXT, bio TEXT, PRIMARY KEY(user_id))"
 
   let create_banished_table =
-    (Caqti_type.unit ->. Caqti_type.unit)
+    (unit ->. unit)
       "CREATE TABLE IF NOT EXISTS banished (nick TEXT, email TEXT)"
 
   let create_metadata_table =
-    (Caqti_type.unit ->. Caqti_type.unit)
+    (unit ->. unit)
       "CREATE TABLE IF NOT EXISTS user_metadata (user_id TEXT, metadata TEXT, \
        FOREIGN KEY(user_id) REFERENCES user(user_id) ON DELETE CASCADE)"
 
   let get_metadata =
-    (Caqti_type.string ->! Caqti_type.string)
-      "SELECT metadata FROM user_metadata WHERE user_id=?"
+    (string ->! string) "SELECT metadata FROM user_metadata WHERE user_id=?"
 
   let upload_metadata =
-    (Caqti_type.(tup2 string string) ->. Caqti_type.unit)
-      "INSERT INTO user_metadata VALUES (?, ?)"
+    (tup2 string string ->. unit) "INSERT INTO user_metadata VALUES (?, ?)"
 
   let delete_metadata =
-    (Caqti_type.string ->. Caqti_type.unit)
-      "DELETE FROM user_metadata WHERE user_id=?"
+    (string ->. unit) "DELETE FROM user_metadata WHERE user_id=?"
 
   let get_user_id_from_nick =
-    (Caqti_type.string ->! Caqti_type.string)
-      "SELECT user_id FROM user WHERE nick=?"
+    (string ->! string) "SELECT user_id FROM user WHERE nick=?"
 
   let get_user_id_from_email =
-    (Caqti_type.string ->! Caqti_type.string)
-      "SELECT user_id FROM user WHERE email=?"
+    (string ->! string) "SELECT user_id FROM user WHERE email=?"
 
   let get_password =
-    (Caqti_type.string ->! Caqti_type.string)
-      "SELECT password FROM user WHERE user_id=?"
+    (string ->! string) "SELECT password FROM user WHERE user_id=?"
 
   let is_already_user =
-    (Caqti_type.(tup2 string string) ->! Caqti_type.int)
+    (tup2 string string ->! int)
       "SELECT EXISTS(SELECT 1 FROM user WHERE nick=? OR email=?)"
 
   let upload_user =
-    ( Caqti_type.(tup4 string string string Caqti_type.(tup2 string string))
-    ->. Caqti_type.unit )
+    (tup4 string string string (tup2 string string) ->. unit)
       "INSERT INTO user VALUES (?, ?, ?, ?, ?)"
 
-  let list_nicks =
-    (Caqti_type.unit ->* Caqti_type.string) "SELECT nick FROM user"
+  let list_nicks = (unit ->* string) "SELECT nick FROM user"
 
   let get_user =
     (* there is no "tup6" *)
-    ( Caqti_type.string
-    ->! Caqti_type.(tup4 string string string Caqti_type.(tup2 string string))
-    )
+    (string ->! tup4 string string string (tup2 string string))
       "SELECT * FROM user WHERE user_id=?"
 
   let update_bio =
-    (Caqti_type.(tup2 string string) ->. Caqti_type.unit)
-      "UPDATE user SET bio=? WHERE user_id=?"
+    (tup2 string string ->. unit) "UPDATE user SET bio=? WHERE user_id=?"
 
   let update_nick =
-    (Caqti_type.(tup2 string string) ->. Caqti_type.unit)
-      "UPDATE user SET nick=? WHERE user_id=?"
+    (tup2 string string ->. unit) "UPDATE user SET nick=? WHERE user_id=?"
 
   let update_email =
-    (Caqti_type.(tup2 string string) ->. Caqti_type.unit)
-      "UPDATE user SET email=? WHERE user_id=?"
+    (tup2 string string ->. unit) "UPDATE user SET email=? WHERE user_id=?"
 
   let update_password =
-    (Caqti_type.(tup2 string string) ->. Caqti_type.unit)
-      "UPDATE user SET password=? WHERE user_id=?"
+    (tup2 string string ->. unit) "UPDATE user SET password=? WHERE user_id=?"
 
-  let get_nick =
-    (Caqti_type.string ->! Caqti_type.string)
-      "SELECT nick FROM user WHERE user_id=?"
+  let get_nick = (string ->! string) "SELECT nick FROM user WHERE user_id=?"
 
-  let get_bio =
-    (Caqti_type.string ->! Caqti_type.string)
-      "SELECT bio FROM user WHERE user_id=?"
+  let get_bio = (string ->! string) "SELECT bio FROM user WHERE user_id=?"
 
-  let get_email =
-    (Caqti_type.string ->! Caqti_type.string)
-      "SELECT email FROM user WHERE user_id=?"
+  let get_email = (string ->! string) "SELECT email FROM user WHERE user_id=?"
 
-  let delete_user =
-    (Caqti_type.string ->. Caqti_type.unit) "DELETE FROM user WHERE user_id=?"
+  let delete_user = (string ->. unit) "DELETE FROM user WHERE user_id=?"
 
   let upload_banished =
-    (Caqti_type.(tup2 string string) ->. Caqti_type.unit)
-      "INSERT INTO banished VALUES (?,?)"
+    (tup2 string string ->. unit) "INSERT INTO banished VALUES (?,?)"
 
   let get_banished =
-    (Caqti_type.(tup2 string string) ->! Caqti_type.(tup2 string string))
+    (tup2 string string ->! tup2 string string)
       "SELECT * FROM banished WHERE nick=? OR email=?"
 end