From 2cce6fba01b7d05c0a07b39782e956bb02c9411f Mon Sep 17 00:00:00 2001
From: Daniel Akhterov <daniel@launchbadge.com>
Date: Fri, 26 Jul 2019 15:27:55 -0700
Subject: [PATCH] Rename and merge crate as a package

---
 Cargo.toml                                    |  3 ++
 mason-mariadb/Cargo.toml                      | 30 -------------------
 mason-mariadb/benches/bench.rs                | 25 ----------------
 mason-mariadb/src/protocol/serialize.rs       |  6 ----
 src/lib.rs                                    |  7 ++++-
 src/main.rs                                   | 24 ---------------
 .../mariadb}/connection/establish.rs          |  4 +--
 .../src => src/mariadb}/connection/mod.rs     |  6 ++--
 .../src => src/mariadb}/macros/mod.rs         |  0
 .../src/lib.rs => src/mariadb/mod.rs          |  5 ----
 .../src => src/mariadb}/protocol/client.rs    |  0
 .../src => src/mariadb}/protocol/decode.rs    |  0
 .../mariadb}/protocol/deserialize.rs          |  2 +-
 .../src => src/mariadb}/protocol/encode.rs    |  0
 .../mariadb}/protocol/error_codes.rs          |  0
 .../src => src/mariadb}/protocol/mod.rs       |  0
 .../protocol/packets/auth_switch_request.rs   |  4 +--
 .../mariadb}/protocol/packets/column.rs       |  0
 .../mariadb}/protocol/packets/column_def.rs   |  0
 .../mariadb}/protocol/packets/com_debug.rs    |  4 +--
 .../mariadb}/protocol/packets/com_init_db.rs  |  4 +--
 .../mariadb}/protocol/packets/com_ping.rs     |  4 +--
 .../protocol/packets/com_process_kill.rs      |  4 +--
 .../mariadb}/protocol/packets/com_query.rs    |  4 +--
 .../mariadb}/protocol/packets/com_quit.rs     |  4 +--
 .../protocol/packets/com_reset_conn.rs        |  4 +--
 .../protocol/packets/com_set_option.rs        |  4 +--
 .../mariadb}/protocol/packets/com_shutdown.rs |  4 +--
 .../mariadb}/protocol/packets/com_sleep.rs    |  4 +--
 .../protocol/packets/com_statistics.rs        |  4 +--
 .../mariadb}/protocol/packets/eof.rs          |  0
 .../mariadb}/protocol/packets/err.rs          |  0
 .../protocol/packets/handshake_response.rs    |  4 +--
 .../mariadb}/protocol/packets/initial.rs      |  0
 .../mariadb}/protocol/packets/mod.rs          |  0
 .../mariadb}/protocol/packets/ok.rs           |  0
 .../protocol/packets/packet_header.rs         |  0
 .../mariadb}/protocol/packets/result_row.rs   |  0
 .../mariadb}/protocol/packets/result_set.rs   |  6 ++--
 .../mariadb}/protocol/packets/ssl_request.rs  |  4 +--
 src/mariadb/protocol/serialize.rs             |  6 ++++
 .../src => src/mariadb}/protocol/server.rs    |  0
 .../src => src/mariadb}/protocol/types.rs     |  0
 43 files changed, 52 insertions(+), 128 deletions(-)
 delete mode 100644 mason-mariadb/Cargo.toml
 delete mode 100644 mason-mariadb/benches/bench.rs
 delete mode 100644 mason-mariadb/src/protocol/serialize.rs
 delete mode 100644 src/main.rs
 rename {mason-mariadb/src => src/mariadb}/connection/establish.rs (97%)
 rename {mason-mariadb/src => src/mariadb}/connection/mod.rs (98%)
 rename {mason-mariadb/src => src/mariadb}/macros/mod.rs (100%)
 rename mason-mariadb/src/lib.rs => src/mariadb/mod.rs (74%)
 rename {mason-mariadb/src => src/mariadb}/protocol/client.rs (100%)
 rename {mason-mariadb/src => src/mariadb}/protocol/decode.rs (100%)
 rename {mason-mariadb/src => src/mariadb}/protocol/deserialize.rs (88%)
 rename {mason-mariadb/src => src/mariadb}/protocol/encode.rs (100%)
 rename {mason-mariadb/src => src/mariadb}/protocol/error_codes.rs (100%)
 rename {mason-mariadb/src => src/mariadb}/protocol/mod.rs (100%)
 rename {mason-mariadb/src => src/mariadb}/protocol/packets/auth_switch_request.rs (68%)
 rename {mason-mariadb/src => src/mariadb}/protocol/packets/column.rs (100%)
 rename {mason-mariadb/src => src/mariadb}/protocol/packets/column_def.rs (100%)
 rename {mason-mariadb/src => src/mariadb}/protocol/packets/com_debug.rs (51%)
 rename {mason-mariadb/src => src/mariadb}/protocol/packets/com_init_db.rs (61%)
 rename {mason-mariadb/src => src/mariadb}/protocol/packets/com_ping.rs (51%)
 rename {mason-mariadb/src => src/mariadb}/protocol/packets/com_process_kill.rs (60%)
 rename {mason-mariadb/src => src/mariadb}/protocol/packets/com_query.rs (61%)
 rename {mason-mariadb/src => src/mariadb}/protocol/packets/com_quit.rs (51%)
 rename {mason-mariadb/src => src/mariadb}/protocol/packets/com_reset_conn.rs (55%)
 rename {mason-mariadb/src => src/mariadb}/protocol/packets/com_set_option.rs (68%)
 rename {mason-mariadb/src => src/mariadb}/protocol/packets/com_shutdown.rs (65%)
 rename {mason-mariadb/src => src/mariadb}/protocol/packets/com_sleep.rs (51%)
 rename {mason-mariadb/src => src/mariadb}/protocol/packets/com_statistics.rs (53%)
 rename {mason-mariadb/src => src/mariadb}/protocol/packets/eof.rs (100%)
 rename {mason-mariadb/src => src/mariadb}/protocol/packets/err.rs (100%)
 rename {mason-mariadb/src => src/mariadb}/protocol/packets/handshake_response.rs (93%)
 rename {mason-mariadb/src => src/mariadb}/protocol/packets/initial.rs (100%)
 rename {mason-mariadb/src => src/mariadb}/protocol/packets/mod.rs (100%)
 rename {mason-mariadb/src => src/mariadb}/protocol/packets/ok.rs (100%)
 rename {mason-mariadb/src => src/mariadb}/protocol/packets/packet_header.rs (100%)
 rename {mason-mariadb/src => src/mariadb}/protocol/packets/result_row.rs (100%)
 rename {mason-mariadb/src => src/mariadb}/protocol/packets/result_set.rs (98%)
 rename {mason-mariadb/src => src/mariadb}/protocol/packets/ssl_request.rs (83%)
 create mode 100644 src/mariadb/protocol/serialize.rs
 rename {mason-mariadb/src => src/mariadb}/protocol/server.rs (100%)
 rename {mason-mariadb/src => src/mariadb}/protocol/types.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index 62038a2f..1d57c3f0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,6 +17,9 @@ log = "0.4.7"
 md-5 = "0.8.0"
 memchr = "2.2.1"
 runtime = { version = "=0.3.0-alpha.6", default-features = false }
+bitflags = "1.1.0"
+enum-tryfrom = "0.2.1"
+enum-tryfrom-derive = "0.2.1"
 
 [dev-dependencies]
 runtime-tokio = { version = "=0.3.0-alpha.5" }
diff --git a/mason-mariadb/Cargo.toml b/mason-mariadb/Cargo.toml
deleted file mode 100644
index b864ead9..00000000
--- a/mason-mariadb/Cargo.toml
+++ /dev/null
@@ -1,30 +0,0 @@
-[package]
-name = "mason-mariadb"
-version = "0.1.0"
-authors = ["Daniel Akhterov <akhterovd@gmail.com>"]
-edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-mason-core = { path = "../mason-core" }
-runtime = "=0.3.0-alpha.4"
-futures-preview = "=0.3.0-alpha.16"
-failure = "0.1"
-byteorder = "1.3.1"
-log = "0.4"
-hex = "0.3.2"
-bytes = "0.4.12"
-memchr = "2.2.0"
-bitflags = "1.1.0"
-enum-tryfrom = "0.2.1"
-enum-tryfrom-derive = "0.2.1"
-
-
-[dev-dependencies]
-criterion = "0.2.11"
-
-[[bench]]
-name = "bench"
-harness = false
-
diff --git a/mason-mariadb/benches/bench.rs b/mason-mariadb/benches/bench.rs
deleted file mode 100644
index 28ed4373..00000000
--- a/mason-mariadb/benches/bench.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-#[macro_use]
-extern crate criterion;
-
-use criterion::Criterion;
-use mason_core::ConnectOptions;
-use mason_mariadb::connection::Connection;
-
-fn criterion_benchmark(c: &mut Criterion) {
-    c.bench_function("establish connection", |b| {
-        b.iter(|| {
-            Connection::establish(ConnectOptions {
-                host: "127.0.0.1",
-                port: 3306,
-                user: Some("root"),
-                database: None,
-                password: None,
-            })
-            .await
-            .unwarp();
-        })
-    });
-}
-
-criterion_group!(benches, criterion_benchmark);
-criterion_main!(benches);
diff --git a/mason-mariadb/src/protocol/serialize.rs b/mason-mariadb/src/protocol/serialize.rs
deleted file mode 100644
index e3ba9c6b..00000000
--- a/mason-mariadb/src/protocol/serialize.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use super::super::connection::Connection;
-use failure::Error;
-
-pub trait Serialize {
-    fn serialize<'a, 'b>(&self, ctx: &mut crate::connection::ConnContext, encoder: &mut crate::protocol::encode::Encoder) -> Result<(), Error>;
-}
diff --git a/src/lib.rs b/src/lib.rs
index 59cee2b3..1b38a31e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #![feature(non_exhaustive, async_await)]
 #![cfg_attr(test, feature(test))]
 
@@ -7,7 +6,13 @@
 #[cfg(test)]
 extern crate test;
 
+#[macro_use]
+extern crate bitflags;
+#[macro_use]
+extern crate enum_tryfrom_derive;
+
 mod options;
 pub use self::options::ConnectOptions;
 
 pub mod postgres;
+pub mod mariadb;
diff --git a/src/main.rs b/src/main.rs
deleted file mode 100644
index ee65e548..00000000
--- a/src/main.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-#![feature(async_await)]
-
-use mason::{pg::Connection, ConnectOptions};
-
-#[runtime::main]
-async fn main() -> Result<(), failure::Error> {
-    env_logger::try_init()?;
-
-    let mut conn =
-        Connection::establish(ConnectOptions::new().user("postgres").password("password")).await?;
-
-    conn.execute("INSERT INTO \"users\" (name) VALUES ($1)")
-        .bind(b"Joe")
-        .await?;
-
-    conn.prepare("INSERT INTO \"users\" (name) VALUES ($1)")
-        .bind(b"Joe")
-        .execute()
-        .await?;
-
-    conn.close().await?;
-
-    Ok(())
-}
diff --git a/mason-mariadb/src/connection/establish.rs b/src/mariadb/connection/establish.rs
similarity index 97%
rename from mason-mariadb/src/connection/establish.rs
rename to src/mariadb/connection/establish.rs
index 18cd2173..42103d99 100644
--- a/mason-mariadb/src/connection/establish.rs
+++ b/src/mariadb/connection/establish.rs
@@ -1,5 +1,5 @@
 use super::Connection;
-use crate::protocol::{
+use crate::mariadb::protocol::{
     deserialize::{DeContext, Deserialize},
     packets::{handshake_response::HandshakeResponsePacket, initial::InitialHandshakePacket},
     server::Message as ServerMessage,
@@ -7,7 +7,7 @@ use crate::protocol::{
 };
 use bytes::{BufMut, Bytes};
 use failure::{err_msg, Error};
-use mason_core::ConnectOptions;
+use crate::ConnectOptions;
 
 pub async fn establish<'a, 'b: 'a>(
     conn: &'a mut Connection,
diff --git a/mason-mariadb/src/connection/mod.rs b/src/mariadb/connection/mod.rs
similarity index 98%
rename from mason-mariadb/src/connection/mod.rs
rename to src/mariadb/connection/mod.rs
index cd58cfe2..2c2644f6 100644
--- a/mason-mariadb/src/connection/mod.rs
+++ b/src/mariadb/connection/mod.rs
@@ -7,9 +7,9 @@ use futures::{
 };
 use runtime::net::TcpStream;
 
-use mason_core::ConnectOptions;
+use crate::ConnectOptions;
 
-use crate::protocol::{
+use crate::mariadb::protocol::{
     deserialize::{DeContext, Deserialize},
     encode::Encoder,
     packets::{com_init_db::ComInitDb, com_ping::ComPing, com_query::ComQuery, com_quit::ComQuit, ok::OkPacket},
@@ -17,7 +17,7 @@ use crate::protocol::{
     server::Message as ServerMessage,
     types::{Capabilities, ServerStatusFlag},
 };
-use crate::protocol::server::Message;
+use crate::mariadb::protocol::server::Message;
 
 mod establish;
 
diff --git a/mason-mariadb/src/macros/mod.rs b/src/mariadb/macros/mod.rs
similarity index 100%
rename from mason-mariadb/src/macros/mod.rs
rename to src/mariadb/macros/mod.rs
diff --git a/mason-mariadb/src/lib.rs b/src/mariadb/mod.rs
similarity index 74%
rename from mason-mariadb/src/lib.rs
rename to src/mariadb/mod.rs
index e4fcccde..bd179f22 100644
--- a/mason-mariadb/src/lib.rs
+++ b/src/mariadb/mod.rs
@@ -3,11 +3,6 @@
 // TODO: Remove this once API has matured
 #![allow(dead_code, unused_imports, unused_variables)]
 
-#[macro_use]
-extern crate bitflags;
-#[macro_use]
-extern crate enum_tryfrom_derive;
-
 pub mod connection;
 pub mod protocol;
 
diff --git a/mason-mariadb/src/protocol/client.rs b/src/mariadb/protocol/client.rs
similarity index 100%
rename from mason-mariadb/src/protocol/client.rs
rename to src/mariadb/protocol/client.rs
diff --git a/mason-mariadb/src/protocol/decode.rs b/src/mariadb/protocol/decode.rs
similarity index 100%
rename from mason-mariadb/src/protocol/decode.rs
rename to src/mariadb/protocol/decode.rs
diff --git a/mason-mariadb/src/protocol/deserialize.rs b/src/mariadb/protocol/deserialize.rs
similarity index 88%
rename from mason-mariadb/src/protocol/deserialize.rs
rename to src/mariadb/protocol/deserialize.rs
index d90bdd19..d72c77b4 100644
--- a/mason-mariadb/src/protocol/deserialize.rs
+++ b/src/mariadb/protocol/deserialize.rs
@@ -1,5 +1,5 @@
 use super::decode::Decoder;
-use crate::connection::{ConnContext, Connection};
+use crate::mariadb::connection::{ConnContext, Connection};
 use bytes::Bytes;
 use failure::Error;
 
diff --git a/mason-mariadb/src/protocol/encode.rs b/src/mariadb/protocol/encode.rs
similarity index 100%
rename from mason-mariadb/src/protocol/encode.rs
rename to src/mariadb/protocol/encode.rs
diff --git a/mason-mariadb/src/protocol/error_codes.rs b/src/mariadb/protocol/error_codes.rs
similarity index 100%
rename from mason-mariadb/src/protocol/error_codes.rs
rename to src/mariadb/protocol/error_codes.rs
diff --git a/mason-mariadb/src/protocol/mod.rs b/src/mariadb/protocol/mod.rs
similarity index 100%
rename from mason-mariadb/src/protocol/mod.rs
rename to src/mariadb/protocol/mod.rs
diff --git a/mason-mariadb/src/protocol/packets/auth_switch_request.rs b/src/mariadb/protocol/packets/auth_switch_request.rs
similarity index 68%
rename from mason-mariadb/src/protocol/packets/auth_switch_request.rs
rename to src/mariadb/protocol/packets/auth_switch_request.rs
index f1790ad3..72e708e2 100644
--- a/mason-mariadb/src/protocol/packets/auth_switch_request.rs
+++ b/src/mariadb/protocol/packets/auth_switch_request.rs
@@ -1,5 +1,5 @@
 use super::super::serialize::Serialize;
-use crate::connection::Connection;
+use crate::mariadb::connection::Connection;
 use bytes::Bytes;
 use failure::Error;
 
@@ -10,7 +10,7 @@ pub struct AuthenticationSwitchRequestPacket {
 }
 
 impl Serialize for AuthenticationSwitchRequestPacket {
-    fn serialize<'a, 'b>(&self, ctx: &mut crate::connection::ConnContext, encoder: &mut crate::protocol::encode::Encoder) -> Result<(), Error> {
+    fn serialize<'a, 'b>(&self, ctx: &mut crate::mariadb::connection::ConnContext, encoder: &mut crate::mariadb::protocol::encode::Encoder) -> Result<(), Error> {
         encoder.encode_int_1(0xFE);
         encoder.encode_string_null(&self.auth_plugin_name);
         encoder.encode_byte_eof(&self.auth_plugin_data);
diff --git a/mason-mariadb/src/protocol/packets/column.rs b/src/mariadb/protocol/packets/column.rs
similarity index 100%
rename from mason-mariadb/src/protocol/packets/column.rs
rename to src/mariadb/protocol/packets/column.rs
diff --git a/mason-mariadb/src/protocol/packets/column_def.rs b/src/mariadb/protocol/packets/column_def.rs
similarity index 100%
rename from mason-mariadb/src/protocol/packets/column_def.rs
rename to src/mariadb/protocol/packets/column_def.rs
diff --git a/mason-mariadb/src/protocol/packets/com_debug.rs b/src/mariadb/protocol/packets/com_debug.rs
similarity index 51%
rename from mason-mariadb/src/protocol/packets/com_debug.rs
rename to src/mariadb/protocol/packets/com_debug.rs
index 7368d1a3..12b3afe3 100644
--- a/mason-mariadb/src/protocol/packets/com_debug.rs
+++ b/src/mariadb/protocol/packets/com_debug.rs
@@ -1,11 +1,11 @@
 use super::super::{client::TextProtocol, serialize::Serialize};
-use crate::connection::Connection;
+use crate::mariadb::connection::Connection;
 use failure::Error;
 
 pub struct ComDebug();
 
 impl Serialize for ComDebug {
-    fn serialize<'a, 'b>(&self, ctx: &mut crate::connection::ConnContext, encoder: &mut crate::protocol::encode::Encoder) -> Result<(), Error> {
+    fn serialize<'a, 'b>(&self, ctx: &mut crate::mariadb::connection::ConnContext, encoder: &mut crate::mariadb::protocol::encode::Encoder) -> Result<(), Error> {
         encoder.encode_int_1(TextProtocol::ComDebug.into());
 
         Ok(())
diff --git a/mason-mariadb/src/protocol/packets/com_init_db.rs b/src/mariadb/protocol/packets/com_init_db.rs
similarity index 61%
rename from mason-mariadb/src/protocol/packets/com_init_db.rs
rename to src/mariadb/protocol/packets/com_init_db.rs
index ea933b85..60f0c80a 100644
--- a/mason-mariadb/src/protocol/packets/com_init_db.rs
+++ b/src/mariadb/protocol/packets/com_init_db.rs
@@ -1,5 +1,5 @@
 use super::super::{client::TextProtocol, serialize::Serialize};
-use crate::connection::Connection;
+use crate::mariadb::connection::Connection;
 use bytes::Bytes;
 use failure::Error;
 
@@ -8,7 +8,7 @@ pub struct ComInitDb {
 }
 
 impl Serialize for ComInitDb {
-    fn serialize<'a, 'b>(&self, ctx: &mut crate::connection::ConnContext, encoder: &mut crate::protocol::encode::Encoder) -> Result<(), Error> {
+    fn serialize<'a, 'b>(&self, ctx: &mut crate::mariadb::connection::ConnContext, encoder: &mut crate::mariadb::protocol::encode::Encoder) -> Result<(), Error> {
         encoder.encode_int_1(TextProtocol::ComInitDb.into());
         encoder.encode_string_null(&self.schema_name);
 
diff --git a/mason-mariadb/src/protocol/packets/com_ping.rs b/src/mariadb/protocol/packets/com_ping.rs
similarity index 51%
rename from mason-mariadb/src/protocol/packets/com_ping.rs
rename to src/mariadb/protocol/packets/com_ping.rs
index 054ee445..f02c11ae 100644
--- a/mason-mariadb/src/protocol/packets/com_ping.rs
+++ b/src/mariadb/protocol/packets/com_ping.rs
@@ -1,11 +1,11 @@
 use super::super::{client::TextProtocol, serialize::Serialize};
-use crate::connection::Connection;
+use crate::mariadb::connection::Connection;
 use failure::Error;
 
 pub struct ComPing();
 
 impl Serialize for ComPing {
-    fn serialize<'a, 'b>(&self, ctx: &mut crate::connection::ConnContext, encoder: &mut crate::protocol::encode::Encoder) -> Result<(), Error> {
+    fn serialize<'a, 'b>(&self, ctx: &mut crate::mariadb::connection::ConnContext, encoder: &mut crate::mariadb::protocol::encode::Encoder) -> Result<(), Error> {
         encoder.encode_int_1(TextProtocol::ComPing.into());
 
         Ok(())
diff --git a/mason-mariadb/src/protocol/packets/com_process_kill.rs b/src/mariadb/protocol/packets/com_process_kill.rs
similarity index 60%
rename from mason-mariadb/src/protocol/packets/com_process_kill.rs
rename to src/mariadb/protocol/packets/com_process_kill.rs
index f62b88e7..843defda 100644
--- a/mason-mariadb/src/protocol/packets/com_process_kill.rs
+++ b/src/mariadb/protocol/packets/com_process_kill.rs
@@ -1,5 +1,5 @@
 use super::super::{client::TextProtocol, serialize::Serialize};
-use crate::connection::Connection;
+use crate::mariadb::connection::Connection;
 use failure::Error;
 
 pub struct ComProcessKill {
@@ -7,7 +7,7 @@ pub struct ComProcessKill {
 }
 
 impl Serialize for ComProcessKill {
-    fn serialize<'a, 'b>(&self, ctx: &mut crate::connection::ConnContext, encoder: &mut crate::protocol::encode::Encoder) -> Result<(), Error> {
+    fn serialize<'a, 'b>(&self, ctx: &mut crate::mariadb::connection::ConnContext, encoder: &mut crate::mariadb::protocol::encode::Encoder) -> Result<(), Error> {
         encoder.encode_int_1(TextProtocol::ComProcessKill.into());
         encoder.encode_int_4(self.process_id);
 
diff --git a/mason-mariadb/src/protocol/packets/com_query.rs b/src/mariadb/protocol/packets/com_query.rs
similarity index 61%
rename from mason-mariadb/src/protocol/packets/com_query.rs
rename to src/mariadb/protocol/packets/com_query.rs
index 7971acde..dc5123bb 100644
--- a/mason-mariadb/src/protocol/packets/com_query.rs
+++ b/src/mariadb/protocol/packets/com_query.rs
@@ -1,5 +1,5 @@
 use super::super::{client::TextProtocol, serialize::Serialize};
-use crate::connection::Connection;
+use crate::mariadb::connection::Connection;
 use bytes::Bytes;
 use failure::Error;
 
@@ -8,7 +8,7 @@ pub struct ComQuery {
 }
 
 impl Serialize for ComQuery {
-    fn serialize<'a, 'b>(&self, ctx: &mut crate::connection::ConnContext, encoder: &mut crate::protocol::encode::Encoder) -> Result<(), Error> {
+    fn serialize<'a, 'b>(&self, ctx: &mut crate::mariadb::connection::ConnContext, encoder: &mut crate::mariadb::protocol::encode::Encoder) -> Result<(), Error> {
         encoder.encode_int_1(TextProtocol::ComQuery.into());
         encoder.encode_string_eof(&self.sql_statement);
 
diff --git a/mason-mariadb/src/protocol/packets/com_quit.rs b/src/mariadb/protocol/packets/com_quit.rs
similarity index 51%
rename from mason-mariadb/src/protocol/packets/com_quit.rs
rename to src/mariadb/protocol/packets/com_quit.rs
index 0f9378f5..5f11223d 100644
--- a/mason-mariadb/src/protocol/packets/com_quit.rs
+++ b/src/mariadb/protocol/packets/com_quit.rs
@@ -1,11 +1,11 @@
 use super::super::{client::TextProtocol, serialize::Serialize};
-use crate::connection::Connection;
+use crate::mariadb::connection::Connection;
 use failure::Error;
 
 pub struct ComQuit();
 
 impl Serialize for ComQuit {
-    fn serialize<'a, 'b>(&self, ctx: &mut crate::connection::ConnContext, encoder: &mut crate::protocol::encode::Encoder) -> Result<(), Error> {
+    fn serialize<'a, 'b>(&self, ctx: &mut crate::mariadb::connection::ConnContext, encoder: &mut crate::mariadb::protocol::encode::Encoder) -> Result<(), Error> {
         encoder.encode_int_1(TextProtocol::ComQuit.into());
 
         Ok(())
diff --git a/mason-mariadb/src/protocol/packets/com_reset_conn.rs b/src/mariadb/protocol/packets/com_reset_conn.rs
similarity index 55%
rename from mason-mariadb/src/protocol/packets/com_reset_conn.rs
rename to src/mariadb/protocol/packets/com_reset_conn.rs
index 2e010a4a..c40c4431 100644
--- a/mason-mariadb/src/protocol/packets/com_reset_conn.rs
+++ b/src/mariadb/protocol/packets/com_reset_conn.rs
@@ -1,11 +1,11 @@
 use super::super::{client::TextProtocol, serialize::Serialize};
-use crate::connection::Connection;
+use crate::mariadb::connection::Connection;
 use failure::Error;
 
 pub struct ComResetConnection();
 
 impl Serialize for ComResetConnection {
-    fn serialize<'a, 'b>(&self, ctx: &mut crate::connection::ConnContext, encoder: &mut crate::protocol::encode::Encoder) -> Result<(), Error> {
+    fn serialize<'a, 'b>(&self, ctx: &mut crate::mariadb::connection::ConnContext, encoder: &mut crate::mariadb::protocol::encode::Encoder) -> Result<(), Error> {
         encoder.encode_int_1(TextProtocol::ComResetConnection.into());
 
         Ok(())
diff --git a/mason-mariadb/src/protocol/packets/com_set_option.rs b/src/mariadb/protocol/packets/com_set_option.rs
similarity index 68%
rename from mason-mariadb/src/protocol/packets/com_set_option.rs
rename to src/mariadb/protocol/packets/com_set_option.rs
index eeac45c5..3eef465f 100644
--- a/mason-mariadb/src/protocol/packets/com_set_option.rs
+++ b/src/mariadb/protocol/packets/com_set_option.rs
@@ -1,5 +1,5 @@
 use super::super::{client::TextProtocol, serialize::Serialize};
-use crate::connection::Connection;
+use crate::mariadb::connection::Connection;
 use failure::Error;
 
 #[derive(Clone, Copy)]
@@ -13,7 +13,7 @@ pub struct ComSetOption {
 }
 
 impl Serialize for ComSetOption {
-    fn serialize<'a, 'b>(&self, ctx: &mut crate::connection::ConnContext, encoder: &mut crate::protocol::encode::Encoder) -> Result<(), Error> {
+    fn serialize<'a, 'b>(&self, ctx: &mut crate::mariadb::connection::ConnContext, encoder: &mut crate::mariadb::protocol::encode::Encoder) -> Result<(), Error> {
         encoder.encode_int_1(TextProtocol::ComSetOption.into());
         encoder.encode_int_2(self.option.into());
 
diff --git a/mason-mariadb/src/protocol/packets/com_shutdown.rs b/src/mariadb/protocol/packets/com_shutdown.rs
similarity index 65%
rename from mason-mariadb/src/protocol/packets/com_shutdown.rs
rename to src/mariadb/protocol/packets/com_shutdown.rs
index 3bf269e6..4c5925e0 100644
--- a/mason-mariadb/src/protocol/packets/com_shutdown.rs
+++ b/src/mariadb/protocol/packets/com_shutdown.rs
@@ -1,5 +1,5 @@
 use super::super::{client::TextProtocol, serialize::Serialize};
-use crate::connection::Connection;
+use crate::mariadb::connection::Connection;
 use failure::Error;
 
 #[derive(Clone, Copy)]
@@ -12,7 +12,7 @@ pub struct ComShutdown {
 }
 
 impl Serialize for ComShutdown {
-    fn serialize<'a, 'b>(&self, ctx: &mut crate::connection::ConnContext, encoder: &mut crate::protocol::encode::Encoder) -> Result<(), Error> {
+    fn serialize<'a, 'b>(&self, ctx: &mut crate::mariadb::connection::ConnContext, encoder: &mut crate::mariadb::protocol::encode::Encoder) -> Result<(), Error> {
         encoder.encode_int_1(TextProtocol::ComShutdown.into());
         encoder.encode_int_1(self.option.into());
 
diff --git a/mason-mariadb/src/protocol/packets/com_sleep.rs b/src/mariadb/protocol/packets/com_sleep.rs
similarity index 51%
rename from mason-mariadb/src/protocol/packets/com_sleep.rs
rename to src/mariadb/protocol/packets/com_sleep.rs
index 441ffcb8..627d37c7 100644
--- a/mason-mariadb/src/protocol/packets/com_sleep.rs
+++ b/src/mariadb/protocol/packets/com_sleep.rs
@@ -1,11 +1,11 @@
 use super::super::{client::TextProtocol, serialize::Serialize};
-use crate::connection::Connection;
+use crate::mariadb::connection::Connection;
 use failure::Error;
 
 pub struct ComSleep();
 
 impl Serialize for ComSleep {
-    fn serialize<'a, 'b>(&self, ctx: &mut crate::connection::ConnContext, encoder: &mut crate::protocol::encode::Encoder) -> Result<(), Error> {
+    fn serialize<'a, 'b>(&self, ctx: &mut crate::mariadb::connection::ConnContext, encoder: &mut crate::mariadb::protocol::encode::Encoder) -> Result<(), Error> {
         encoder.encode_int_1(TextProtocol::ComSleep.into());
 
         Ok(())
diff --git a/mason-mariadb/src/protocol/packets/com_statistics.rs b/src/mariadb/protocol/packets/com_statistics.rs
similarity index 53%
rename from mason-mariadb/src/protocol/packets/com_statistics.rs
rename to src/mariadb/protocol/packets/com_statistics.rs
index 8a4c7117..b4a2fd16 100644
--- a/mason-mariadb/src/protocol/packets/com_statistics.rs
+++ b/src/mariadb/protocol/packets/com_statistics.rs
@@ -1,11 +1,11 @@
 use super::super::{client::TextProtocol, serialize::Serialize};
-use crate::connection::Connection;
+use crate::mariadb::connection::Connection;
 use failure::Error;
 
 pub struct ComStatistics();
 
 impl Serialize for ComStatistics {
-    fn serialize<'a, 'b>(&self, ctx: &mut crate::connection::ConnContext, encoder: &mut crate::protocol::encode::Encoder) -> Result<(), Error> {
+    fn serialize<'a, 'b>(&self, ctx: &mut crate::mariadb::connection::ConnContext, encoder: &mut crate::mariadb::protocol::encode::Encoder) -> Result<(), Error> {
         encoder.encode_int_1(TextProtocol::ComStatistics.into());
 
         Ok(())
diff --git a/mason-mariadb/src/protocol/packets/eof.rs b/src/mariadb/protocol/packets/eof.rs
similarity index 100%
rename from mason-mariadb/src/protocol/packets/eof.rs
rename to src/mariadb/protocol/packets/eof.rs
diff --git a/mason-mariadb/src/protocol/packets/err.rs b/src/mariadb/protocol/packets/err.rs
similarity index 100%
rename from mason-mariadb/src/protocol/packets/err.rs
rename to src/mariadb/protocol/packets/err.rs
diff --git a/mason-mariadb/src/protocol/packets/handshake_response.rs b/src/mariadb/protocol/packets/handshake_response.rs
similarity index 93%
rename from mason-mariadb/src/protocol/packets/handshake_response.rs
rename to src/mariadb/protocol/packets/handshake_response.rs
index b0f69c81..818077dc 100644
--- a/mason-mariadb/src/protocol/packets/handshake_response.rs
+++ b/src/mariadb/protocol/packets/handshake_response.rs
@@ -1,5 +1,5 @@
 use super::super::{serialize::Serialize, types::Capabilities};
-use crate::connection::Connection;
+use crate::mariadb::connection::Connection;
 use bytes::Bytes;
 use failure::Error;
 
@@ -20,7 +20,7 @@ pub struct HandshakeResponsePacket {
 }
 
 impl Serialize for HandshakeResponsePacket {
-    fn serialize<'a, 'b>(&self, ctx: &mut crate::connection::ConnContext, encoder: &mut crate::protocol::encode::Encoder) -> Result<(), Error> {
+    fn serialize<'a, 'b>(&self, ctx: &mut crate::mariadb::connection::ConnContext, encoder: &mut crate::mariadb::protocol::encode::Encoder) -> Result<(), Error> {
         encoder.encode_int_4(self.capabilities.bits() as u32);
         encoder.encode_int_4(self.max_packet_size);
         encoder.encode_int_1(self.collation);
diff --git a/mason-mariadb/src/protocol/packets/initial.rs b/src/mariadb/protocol/packets/initial.rs
similarity index 100%
rename from mason-mariadb/src/protocol/packets/initial.rs
rename to src/mariadb/protocol/packets/initial.rs
diff --git a/mason-mariadb/src/protocol/packets/mod.rs b/src/mariadb/protocol/packets/mod.rs
similarity index 100%
rename from mason-mariadb/src/protocol/packets/mod.rs
rename to src/mariadb/protocol/packets/mod.rs
diff --git a/mason-mariadb/src/protocol/packets/ok.rs b/src/mariadb/protocol/packets/ok.rs
similarity index 100%
rename from mason-mariadb/src/protocol/packets/ok.rs
rename to src/mariadb/protocol/packets/ok.rs
diff --git a/mason-mariadb/src/protocol/packets/packet_header.rs b/src/mariadb/protocol/packets/packet_header.rs
similarity index 100%
rename from mason-mariadb/src/protocol/packets/packet_header.rs
rename to src/mariadb/protocol/packets/packet_header.rs
diff --git a/mason-mariadb/src/protocol/packets/result_row.rs b/src/mariadb/protocol/packets/result_row.rs
similarity index 100%
rename from mason-mariadb/src/protocol/packets/result_row.rs
rename to src/mariadb/protocol/packets/result_row.rs
diff --git a/mason-mariadb/src/protocol/packets/result_set.rs b/src/mariadb/protocol/packets/result_set.rs
similarity index 98%
rename from mason-mariadb/src/protocol/packets/result_set.rs
rename to src/mariadb/protocol/packets/result_set.rs
index 139e1668..44e48b83 100644
--- a/mason-mariadb/src/protocol/packets/result_set.rs
+++ b/src/mariadb/protocol/packets/result_set.rs
@@ -1,9 +1,9 @@
 use bytes::Bytes;
 use failure::Error;
 
-use crate::protocol::decode::Decoder;
-use crate::protocol::server::Message;
-use crate::protocol::types::Capabilities;
+use crate::mariadb::protocol::decode::Decoder;
+use crate::mariadb::protocol::server::Message;
+use crate::mariadb::protocol::types::Capabilities;
 
 use super::super::{
     deserialize::{DeContext, Deserialize},
diff --git a/mason-mariadb/src/protocol/packets/ssl_request.rs b/src/mariadb/protocol/packets/ssl_request.rs
similarity index 83%
rename from mason-mariadb/src/protocol/packets/ssl_request.rs
rename to src/mariadb/protocol/packets/ssl_request.rs
index 5778609b..a064c981 100644
--- a/mason-mariadb/src/protocol/packets/ssl_request.rs
+++ b/src/mariadb/protocol/packets/ssl_request.rs
@@ -1,5 +1,5 @@
 use super::super::{serialize::Serialize, types::Capabilities};
-use crate::connection::Connection;
+use crate::mariadb::connection::Connection;
 use bytes::Bytes;
 use failure::Error;
 
@@ -12,7 +12,7 @@ pub struct SSLRequestPacket {
 }
 
 impl Serialize for SSLRequestPacket {
-    fn serialize<'a, 'b>(&self, ctx: &mut crate::connection::ConnContext, encoder: &mut crate::protocol::encode::Encoder) -> Result<(), Error> {
+    fn serialize<'a, 'b>(&self, ctx: &mut crate::mariadb::connection::ConnContext, encoder: &mut crate::mariadb::protocol::encode::Encoder) -> Result<(), Error> {
         encoder.encode_int_4(self.capabilities.bits() as u32);
         encoder.encode_int_4(self.max_packet_size);
         encoder.encode_int_1(self.collation);
diff --git a/src/mariadb/protocol/serialize.rs b/src/mariadb/protocol/serialize.rs
new file mode 100644
index 00000000..c46bfdab
--- /dev/null
+++ b/src/mariadb/protocol/serialize.rs
@@ -0,0 +1,6 @@
+use super::super::connection::Connection;
+use failure::Error;
+
+pub trait Serialize {
+    fn serialize<'a, 'b>(&self, ctx: &mut crate::mariadb::connection::ConnContext, encoder: &mut crate::mariadb::protocol::encode::Encoder) -> Result<(), Error>;
+}
diff --git a/mason-mariadb/src/protocol/server.rs b/src/mariadb/protocol/server.rs
similarity index 100%
rename from mason-mariadb/src/protocol/server.rs
rename to src/mariadb/protocol/server.rs
diff --git a/mason-mariadb/src/protocol/types.rs b/src/mariadb/protocol/types.rs
similarity index 100%
rename from mason-mariadb/src/protocol/types.rs
rename to src/mariadb/protocol/types.rs