[Benchmarks] Remove some duplication

diesel_bench/benches/common.rs

@@ -0,0 +1,92 @@
+#[cfg(all(feature = "sqlx", feature = "sqlite"))]
+type Id = i64;
+#[cfg(not(all(feature = "sqlx", feature = "sqlite")))]
+type Id = i32;
+
+diesel::table! {
+    comments {
+        id -> Integer,
+        post_id -> Integer,
+        text -> Text,
+    }
+}
+
+diesel::table! {
+    posts {
+        id -> Integer,
+        user_id -> Integer,
+        title -> Text,
+        body -> Nullable<Text>,
+    }
+}
+
+diesel::table! {
+    users {
+        id -> Integer,
+        name -> Text,
+        hair_color -> Nullable<Text>,
+    }
+}
+
+diesel::joinable!(comments -> posts (post_id));
+diesel::joinable!(posts -> users (user_id));
+diesel::allow_tables_to_appear_in_same_query!(users, posts, comments);
+
+#[cfg_attr(feature = "serde", derive(serde::Deserialize))]
+#[cfg_attr(feature = "sqlx", derive(sqlx::FromRow))]
+#[derive(
+    Clone,
+    Debug,
+    Eq,
+    PartialEq,
+    diesel::Associations,
+    diesel::Identifiable,
+    diesel::Queryable,
+)]
+#[diesel(belongs_to(Post))]
+pub struct Comment {
+    pub id: Id,
+    pub post_id: Id,
+    pub text: String,
+}
+
+#[cfg_attr(feature = "serde", derive(serde::Deserialize))]
+#[cfg_attr(feature = "sqlx", derive(sqlx::FromRow))]
+#[derive(
+    Clone,
+    Debug,
+    Eq,
+    PartialEq,
+    diesel::Associations,
+    diesel::Identifiable,
+    diesel::Queryable,
+    diesel::QueryableByName,
+)]
+#[diesel(belongs_to(User))]
+#[diesel(table_name = posts)]
+pub struct Post {
+    pub id: Id,
+    pub user_id: Id,
+    pub title: String,
+    pub body: Option<String>,
+}
+
+#[cfg_attr(feature = "serde", derive(serde::Deserialize))]
+#[cfg_attr(feature = "sqlx", derive(sqlx::FromRow))]
+#[derive(
+    Clone,
+    Debug,
+    Eq,
+    PartialEq,
+    diesel::AsChangeset,
+    diesel::Identifiable,
+    diesel::Insertable,
+    diesel::Queryable,
+    diesel::QueryableByName,
+)]
+#[diesel(table_name = users)]
+pub struct User {
+    pub id: Id,
+    pub name: String,
+    pub hair_color: Option<String>,
+}

diesel_bench/benches/diesel_async_benches.rs

@@ -1,10 +1,9 @@
+#[path = "common.rs"]
+mod common;
+
+use common::*;
 use super::Bencher;
-use diesel::insert_into;
-use diesel::prelude::{
-    allow_tables_to_appear_in_same_query, joinable, table, AsChangeset, Associations,
-    BelongingToDsl, ExpressionMethods, GroupedBy, Identifiable, Insertable, QueryDsl, Queryable,
-    QueryableByName,
-};
+use diesel::*;
 use diesel_async::AsyncConnection;
 use diesel_async::RunQueryDsl;
 use tokio::runtime::Runtime;
@@ -15,45 +14,6 @@ type TestConnection = diesel_async::AsyncPgConnection;
 #[cfg(feature = "mysql")]
 type TestConnection = diesel_async::AsyncMysqlConnection;
 
-table! {
-    users {
-        id -> Integer,
-        name -> Text,
-        hair_color -> Nullable<Text>,
-    }
-}
-
-table! {
-    posts {
-        id -> Integer,
-        user_id -> Integer,
-        title -> Text,
-        body -> Nullable<Text>,
-    }
-}
-
-table! {
-    comments {
-        id -> Integer,
-        post_id -> Integer,
-        text -> Text,
-    }
-}
-
-joinable!(comments -> posts (post_id));
-joinable!(posts -> users (user_id));
-allow_tables_to_appear_in_same_query!(users, posts, comments);
-
-#[derive(
-    PartialEq, Eq, Debug, Clone, Queryable, Identifiable, Insertable, AsChangeset, QueryableByName,
-)]
-#[diesel(table_name = users)]
-pub struct User {
-    pub id: i32,
-    pub name: String,
-    pub hair_color: Option<String>,
-}
-
 #[derive(Debug, PartialEq, Eq, Queryable, Clone, Insertable, AsChangeset)]
 #[diesel(table_name = users)]
 #[diesel(treat_none_as_default_value = false)]
@@ -71,16 +31,6 @@ impl NewUser {
     }
 }
 
-#[derive(PartialEq, Eq, Debug, Clone, Queryable, Identifiable, Associations, QueryableByName)]
-#[diesel(belongs_to(User))]
-#[diesel(table_name = posts)]
-pub struct Post {
-    pub id: i32,
-    pub user_id: i32,
-    pub title: String,
-    pub body: Option<String>,
-}
-
 #[derive(Insertable)]
 #[diesel(table_name = posts)]
 pub struct NewPost {
@@ -99,14 +49,6 @@ impl NewPost {
     }
 }
 
-#[derive(PartialEq, Eq, Debug, Clone, Queryable, Identifiable, Associations)]
-#[diesel(belongs_to(Post))]
-pub struct Comment {
-    id: i32,
-    post_id: i32,
-    text: String,
-}
-
 #[derive(Debug, Clone, Copy, Insertable)]
 #[diesel(table_name = comments)]
 pub struct NewComment<'a>(

diesel_bench/benches/diesel_benches.rs

@@ -1,3 +1,7 @@
+#[path = "common.rs"]
+mod common;
+
+use common::*;
 use super::Bencher;
 use diesel::*;
 
@@ -10,45 +14,6 @@ type TestConnection = MysqlConnection;
 #[cfg(feature = "sqlite")]
 type TestConnection = SqliteConnection;
 
-table! {
-    users {
-        id -> Integer,
-        name -> Text,
-        hair_color -> Nullable<Text>,
-    }
-}
-
-table! {
-    posts {
-        id -> Integer,
-        user_id -> Integer,
-        title -> Text,
-        body -> Nullable<Text>,
-    }
-}
-
-table! {
-    comments {
-        id -> Integer,
-        post_id -> Integer,
-        text -> Text,
-    }
-}
-
-joinable!(comments -> posts (post_id));
-joinable!(posts -> users (user_id));
-allow_tables_to_appear_in_same_query!(users, posts, comments);
-
-#[derive(
-    PartialEq, Eq, Debug, Clone, Queryable, Identifiable, Insertable, AsChangeset, QueryableByName,
-)]
-#[diesel(table_name = users)]
-pub struct User {
-    pub id: i32,
-    pub name: String,
-    pub hair_color: Option<String>,
-}
-
 #[derive(Debug, PartialEq, Eq, Queryable, Clone, Insertable, AsChangeset)]
 #[diesel(table_name = users)]
 #[diesel(treat_none_as_default_value = false)]
@@ -66,16 +31,6 @@ impl NewUser {
     }
 }
 
-#[derive(PartialEq, Eq, Debug, Clone, Queryable, Identifiable, Associations, QueryableByName)]
-#[diesel(belongs_to(User))]
-#[diesel(table_name = posts)]
-pub struct Post {
-    pub id: i32,
-    pub user_id: i32,
-    pub title: String,
-    pub body: Option<String>,
-}
-
 #[derive(Insertable)]
 #[diesel(table_name = posts)]
 pub struct NewPost {
@@ -94,14 +49,6 @@ impl NewPost {
     }
 }
 
-#[derive(PartialEq, Eq, Debug, Clone, Queryable, Identifiable, Associations)]
-#[diesel(belongs_to(Post))]
-pub struct Comment {
-    id: i32,
-    post_id: i32,
-    text: String,
-}
-
 #[derive(Debug, Clone, Copy, Insertable)]
 #[diesel(table_name = comments)]
 pub struct NewComment<'a>(

diesel_bench/benches/mysql_benches.rs

@@ -1,28 +1,13 @@
+#[path = "common.rs"]
+mod common;
+
+use common::*;
 use super::Bencher;
 use rust_mysql::params::Params;
 use rust_mysql::prelude::*;
 use rust_mysql::{Conn, Opts, Row};
 use std::collections::HashMap;
 
-pub struct User {
-    pub id: i32,
-    pub name: String,
-    pub hair_color: Option<String>,
-}
-
-pub struct Post {
-    pub id: i32,
-    pub user_id: i32,
-    pub title: String,
-    pub body: Option<String>,
-}
-
-pub struct Comment {
-    pub id: i32,
-    pub post_id: i32,
-    pub text: String,
-}
-
 fn connection() -> Conn {
     dotenvy::dotenv().ok();
     let connection_url = dotenvy::var("MYSQL_DATABASE_URL")

diesel_bench/benches/postgres_benches.rs

@@ -1,3 +1,7 @@
+#[path = "common.rs"]
+mod common;
+
+use common::*;
 use super::Bencher;
 use rust_postgres::fallible_iterator::FallibleIterator;
 use rust_postgres::types::ToSql;
@@ -6,25 +10,6 @@ use std::collections::HashMap;
 
 const NO_PARAMS: Vec<&dyn ToSql> = Vec::new();
 
-pub struct User {
-    pub id: i32,
-    pub name: String,
-    pub hair_color: Option<String>,
-}
-
-pub struct Post {
-    pub id: i32,
-    pub user_id: i32,
-    pub title: String,
-    pub body: Option<String>,
-}
-
-pub struct Comment {
-    pub id: i32,
-    pub post_id: i32,
-    pub text: String,
-}
-
 fn connection() -> Client {
     dotenvy::dotenv().ok();
     let connection_url = dotenvy::var("POSTGRES_DATABASE_URL")

diesel_bench/benches/quaint_benches.rs

@@ -1,32 +1,14 @@
+#[path = "common.rs"]
+mod common;
+
+use common::*;
 use super::Bencher;
 use quaint::prelude::*;
 use quaint::single::Quaint;
 use serde::Deserialize;
 use std::collections::HashMap;
 use tokio::runtime::Runtime;
 
-#[derive(Deserialize)]
-pub struct User {
-    pub id: i32,
-    pub name: String,
-    pub hair_color: Option<String>,
-}
-
-#[derive(Deserialize)]
-pub struct Post {
-    pub id: i32,
-    pub user_id: i32,
-    pub title: String,
-    pub body: Option<String>,
-}
-
-#[derive(Deserialize)]
-pub struct Comment {
-    pub id: i32,
-    pub post_id: i32,
-    pub text: String,
-}
-
 #[derive(Deserialize)]
 pub struct UserWithPost {
     pub myuser_id: i32,