1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
module Database = Sihl.Database
module Cleaner = Sihl.Cleaner
module Migration = Sihl.Database.Migration
module Model = Sihl.Contract.User
module type Sig = sig
val register_migration : unit -> unit
val register_cleaner : unit -> unit
val lifecycles : Sihl.Container.lifecycle list
val search
: ?ctx:(string * string) list
-> [ `Desc | `Asc ]
-> string option
-> limit:int
-> offset:int
-> (Model.t list * int) Lwt.t
val get : ?ctx:(string * string) list -> string -> Model.t option Lwt.t
val get_by_email
: ?ctx:(string * string) list
-> string
-> Model.t option Lwt.t
val insert : ?ctx:(string * string) list -> Model.t -> unit Lwt.t
val update : ?ctx:(string * string) list -> Model.t -> unit Lwt.t
end
let status =
let encode m = m |> Model.status_to_string |> Result.ok in
let decode = Model.status_of_string in
Caqti_type.(custom ~encode ~decode string)
;;
let user =
let open Sihl.Contract.User in
let encode m =
Ok
( m.id
, ( m.email
, ( m.username
, ( m.name
, ( m.given_name
, ( m.password
, ( m.status
, (m.admin, (m.confirmed, (m.created_at, m.updated_at))) ) )
) ) ) ) )
in
let decode
( id
, ( email
, ( username
, ( name
, ( given_name
, ( password
, (status, (admin, (confirmed, (created_at, updated_at)))) ) )
) ) ) )
=
Ok
{ id
; email
; username
; name
; given_name
; password
; status
; admin
; confirmed
; created_at
; updated_at
}
in
Caqti_type.(
custom
~encode
~decode
(tup2
string
(tup2
string
(tup2
(option string)
(tup2
(option string)
(tup2
(option string)
(tup2
string
(tup2 status (tup2 bool (tup2 bool (tup2 ptime ptime)))))))))))
;;
module MakeMariaDb (MigrationService : Sihl.Contract.Migration.Sig) : Sig =
struct
let lifecycles = [ Database.lifecycle; MigrationService.lifecycle ]
module Migration = struct
let fix_collation =
Migration.create_step
~label:"fix collation"
{sql|
SET collation_server = 'utf8mb4_unicode_ci';
|sql}
;;
let create_users_table =
Migration.create_step
~label:"create users table"
{sql|
CREATE TABLE IF NOT EXISTS user_users (
id BIGINT UNSIGNED AUTO_INCREMENT,
uuid BINARY(16) NOT NULL,
email VARCHAR(128) NOT NULL,
password VARCHAR(128) NOT NULL,
username VARCHAR(128),
status VARCHAR(128) NOT NULL,
admin BOOLEAN NOT NULL DEFAULT false,
confirmed BOOLEAN NOT NULL DEFAULT false,
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (id),
CONSTRAINT unique_uuid UNIQUE KEY (uuid),
CONSTRAINT unique_email UNIQUE KEY (email)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
|sql}
;;
let add_updated_at_column =
Sihl.Database.Migration.create_step
~label:"add updated_at column"
{sql|
ALTER TABLE user_users
ADD COLUMN updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;
|sql}
;;
let add_name_columns =
Sihl.Database.Migration.create_step
~label:"add name columns"
{sql|
ALTER TABLE user_users
ADD COLUMN name VARCHAR(128) NULL,
ADD COLUMN given_name VARCHAR(128) NULL;
|sql}
;;
let migration () =
Migration.(
empty "user"
|> add_step fix_collation
|> add_step create_users_table
|> add_step add_updated_at_column
|> add_step add_name_columns)
;;
end
let filter_fragment =
{sql|
WHERE user_users.email LIKE $1
OR user_users.username LIKE $1
OR user_users.name LIKE $1
OR user_users.given_name LIKE $1
OR user_users.status LIKE $1 |sql}
;;
let search_query =
{sql|
SELECT
COUNT(*) OVER() as total,
LOWER(CONCAT(
SUBSTR(HEX(uuid), 1, 8), '-',
SUBSTR(HEX(uuid), 9, 4), '-',
SUBSTR(HEX(uuid), 13, 4), '-',
SUBSTR(HEX(uuid), 17, 4), '-',
SUBSTR(HEX(uuid), 21)
)),
email,
username,
name,
given_name,
password,
status,
admin,
confirmed,
created_at,
updated_at
FROM user_users |sql}
;;
let request =
Sihl.Database.prepare_search_request
~search_query
~filter_fragment
~sort_by_field:"id"
user
;;
let search ?ctx sort filter ~limit ~offset =
Sihl.Database.run_search_request ?ctx request sort filter ~limit ~offset
;;
let get_request =
Caqti_request.find_opt
Caqti_type.string
user
{sql|
SELECT
LOWER(CONCAT(
SUBSTR(HEX(uuid), 1, 8), '-',
SUBSTR(HEX(uuid), 9, 4), '-',
SUBSTR(HEX(uuid), 13, 4), '-',
SUBSTR(HEX(uuid), 17, 4), '-',
SUBSTR(HEX(uuid), 21)
)),
email,
username,
name,
given_name,
password,
status,
admin,
confirmed,
created_at,
updated_at
FROM user_users
WHERE user_users.uuid = UNHEX(REPLACE(?, '-', ''))
|sql}
;;
let get ?ctx id = Database.find_opt ?ctx get_request id
let get_by_email_request =
Caqti_request.find_opt
Caqti_type.string
user
{sql|
SELECT
LOWER(CONCAT(
SUBSTR(HEX(uuid), 1, 8), '-',
SUBSTR(HEX(uuid), 9, 4), '-',
SUBSTR(HEX(uuid), 13, 4), '-',
SUBSTR(HEX(uuid), 17, 4), '-',
SUBSTR(HEX(uuid), 21)
)),
email,
username,
name,
given_name,
password,
status,
admin,
confirmed,
created_at,
updated_at
FROM user_users
WHERE user_users.email LIKE ?
|sql}
;;
let get_by_email ?ctx email =
Database.find_opt ?ctx get_by_email_request email
;;
let insert_request =
Caqti_request.exec
user
{sql|
INSERT INTO user_users (
uuid,
email,
username,
name,
given_name,
password,
status,
admin,
confirmed,
created_at,
updated_at
) VALUES (
UNHEX(REPLACE($1, '-', '')),
LOWER($2),
$3,
$4,
$5,
$6,
$7,
$8,
$9,
$10,
$11
)
|sql}
;;
let insert ?ctx user = Database.exec ?ctx insert_request user
let update_request =
Caqti_request.exec
user
{sql|
UPDATE user_users
SET
email = LOWER($2),
username = $3,
name = $4,
given_name = $5,
password = $6,
status = $7,
admin = $8,
confirmed = $9,
created_at = $10,
updated_at = $11
WHERE user_users.uuid = UNHEX(REPLACE($1, '-', ''))
|sql}
;;
let update ?ctx user = Database.exec ?ctx update_request user
let clean_request = Caqti_request.exec Caqti_type.unit "TRUNCATE user_users;"
let clean ?ctx () = Database.exec ?ctx clean_request ()
let register_migration () =
MigrationService.register_migration (Migration.migration ())
;;
let register_cleaner () = Cleaner.register_cleaner clean
end
module MakePostgreSql (MigrationService : Sihl.Contract.Migration.Sig) : Sig =
struct
let lifecycles = [ Database.lifecycle; MigrationService.lifecycle ]
module Migration = struct
let create_users_table =
Migration.create_step
~label:"create users table"
{sql|
CREATE TABLE IF NOT EXISTS user_users (
id serial,
uuid uuid NOT NULL,
email VARCHAR(128) NOT NULL,
password VARCHAR(128) NOT NULL,
username VARCHAR(128),
status VARCHAR(128) NOT NULL,
admin BOOLEAN NOT NULL DEFAULT false,
confirmed BOOLEAN NOT NULL DEFAULT false,
created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (id),
UNIQUE (uuid),
UNIQUE (email)
);
|sql}
;;
let add_updated_at_column =
Sihl.Database.Migration.create_step
~label:"add updated_at column"
{sql|
ALTER TABLE user_users
ADD COLUMN updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW();
|sql}
;;
let remove_timezone =
Sihl.Database.Migration.create_step
~label:"remove timezone info from timestamps"
{sql|
ALTER TABLE user_users
ALTER COLUMN created_at TYPE TIMESTAMP,
ALTER COLUMN updated_at TYPE TIMESTAMP;
|sql}
;;
let add_name_columns =
Sihl.Database.Migration.create_step
~label:"add name columns"
{sql|
ALTER TABLE user_users
ADD COLUMN name VARCHAR(128) NULL,
ADD COLUMN given_name VARCHAR(128) NULL;
|sql}
;;
let migration () =
Migration.(
empty "user"
|> add_step create_users_table
|> add_step add_updated_at_column
|> add_step remove_timezone
|> add_step add_name_columns)
;;
end
let filter_fragment =
{sql|
WHERE user_users.email LIKE $1
OR user_users.username LIKE $1
OR user_users.name LIKE $1
OR user_users.given_name LIKE $1
OR user_users.status LIKE $1 |sql}
;;
let search_query =
{sql|
SELECT
COUNT(*) OVER() as total,
uuid,
email,
username,
name,
given_name,
password,
status,
admin,
confirmed,
created_at,
updated_at
FROM user_users |sql}
;;
let request =
Sihl.Database.prepare_search_request
~search_query
~filter_fragment
~sort_by_field:"id"
user
;;
let search ?ctx sort filter ~limit ~offset =
Sihl.Database.run_search_request ?ctx request sort filter ~limit ~offset
;;
let get_request =
Caqti_request.find_opt
Caqti_type.string
user
{sql|
SELECT
uuid as id,
email,
username,
name,
given_name,
password,
status,
admin,
confirmed,
created_at,
updated_at
FROM user_users
WHERE user_users.uuid = ?::uuid
|sql}
;;
let get ?ctx id = Database.find_opt ?ctx get_request id
let get_by_email_request =
Caqti_request.find_opt
Caqti_type.string
user
{sql|
SELECT
uuid as id,
email,
username,
name,
given_name,
password,
status,
admin,
confirmed,
created_at,
updated_at
FROM user_users
WHERE LOWER(user_users.email) = LOWER(?)
|sql}
;;
let get_by_email ?ctx email =
Database.find_opt ?ctx get_by_email_request email
;;
let insert_request =
Caqti_request.exec
user
{sql|
INSERT INTO user_users (
uuid,
email,
username,
name,
given_name,
password,
status,
admin,
confirmed,
created_at,
updated_at
) VALUES (
$1::uuid,
LOWER($2),
$3,
$4,
$5,
$6,
$7,
$8,
$9,
$10 AT TIME ZONE 'UTC',
$11 AT TIME ZONE 'UTC'
)
|sql}
;;
let insert ?ctx user = Database.exec ?ctx insert_request user
let update_request =
Caqti_request.exec
user
{sql|
UPDATE user_users
SET
email = LOWER($2),
username = $3,
name = $4,
given_name = $5,
password = $6,
status = $7,
admin = $8,
confirmed = $9,
created_at = $10,
updated_at = $11
WHERE user_users.uuid = $1::uuid
|sql}
;;
let update ?ctx user = Database.exec ?ctx update_request user
let clean_request =
Caqti_request.exec Caqti_type.unit "TRUNCATE TABLE user_users CASCADE;"
;;
let clean ?ctx () = Database.exec ?ctx clean_request ()
let register_migration () =
MigrationService.register_migration (Migration.migration ())
;;
let register_cleaner () = Cleaner.register_cleaner clean
end