Deploying to gh-pages from @ b30bc67bd4 🚀

This commit is contained in:
realaravinth
2022-05-30 10:35:30 +00:00
parent c5362d83d1
commit ad7eebbb2b
52 changed files with 138 additions and 105 deletions

View File

@@ -943,6 +943,21 @@
<span id="938">938</span>
<span id="939">939</span>
<span id="940">940</span>
<span id="941">941</span>
<span id="942">942</span>
<span id="943">943</span>
<span id="944">944</span>
<span id="945">945</span>
<span id="946">946</span>
<span id="947">947</span>
<span id="948">948</span>
<span id="949">949</span>
<span id="950">950</span>
<span id="951">951</span>
<span id="952">952</span>
<span id="953">953</span>
<span id="954">954</span>
<span id="955">955</span>
</pre><pre class="rust"><code><span class="comment">/*
* Copyright (C) 2022 Aravinth Manivannan &lt;realaravinth@batsense.net&gt;
*
@@ -959,10 +974,13 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see &lt;https://www.gnu.org/licenses/&gt;.
*/</span>
<span class="kw">use</span> <span class="ident">std::str::FromStr</span>;
<span class="kw">use</span> <span class="ident">db_core::dev</span>::<span class="kw-2">*</span>;
<span class="kw">use</span> <span class="ident">sqlx::postgres::PgPoolOptions</span>;
<span class="kw">use</span> <span class="ident">sqlx::types::time::OffsetDateTime</span>;
<span class="kw">use</span> <span class="ident">sqlx::ConnectOptions</span>;
<span class="kw">use</span> <span class="ident">sqlx::PgPool</span>;
<span class="kw">pub</span> <span class="kw">mod</span> <span class="ident">errors</span>;
@@ -987,6 +1005,7 @@
<span class="kw">pub</span> <span class="kw">struct</span> <span class="ident">Fresh</span> {
<span class="kw">pub</span> <span class="ident">pool_options</span>: <span class="ident">PgPoolOptions</span>,
<span class="kw">pub</span> <span class="ident">disable_logging</span>: <span class="ident">bool</span>,
<span class="kw">pub</span> <span class="ident">url</span>: <span class="ident">String</span>,
}
@@ -1008,11 +1027,22 @@
<span class="kw">type</span> <span class="ident">Pool</span> <span class="op">=</span> <span class="ident">Database</span>;
<span class="kw">async</span> <span class="kw">fn</span> <span class="ident">connect</span>(<span class="self">self</span>) -&gt; <span class="ident">DBResult</span><span class="op">&lt;</span><span class="ident"><span class="self">Self</span>::Pool</span><span class="op">&gt;</span> {
<span class="kw">let</span> <span class="ident">pool</span> <span class="op">=</span> <span class="kw">match</span> <span class="self">self</span> {
<span class="ident"><span class="self">Self</span>::Fresh</span>(<span class="ident">fresh</span>) =&gt; <span class="ident">fresh</span>
.<span class="ident">pool_options</span>
.<span class="ident">connect</span>(<span class="kw-2">&amp;</span><span class="ident">fresh</span>.<span class="ident">url</span>)
.<span class="kw">await</span>
.<span class="ident">map_err</span>(<span class="op">|</span><span class="ident">e</span><span class="op">|</span> <span class="ident">DBError::DBError</span>(<span class="ident">Box::new</span>(<span class="ident">e</span>)))<span class="question-mark">?</span>,
<span class="ident"><span class="self">Self</span>::Fresh</span>(<span class="ident">fresh</span>) =&gt; {
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">connect_options</span> <span class="op">=</span>
<span class="ident">sqlx::postgres::PgConnectOptions::from_str</span>(<span class="kw-2">&amp;</span><span class="ident">fresh</span>.<span class="ident">url</span>).<span class="ident">unwrap</span>();
<span class="kw">if</span> <span class="ident">fresh</span>.<span class="ident">disable_logging</span> {
<span class="ident">connect_options</span>.<span class="ident">disable_statement_logging</span>();
}
<span class="ident">sqlx::postgres::PgConnectOptions::from_str</span>(<span class="kw-2">&amp;</span><span class="ident">fresh</span>.<span class="ident">url</span>)
.<span class="ident">unwrap</span>()
.<span class="ident">disable_statement_logging</span>();
<span class="ident">fresh</span>
.<span class="ident">pool_options</span>
.<span class="ident">connect_with</span>(<span class="ident">connect_options</span>)
.<span class="kw">await</span>
.<span class="ident">map_err</span>(<span class="op">|</span><span class="ident">e</span><span class="op">|</span> <span class="ident">DBError::DBError</span>(<span class="ident">Box::new</span>(<span class="ident">e</span>)))<span class="question-mark">?</span>
}
<span class="ident"><span class="self">Self</span>::Existing</span>(<span class="ident">conn</span>) =&gt; <span class="ident">conn</span>.<span class="number">0</span>,
};
<span class="prelude-val">Ok</span>(<span class="ident">Database</span> { <span class="ident">pool</span> })

View File

@@ -249,6 +249,7 @@
<span id="244">244</span>
<span id="245">245</span>
<span id="246">246</span>
<span id="247">247</span>
</pre><pre class="rust"><code><span class="comment">/*
* Copyright (C) 2022 Aravinth Manivannan &lt;realaravinth@batsense.net&gt;
*
@@ -441,6 +442,7 @@
<span class="kw">let</span> <span class="ident">connection_options</span> <span class="op">=</span> <span class="ident">ConnectionOptions::Fresh</span>(<span class="ident">Fresh</span> {
<span class="ident">pool_options</span>,
<span class="ident">url</span>: <span class="ident">s</span>.<span class="ident">database</span>.<span class="ident">url</span>.<span class="ident">clone</span>(),
<span class="ident">disable_logging</span>: <span class="ident">s</span>.<span class="ident">debug</span>,
});
<span class="kw">let</span> <span class="ident">db</span> <span class="op">=</span> <span class="ident">connection_options</span>.<span class="ident">connect</span>().<span class="kw">await</span>.<span class="ident">unwrap</span>();
<span class="ident">db</span>.<span class="ident">migrate</span>().<span class="kw">await</span>.<span class="ident">unwrap</span>();