Update Rust crate serde to 1.0.189

geneit_app/package.json

@@ -13,6 +13,7 @@
     "@mui/lab": "^5.0.0-alpha.140",
     "@mui/material": "^5.14.5",
     "@mui/x-data-grid": "^6.9.2",
+    "@mui/x-tree-view": "^6.0.0-alpha.1",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",

geneit_app/src/routes/family/FamilyCoupleRoute.tsx

@@ -25,6 +25,7 @@ import { MemberInput } from "../../widgets/forms/MemberInput";
 import { PropSelect } from "../../widgets/forms/PropSelect";
 import { UploadPhotoButton } from "../../widgets/forms/UploadPhotoButton";
 import { useQuery } from "../../hooks/useQuery";
+import { useLoadingMessage } from "../../hooks/context_providers/LoadingMessageProvider";
 
 /**
  * Create a new couple route
@@ -165,7 +166,8 @@ export function FamilyEditCoupleRoute(): React.ReactElement {
 
   const cancel = () => {
     setShouldQuit(true);
-    n(-1);
+    n(family.family.coupleURL(couple!));
+    //n(-1);
   };
 
   const save = async (c: Couple) => {
@@ -210,13 +212,14 @@ export function CouplePage(p: {
   shouldAllowLeaving?: boolean;
   children?: Member[];
   onCancel?: () => void;
-  onSave?: (m: Couple) => void;
+  onSave?: (m: Couple) => Promise<void>;
   onRequestEdit?: () => void;
   onRequestDelete?: () => void;
   onForceReload?: () => void;
 }): React.ReactElement {
   const confirm = useConfirm();
   const snackbar = useSnackbar();
+  const loadingMessage = useLoadingMessage();
 
   const family = useFamily();
 
@@ -230,8 +233,12 @@ export function CouplePage(p: {
     setCouple(new Couple(structuredClone(couple)));
   };
 
-  const save = () => {
+  const save = async () => {
-    p.onSave!(couple);
+    loadingMessage.show(
+      "Enregistrement des informations du couple en cours..."
+    );
+    await p.onSave!(couple);
+    loadingMessage.hide();
   };
 
   const cancel = async () => {

geneit_app/src/routes/family/FamilyMemberRoute.tsx

@@ -39,6 +39,7 @@ import { UploadPhotoButton } from "../../widgets/forms/UploadPhotoButton";
 import { useQuery } from "../../hooks/useQuery";
 import { mdiFamilyTree } from "@mdi/js";
 import Icon from "@mdi/react";
+import { useLoadingMessage } from "../../hooks/context_providers/LoadingMessageProvider";
 
 /**
  * Create a new member route
@@ -185,8 +186,8 @@ export function FamilyEditMemberRoute(): React.ReactElement {
 
   const cancel = () => {
     setShouldQuit(true);
-    //n(family.family.URL(`member/${member!.id}`));
+    n(family.family.memberURL(member!));
-    n(-1);
+    //n(-1);
   };
 
   const save = async (m: Member) => {
@@ -233,7 +234,7 @@ export function MemberPage(p: {
   siblings?: Member[];
   couples?: Couple[];
   onCancel?: () => void;
-  onSave?: (m: Member) => void;
+  onSave?: (m: Member) => Promise<void>;
   onRequestEdit?: () => void;
   onRequestDelete?: () => void;
   onForceReload?: () => void;
@@ -241,6 +242,7 @@ export function MemberPage(p: {
 }): React.ReactElement {
   const confirm = useConfirm();
   const snackbar = useSnackbar();
+  const loadingMessage = useLoadingMessage();
 
   const family = useFamily();
 
@@ -254,8 +256,12 @@ export function MemberPage(p: {
     setMember(new Member(structuredClone(member)));
   };
 
-  const save = () => {
+  const save = async () => {
-    p.onSave!(member);
+    loadingMessage.show(
+      "Enregistrement des informations du membre en cours..."
+    );
+    await p.onSave!(member);
+    loadingMessage.hide();
   };
 
   const cancel = async () => {

geneit_app/src/routes/family/FamilyMembersListRoute.tsx

@@ -4,7 +4,7 @@ import EditIcon from "@mui/icons-material/Edit";
 import FemaleIcon from "@mui/icons-material/Female";
 import MaleIcon from "@mui/icons-material/Male";
 import VisibilityIcon from "@mui/icons-material/Visibility";
-import { Button, TextField, Tooltip } from "@mui/material";
+import { Button, TextField, Tooltip, Typography } from "@mui/material";
 import { DataGrid, GridActionsCellItem, GridColDef } from "@mui/x-data-grid";
 import React from "react";
 import { useNavigate } from "react-router-dom";
@@ -165,7 +165,8 @@ function MembersTable(p: {
       headerName: "Père",
       flex: 5,
       renderCell(params) {
-        if (!params.row.father) return <></>;
+        if (!params.row.father)
+          return <Typography color="red">Non renseigné</Typography>;
         return family.members.get(params.row.father)!.fullName;
       },
     },
@@ -174,7 +175,8 @@ function MembersTable(p: {
       headerName: "Mère",
       flex: 5,
       renderCell(params) {
-        if (!params.row.mother) return <></>;
+        if (!params.row.mother)
+          return <Typography color="red">Non renseignée</Typography>;
         return family.members.get(params.row.mother)!.fullName;
       },
     },

geneit_app/src/widgets/BasicFamilyTree.tsx

@@ -2,7 +2,7 @@ import { mdiBabyCarriage, mdiCross } from "@mdi/js";
 import Icon from "@mdi/react";
 import ChevronRightIcon from "@mui/icons-material/ChevronRight";
 import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
-import { TreeItem, TreeView } from "@mui/lab";
+import { TreeItem, TreeView } from "@mui/x-tree-view";
 import React from "react";
 import { useNavigate } from "react-router-dom";
 import { Couple } from "../api/CoupleApi";

geneit_app/src/widgets/simple_family_tree/SimpleFamilyTree.tsx

@@ -254,6 +254,7 @@ function NodeArea(p: {
   let pers2 = p.node.spouse?.member;
   let didSwap = false;
 
+  // Show male of the left (all the time)
   if (pers2?.sex === "M") {
     let s = pers1;
     pers1 = pers2;
@@ -293,10 +294,37 @@ function NodeArea(p: {
   let childrenLinkX: number;
   let childrenLinkY: number;
 
-  if (p.node.spouse) {
+  // If the father is the father of all the children, while the
+  // mother is not the mother of any of the children
+  if (
+    pers2 &&
+    p.node.down.every(
+      (n) => n.member.father === pers1.id && n.member.mother !== pers2!.id
+    )
+  ) {
+    childrenLinkX = parent_x_offset + Math.floor(memberCardWidth(pers1) / 2);
+    childrenLinkY = p.y + CARD_HEIGHT + 2;
+  }
+  // If the mother is the mother of all the children, while the
+  // father is not the father of any of the children
+  else if (
+    pers2 &&
+    p.node.down.every(
+      (n) => n.member.father !== pers1.id && n.member.mother === pers2!.id
+    )
+  ) {
+    childrenLinkX = beginSecondFaceX! + Math.floor(memberCardWidth(pers2) / 2);
+    childrenLinkY = p.y + CARD_HEIGHT + 2;
+  }
+
+  // Normal couple
+  else if (p.node.spouse) {
     childrenLinkX = Math.floor((endFirstFaceX + beginSecondFaceX!) / 2);
     childrenLinkY = middleParentFaceY;
-  } else {
+  }
+
+  // Single person
+  else {
     childrenLinkX = parent_x_offset + Math.floor(memberCardWidth(pers1) / 2);
     childrenLinkY = p.y + CARD_HEIGHT + 2;
   }

geneit_backend/Cargo.lock

@@ -36,9 +36,9 @@ dependencies = [
 
 [[package]]
 name = "actix-http"
-version = "3.3.1"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2079246596c18b4a33e274ae10c0e50613f4d32a4198e09c7b93771013fed74"
+checksum = "a92ef85799cba03f76e4f7c10f533e66d87c9a7e7055f3391f09000ad8351bc9"
 dependencies = [
  "actix-codec",
  "actix-rt",
@@ -46,7 +46,7 @@ dependencies = [
  "actix-utils",
  "ahash 0.8.3",
  "base64 0.21.2",
- "bitflags 1.3.2",
+ "bitflags 2.3.3",
  "brotli",
  "bytes",
  "bytestring",
@@ -85,9 +85,9 @@ dependencies = [
 
 [[package]]
 name = "actix-multipart"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee489e3c01eae4d1c35b03c4493f71cb40d93f66b14558feb1b1a807671cc4e"
+checksum = "3b960e2aea75f49c8f069108063d12a48d329fc8b60b786dfc7552a9d5918d2d"
 dependencies = [
  "actix-multipart-derive",
  "actix-utils",
@@ -110,15 +110,15 @@ dependencies = [
 
 [[package]]
 name = "actix-multipart-derive"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ec592f234db8a253cf80531246a4407c8a70530423eea80688a6c5a44a110e7"
+checksum = "0a0a77f836d869f700e5b47ac7c3c8b9c8bc82e4aec861954c6198abee3ebd4d"
 dependencies = [
- "darling 0.14.4",
+ "darling",
  "parse-size",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -168,7 +168,7 @@ dependencies = [
  "futures-util",
  "mio",
  "num_cpus",
- "socket2",
+ "socket2 0.4.9",
  "tokio",
  "tracing",
 ]
@@ -196,9 +196,9 @@ dependencies = [
 
 [[package]]
 name = "actix-web"
-version = "4.3.1"
+version = "4.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd3cb42f9566ab176e1ef0b8b3a896529062b4efc6be0123046095914c4c1c96"
+checksum = "0e4a5b5e29603ca8c94a77c65cf874718ceb60292c5a5c3e5f4ace041af462b9"
 dependencies = [
  "actix-codec",
  "actix-http",
@@ -209,7 +209,7 @@ dependencies = [
  "actix-service",
  "actix-utils",
  "actix-web-codegen",
- "ahash 0.7.6",
+ "ahash 0.8.3",
  "bytes",
  "bytestring",
  "cfg-if",
@@ -218,7 +218,6 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "http",
  "itoa",
  "language-tags",
  "log",
@@ -230,7 +229,7 @@ dependencies = [
  "serde_json",
  "serde_urlencoded",
  "smallvec",
- "socket2",
+ "socket2 0.5.3",
  "time",
  "url",
 ]
@@ -337,16 +336,15 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.3.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
+checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
- "is-terminal",
  "utf8parse",
 ]
 
@@ -376,9 +374,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "1.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
+checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
 dependencies = [
  "anstyle",
  "windows-sys",
@@ -651,20 +649,19 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.3.10"
+version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "384e169cc618c613d5e3ca6404dda77a8685a63e08660dcc64abaf7da7cb0c7a"
+checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6"
 dependencies = [
  "clap_builder",
  "clap_derive",
- "once_cell",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.3.10"
+version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef137bbe35aab78bdb468ccfba75a5f4d8321ae011d34063770780545176af2d"
+checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08"
 dependencies = [
  "anstream",
  "anstyle",
@@ -674,9 +671,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.3.2"
+version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f"
+checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -849,38 +846,14 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "darling"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
-dependencies = [
- "darling_core 0.14.4",
- "darling_macro 0.14.4",
-]
-
 [[package]]
 name = "darling"
 version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
 dependencies = [
- "darling_core 0.20.3",
+ "darling_core",
- "darling_macro 0.20.3",
+ "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn 1.0.109",
 ]
 
 [[package]]
@@ -897,24 +870,13 @@ dependencies = [
  "syn 2.0.29",
 ]
 
-[[package]]
-name = "darling_macro"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
-dependencies = [
- "darling_core 0.14.4",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "darling_macro"
 version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
 dependencies = [
- "darling_core 0.20.3",
+ "darling_core",
  "quote",
  "syn 2.0.29",
 ]
@@ -934,9 +896,9 @@ dependencies = [
 
 [[package]]
 name = "diesel"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7a532c1f99a0f596f6960a60d1e119e91582b24b39e2d83a190e61262c3ef0c"
+checksum = "d98235fdc2f355d330a8244184ab6b4b33c28679c0b4158f63138e51d6cf7e88"
 dependencies = [
  "bitflags 2.3.3",
  "byteorder",
@@ -1494,7 +1456,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2",
+ "socket2 0.4.9",
  "tokio",
  "tower-service",
  "tracing",
@@ -1698,7 +1660,7 @@ dependencies = [
  "nom",
  "once_cell",
  "quoted_printable",
- "socket2",
+ "socket2 0.4.9",
  "tokio",
 ]
 
@@ -2292,16 +2254,16 @@ dependencies = [
 
 [[package]]
 name = "redis"
-version = "0.23.2"
+version = "0.23.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffd6543a7bc6428396845f6854ccf3d1ae8823816592e2cbe74f20f50f209d02"
+checksum = "4f49cdc0bb3f412bf8e7d1bd90fe1d9eb10bc5c399ba90973c14662a27b3f8ba"
 dependencies = [
  "combine",
  "itoa",
  "percent-encoding",
  "ryu",
  "sha1_smol",
- "socket2",
+ "socket2 0.4.9",
  "url",
 ]
 
@@ -2548,18 +2510,18 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
 
 [[package]]
 name = "serde"
-version = "1.0.188"
+version = "1.0.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.188"
+version = "1.0.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2620,7 +2582,7 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea3cee93715c2e266b9338b7544da68a9f24e227722ba482bd1c024367c77c65"
 dependencies = [
- "darling 0.20.3",
+ "darling",
  "proc-macro2",
  "quote",
  "syn 2.0.29",
@@ -2711,6 +2673,16 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "socket2"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
 [[package]]
 name = "spin"
 version = "0.9.8"
@@ -2762,9 +2734,9 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.7.1"
+version = "3.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651"
+checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
 dependencies = [
  "cfg-if",
  "fastrand 2.0.0",
@@ -2795,18 +2767,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.40"
+version = "1.0.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.40"
+version = "1.0.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2880,7 +2852,7 @@ dependencies = [
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2",
+ "socket2 0.4.9",
  "windows-sys",
 ]
 

geneit_backend/Cargo.toml

@@ -8,24 +8,24 @@ edition = "2021"
 [dependencies]
 log = "0.4.17"
 env_logger = "0.10.0"
-clap = { version = "4.3.0", features = ["derive", "env"] }
+clap = { version = "4.4.2", features = ["derive", "env"] }
 lazy_static = "1.4.0"
 anyhow = "1.0.75"
-actix-web = "4.3.1"
+actix-web = "4.4.0"
 actix-cors = "0.6.4"
-actix-multipart = "0.6.0"
+actix-multipart = "0.6.1"
 actix-remote-ip = "0.1.0"
 futures-util = "0.3.28"
-diesel = { version = "2.0.4", features = ["postgres"] }
+diesel = { version = "2.1.1", features = ["postgres"] }
-serde = { version = "1.0.188", features = ["derive"] }
+serde = { version = "1.0.189", features = ["derive"] }
 serde_json = "1.0.96"
 mailchecker = "5.0.9"
-redis = "0.23.2"
+redis = "0.23.3"
 lettre = "0.10.4"
 rand = "0.8.5"
 bcrypt = "0.15.0"
 light-openid = "1.0.1"
-thiserror = "1.0.40"
+thiserror = "1.0.47"
 serde_with = "3.1.0"
 rust_iso3166 = "0.1.10"
 rust-s3 = "0.33.0"
@@ -35,5 +35,5 @@ uuid = { version = "1.4.1", features = ["v4"] }
 httpdate = "1.0.2"
 zip = "0.6.6"
 mime_guess = "2.0.4"
-tempfile = "3.7.1"
+tempfile = "3.8.0"
 base64 = "0.21.2"

geneit_backend/docker-compose.yaml

@@ -27,7 +27,7 @@ services:
       - ./storage/db:/var/lib/postgresql/data
   
   mailcatcher:
-    image: dockage/mailcatcher:0.8.2
+    image: dockage/mailcatcher:0.9.0
     ports:
       - 1080:1080
       - 1025:1025

geneit_backend/src/controllers/members_controller.rs

@@ -103,8 +103,29 @@ fn check_opt_str_val(
     Ok(())
 }
 
+fn trim_opt_val(val: &mut Option<String>) {
+    if let Some(s) = val {
+        *val = Some(s.trim().to_string());
+    }
+
+    if val.as_deref() == Some("") {
+        *val = None;
+    }
+}
+
 impl MemberRequest {
-    pub async fn to_member(self, member: &mut Member) -> anyhow::Result<()> {
+    pub async fn to_member(mut self, member: &mut Member) -> anyhow::Result<()> {
+        // Trim values before processing
+        trim_opt_val(&mut self.first_name);
+        trim_opt_val(&mut self.last_name);
+        trim_opt_val(&mut self.birth_last_name);
+        trim_opt_val(&mut self.email);
+        trim_opt_val(&mut self.country);
+        trim_opt_val(&mut self.address);
+        trim_opt_val(&mut self.city);
+        trim_opt_val(&mut self.note);
+        trim_opt_val(&mut self.phone);
+
         let c = StaticConstraints::default();
         check_opt_str_val(
             &self.first_name,

geneit_backend/src/schema.rs

@@ -6,6 +6,7 @@ diesel::table! {
         family_id -> Int4,
         wife -> Nullable<Int4>,
         husband -> Nullable<Int4>,
+        #[max_length = 1]
         state -> Nullable<Varchar>,
         photo_id -> Nullable<Int4>,
         time_create -> Int8,
@@ -23,7 +24,9 @@ diesel::table! {
     families (id) {
         id -> Int4,
         time_create -> Int8,
+        #[max_length = 30]
         name -> Varchar,
+        #[max_length = 7]
         invitation_code -> Varchar,
         disable_couple_photos -> Bool,
     }
@@ -33,16 +36,26 @@ diesel::table! {
     members (id) {
         id -> Int4,
         family_id -> Int4,
+        #[max_length = 30]
         first_name -> Nullable<Varchar>,
+        #[max_length = 30]
         last_name -> Nullable<Varchar>,
+        #[max_length = 30]
         birth_last_name -> Nullable<Varchar>,
         photo_id -> Nullable<Int4>,
+        #[max_length = 255]
         email -> Nullable<Varchar>,
+        #[max_length = 30]
         phone -> Nullable<Varchar>,
+        #[max_length = 155]
         address -> Nullable<Varchar>,
+        #[max_length = 150]
         city -> Nullable<Varchar>,
+        #[max_length = 12]
         postal_code -> Nullable<Varchar>,
+        #[max_length = 2]
         country -> Nullable<Varchar>,
+        #[max_length = 1]
         sex -> Nullable<Varchar>,
         time_create -> Int8,
         time_update -> Int8,
@@ -71,11 +84,15 @@ diesel::table! {
 diesel::table! {
     photos (id) {
         id -> Int4,
+        #[max_length = 36]
         file_id -> Varchar,
         time_create -> Int8,
+        #[max_length = 150]
         mime_type -> Varchar,
+        #[max_length = 130]
         sha512 -> Varchar,
         file_size -> Int4,
+        #[max_length = 130]
         thumb_sha512 -> Varchar,
     }
 }
@@ -83,12 +100,16 @@ diesel::table! {
 diesel::table! {
     users (id) {
         id -> Int4,
+        #[max_length = 30]
         name -> Varchar,
+        #[max_length = 255]
         email -> Varchar,
         password -> Nullable<Varchar>,
         time_create -> Int8,
+        #[max_length = 150]
         reset_password_token -> Nullable<Varchar>,
         time_gen_reset_token -> Int8,
+        #[max_length = 150]
         delete_account_token -> Nullable<Varchar>,
         time_gen_delete_account_token -> Int8,
         time_activate -> Int8,