summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSanto Cariotti <santo@dcariotti.me>2022-09-13 17:17:18 +0000
committerSanto Cariotti <santo@dcariotti.me>2022-09-13 17:45:21 +0000
commitb65968dc3110030077e0a20a932425bf8eb64c91 (patch)
tree1d3549415cc45cf73bdcd32453eb377d6f6b155b
parentb43b6d563d68447208a4a137c7f86ddf2db55393 (diff)
Prevent DB check from sqlx
-rw-r--r--Dockerfile2
-rw-r--r--src/models/model.rs10
-rw-r--r--src/models/user.rs16
3 files changed, 14 insertions, 14 deletions
diff --git a/Dockerfile b/Dockerfile
index 221d480..d9c6af6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ FROM rust:latest as cargo-build
WORKDIR /usr/src/verden
COPY . .
-ARG DATABASE_URL
+ARG DATABASE_URL="postgres://user:password@localhost:5432/verden"
RUN cargo install --path . && cargo install sqlx-cli
EXPOSE 9090
diff --git a/src/models/model.rs b/src/models/model.rs
index f686192..06e9b8f 100644
--- a/src/models/model.rs
+++ b/src/models/model.rs
@@ -98,7 +98,7 @@ impl Model {
.validate()
.map_err(|error| AppError::BadRequest(error.to_string()))?;
- let rec = sqlx::query_as!(
+ let rec = sqlx::query_as_unchecked!(
Model,
r#"
INSERT INTO models (name, description, duration, height, weight, printer, material, author_id, created, updated)
@@ -126,7 +126,7 @@ impl Model {
pub async fn find_by_id(model_id: i32) -> Result<ModelUser, AppError> {
let pool = unsafe { get_client() };
- let rec = sqlx::query_as!(
+ let rec = sqlx::query_as_unchecked!(
ModelUser,
r#"
SELECT
@@ -150,7 +150,7 @@ impl Model {
/// List all models
pub async fn list(page: i64) -> Result<Vec<ModelUser>, AppError> {
let pool = unsafe { get_client() };
- let rows = sqlx::query_as!(
+ let rows = sqlx::query_as_unchecked!(
ModelUser,
r#"
SELECT
@@ -175,7 +175,7 @@ impl Model {
/// Return the number of models.
pub async fn count() -> Result<i64, AppError> {
let pool = unsafe { get_client() };
- let row = sqlx::query!(r#"SELECT COUNT(id) as count FROM models"#)
+ let row = sqlx::query_unchecked!(r#"SELECT COUNT(id) as count FROM models"#)
.fetch_one(pool)
.await?;
@@ -207,7 +207,7 @@ impl ModelUpload {
pub async fn create(file: ModelUpload) -> Result<ModelUpload, AppError> {
let pool = unsafe { get_client() };
- let rec = sqlx::query_as!(
+ let rec = sqlx::query_as_unchecked!(
ModelUpload,
r#"
INSERT INTO uploads (filepath, model_id, created)
diff --git a/src/models/user.rs b/src/models/user.rs
index fee6522..816db97 100644
--- a/src/models/user.rs
+++ b/src/models/user.rs
@@ -55,7 +55,7 @@ impl User {
let crypted_password = sha256::digest(user.password);
- let rec = sqlx::query_as!(
+ let rec = sqlx::query_as_unchecked!(
UserList,
r#"
INSERT INTO users (email, username, password)
@@ -78,7 +78,7 @@ impl User {
let crypted_password = sha256::digest(user.password);
- let rec = sqlx::query_as!(
+ let rec = sqlx::query_as_unchecked!(
UserList,
r#"
SELECT id, email, username, is_staff, avatar FROM "users"
@@ -97,7 +97,7 @@ impl User {
pub async fn find_by_id(user_id: i32) -> Result<UserList, AppError> {
let pool = unsafe { get_client() };
- let rec = sqlx::query_as!(
+ let rec = sqlx::query_as_unchecked!(
UserList,
r#"
SELECT id, email, username, is_staff, avatar FROM "users"
@@ -114,7 +114,7 @@ impl User {
/// List all users
pub async fn list(page: i64) -> Result<Vec<UserList>, AppError> {
let pool = unsafe { get_client() };
- let rows = sqlx::query_as!(
+ let rows = sqlx::query_as_unchecked!(
UserList,
r#"SELECT id, email, username, is_staff, avatar FROM users
LIMIT $1 OFFSET $2
@@ -131,7 +131,7 @@ impl User {
/// Return the number of users.
pub async fn count() -> Result<i64, AppError> {
let pool = unsafe { get_client() };
- let row = sqlx::query!(r#"SELECT COUNT(id) as count FROM users"#)
+ let row = sqlx::query_unchecked!(r#"SELECT COUNT(id) as count FROM users"#)
.fetch_one(pool)
.await?;
@@ -141,7 +141,7 @@ impl User {
/// Prevent the "uniquess" Postgres fields check. Check if username has been taken
pub async fn username_has_taken(username: &String) -> Result<bool, AppError> {
let pool = unsafe { get_client() };
- let row = sqlx::query!(
+ let row = sqlx::query_unchecked!(
r#"
SELECT COUNT(id) as count FROM users WHERE username = $1
"#,
@@ -156,7 +156,7 @@ impl User {
/// Prevent the "uniquess" Postgres fields check. Check if email has been taken
pub async fn email_has_taken(email: &String) -> Result<bool, AppError> {
let pool = unsafe { get_client() };
- let row = sqlx::query!(
+ let row = sqlx::query_unchecked!(
r#"
SELECT COUNT(id) as count FROM users WHERE email = $1
"#,
@@ -173,7 +173,7 @@ impl UserList {
// Edit an user
pub async fn edit_avatar(&mut self, avatar: Option<String>) -> Result<(), AppError> {
let pool = unsafe { get_client() };
- sqlx::query!(
+ sqlx::query_unchecked!(
r#"
UPDATE users SET avatar = $1 WHERE id = $2
"#,