update

Author: tgross35

Cargo.lock

@@ -9,13 +9,11 @@ crate-type = ["cdylib"]
 
 [dependencies]
 lipsum = "0.8.2"
-generic-array = "1.0.0"
 sha2 = "0.10.8"
 udf = { path = "../udf", features = ["mock", "logging-debug"] }
 uuid = { version = "1.8.0", features = ["v1", "v3", "v4", "v5", "fast-rng"] }
 
 [dev-dependencies]
-diesel = { version = "2.1.6", default-features = false, features = ["mysql"] }
 mysql = "25.0.0"
 
 [features]

udf-examples/Cargo.toml

@@ -3,9 +3,7 @@
 mod backend;
 
 use backend::get_db_connection;
-use diesel::dsl::sql_query;
-use diesel::prelude::*;
-use diesel::sql_types::Integer;
+use mysql::prelude::*;
 
 const SETUP: &[&str] = &[
     "CREATE OR REPLACE AGGREGATE FUNCTION avgcost

udf-examples/tests/avgcost.rs

@@ -29,16 +29,19 @@ fn get_database_uri() -> String {
 
 fn build_pool() -> Pool {
     let db_url = get_database_uri();
-    let (url, db) = db_url.rsplit_once('/').unwrap();
-    let pool = Pool::new(url).expect("pool failed");
-    let mut conn = pool.get_conn().expect("initial connection failed");
 
-    // Create default database
-    conn.query_drop(format!("CREATE OR REPLACE DATABASE {db}"))
-        .unwrap();
-    conn.query_drop(format!("USE {db}")).unwrap();
+    {
+        // Ensure the database exists then reconnect
+        let (url, db) = db_url.rsplit_once('/').unwrap();
+        let pool = Pool::new(url).expect("pool failed");
+        let mut conn = pool.get_conn().expect("initial connection failed");
+
+        // Create default database
+        conn.query_drop(format!("CREATE OR REPLACE DATABASE {db}"))
+            .unwrap();
+    }
 
-    pool
+    Pool::new(db_url.as_str()).expect("pool failed")
 }
 
 /// Ensures that init items have been run

udf-examples/tests/backend/mod.rs

@@ -6,15 +6,15 @@ use backend::get_db_connection;
 use mysql::prelude::*;
 
 const SETUP: &[&str] = &[
-    "create or replace aggregate function udf_median
-        returns integer
-        soname 'libudf_examples.so'",
-    "create or replace table test_median (
+    "CREATE OR REPLACE AGGREGATE FUNCTION udf_median
+        RETURNS integer
+        SONAME 'libudf_examples.so'",
+    "CREATE OR REPLACE TABLE test_median (
         id int auto_increment,
         val int,
         primary key (id)
     )",
-    "insert into test_median (val) values (2), (1), (3), (4), (-3), (7), (-1)",
+    "INSERT INTO test_median (val) VALUES (2), (1), (3), (4), (-3), (7), (-1)",
 ];
 
 #[test]