New codegen architecture

Cargo.toml

@@ -6,4 +6,4 @@ members = [
     "test_codegen",
     "benches",
     "crates/*",
-]
+]

benches/Cargo.toml

@@ -8,23 +8,26 @@ edition = "2021"
 [dependencies]
 # Path dependencies
 cornucopia = { path = "../crates/cornucopia" }
-cornucopia_sync = { path = "../crates/client_sync" }
-cornucopia_async = { path = "../crates/client_async" }
 
 # benchmarking
 criterion = { version = "0.5.1", features = ["html_reports"] }
 
 # async
-tokio = { version = "1.24.2", features = ["full"] }
-futures = "0.3.25"
+tokio = { version = "1.28.1", features = ["macros", "rt-multi-thread"] }
+futures = "0.3.28"
 
 # rust-postgres interaction
-postgres = "0.19.4"
-tokio-postgres = "0.7.7"
-postgres-types = "0.2.4"
+postgres = "0.19.5"
+tokio-postgres = "0.7.8"
+postgres-types = "0.2.5"
 
 # diesel
-diesel = { version = "2.0.2", features = ["postgres"] }
+diesel = { version = "2.0.4", features = ["postgres"] }
+
+# Temporary files
+tempfile = "3.5.0"
+
+generated = { path = "generated" }
 
 [[bench]]
 name = "execution"

benches/codegen.rs

@@ -5,14 +5,14 @@ fn bench(c: &mut Criterion) {
     cornucopia::container::cleanup(false).ok();
     cornucopia::container::setup(false).unwrap();
     let client = &mut cornucopia_conn().unwrap();
-
-    cornucopia::load_schema(client, &["../codegen_test/schema.sql"]).unwrap();
+    let tmp = tempfile::tempdir().unwrap();
+    cornucopia::load_schema(client, &["../test_codegen/schema.sql"]).unwrap();
     c.bench_function("codegen_sync", |b| {
         b.iter(|| {
-            cornucopia::generate_live(
+            cornucopia::gen_live(
                 client,
-                "../test_codegen/queries",
-                None,
+                "../test_codegen/queries".as_ref(),
+                tmp.path(),
                 CodegenSettings {
                     gen_sync: true,
                     gen_async: false,
@@ -24,10 +24,10 @@ fn bench(c: &mut Criterion) {
     });
     c.bench_function("codegen_async", |b| {
         b.iter(|| {
-            cornucopia::generate_live(
+            cornucopia::gen_live(
                 client,
-                "../test_codegen/queries",
-                None,
+                "../test_codegen/queries".as_ref(),
+                tmp.path(),
                 CodegenSettings {
                     gen_sync: true,
                     gen_async: false,

benches/execution/cornucopia_benches.rs

@@ -4,13 +4,11 @@ use criterion::Bencher;
 use futures::executor::block_on;
 use tokio_postgres::Client;
 
-use self::generated::queries::bench::{
+use generated::queries::bench::{
     async_::{comments_by_post_id, insert_user, post_by_user_ids, select_complex, users},
     Comment, Post, User,
 };
 
-mod generated;
-
 pub fn bench_trivial_query(b: &mut Bencher, client: &Client) {
     let mut stmt = users();
     b.iter(|| block_on(async { stmt.bind(client).all().await.unwrap() }))
@@ -113,7 +111,7 @@ pub mod sync {
     use criterion::Bencher;
     use postgres::Client;
 
-    use super::generated::queries::bench::{
+    use generated::queries::bench::{
         sync::{comments_by_post_id, insert_user, post_by_user_ids, select_complex, users},
         Comment, Post, User,
     };