# # patch "database.ml" # from [4f0605a86f36c1e05c68933a73363b410c47b8f6] # to [8780430618c59117d5bc7904d1bd61962c3cc64c] # ======================================================================== --- database.ml 4f0605a86f36c1e05c68933a73363b410c47b8f6 +++ database.ml 8780430618c59117d5bc7904d1bd61962c3cc64c @@ -321,9 +321,6 @@ } -let on_schema_error_retry f = - try f () with Sqlite3.Error (Sqlite3.SCHEMA, _) -> f () - let sqlite_try f db = try f db.db with Sqlite3.Error (_, msg) -> @@ -346,8 +343,7 @@ pubkeys = pubkeys } in sqlite_try (fun db -> register_base64_functions db ; - on_schema_error_retry (fun () -> - fetch_pubkeys db pubkeys)) + fetch_pubkeys db pubkeys) v ; v @@ -371,8 +367,7 @@ try let revision_set = sqlite_try (fun db -> - on_schema_error_retry (fun () -> - fetch_revision_set db id)) + fetch_revision_set db id) d in let (manifest_id, edges) = revision_set in { revision_id = id ; @@ -389,8 +384,7 @@ { (fetch_revision d id) with certs = sqlite_try (fun db -> - on_schema_error_retry (fun () -> - fetch_certs db d.pubkeys id)) d } + fetch_certs db d.pubkeys id) d } let fetch_cert_signer db id name = sqlite_try (fun _ -> fetch_one_cert_field db.db id name `SIGNER) db