[db] Implement derive macros for deriving "Identity" structures.

Cargo.toml

@@ -3,6 +3,7 @@ members = [
     "omicron-bootstrap-agent",
     "omicron-common",
     "omicron-nexus",
+    "omicron-nexus/src/db/db-macros",
     "omicron-rpaths",
     "omicron-sled-agent",
     "oximeter/oximeter",
@@ -13,6 +14,7 @@ default-members = [
     "omicron-bootstrap-agent",
     "omicron-common",
     "omicron-nexus",
+    "omicron-nexus/src/db/db-macros",
     "omicron-rpaths",
     "omicron-sled-agent",
     "oximeter/oximeter",

omicron-nexus/Cargo.toml

@@ -16,11 +16,13 @@ diesel = { git = "https://github.com/diesel-rs/diesel", rev = "a39dd2e", feature
 futures = "0.3.15"
 http = "0.2.0"
 hyper = "0.14"
+db-macros = { path = "src/db/db-macros" }
 ipnetwork = "0.18"
 lazy_static = "1.4.0"
 libc = "0.2.98"
 macaddr = { version = "1.0.1", features = [ "serde_std" ]}
 newtype_derive = "0.1.6"
+paste = "1.0"
 # See omicron-rpaths for more about the "pq-sys" dependency.
 pq-sys = "*"
 serde_json = "1.0"

omicron-nexus/src/db/datastore.rs

@@ -64,9 +64,10 @@ impl DataStore {
     ) -> CreateResult<db::model::Project> {
         use db::schema::project::dsl;
 
-        let name = project.name().to_string();
+        let name = project.name().as_str().to_string();
         diesel::insert_into(dsl::project)
             .values(project)
+            .returning(db::model::Project::as_returning())
             .get_result_async(self.pool())
             .await
             .map_err(|e| {
@@ -87,7 +88,8 @@ impl DataStore {
         dsl::project
             .filter(dsl::time_deleted.is_null())
             .filter(dsl::name.eq(name.clone()))
-            .first_async::<db::model::Project>(self.pool())
+            .select(db::model::Project::as_select())
+            .first_async(self.pool())
             .await
             .map_err(|e| {
                 Error::from_diesel(
@@ -111,7 +113,8 @@ impl DataStore {
             .filter(dsl::time_deleted.is_null())
             .filter(dsl::name.eq(name.clone()))
             .set(dsl::time_deleted.eq(now))
-            .get_result_async::<db::model::Project>(self.pool())
+            .returning(db::model::Project::as_returning())
+            .get_result_async(self.pool())
             .await
             .map_err(|e| {
                 Error::from_diesel(
@@ -151,7 +154,8 @@ impl DataStore {
         use db::schema::project::dsl;
         paginated(dsl::project, dsl::id, pagparams)
             .filter(dsl::time_deleted.is_null())
-            .load_async::<db::model::Project>(self.pool())
+            .select(db::model::Project::as_select())
+            .load_async(self.pool())
             .await
             .map_err(|e| {
                 Error::from_diesel(
@@ -169,7 +173,8 @@ impl DataStore {
         use db::schema::project::dsl;
         paginated(dsl::project, dsl::name, pagparams)
             .filter(dsl::time_deleted.is_null())
-            .load_async::<db::model::Project>(self.pool())
+            .select(db::model::Project::as_select())
+            .load_async(self.pool())
             .await
             .map_err(|e| {
                 Error::from_diesel(
@@ -193,6 +198,7 @@ impl DataStore {
             .filter(dsl::time_deleted.is_null())
             .filter(dsl::name.eq(name.clone()))
             .set(updates)
+            .returning(db::model::Project::as_returning())
             .get_result_async(self.pool())
             .await
             .map_err(|e| {
@@ -246,7 +252,7 @@ impl DataStore {
             params,
             runtime_initial.clone(),
         );
-        let name = instance.name.clone();
+        let name = instance.identity.name.clone();
         let instance: db::model::Instance = diesel::insert_into(dsl::instance)
             .values(instance)
             .on_conflict(dsl::id)
@@ -473,7 +479,7 @@ impl DataStore {
             params.clone(),
             runtime_initial.clone(),
         );
-        let name = disk.name.clone();
+        let name = disk.identity.name.clone();
         let disk: db::model::Disk = diesel::insert_into(dsl::disk)
             .values(disk)
             .on_conflict(dsl::id)
@@ -794,7 +800,8 @@ impl DataStore {
         paginated(dsl::vpc, dsl::name, pagparams)
             .filter(dsl::time_deleted.is_null())
             .filter(dsl::project_id.eq(*project_id))
-            .load_async::<db::model::Vpc>(self.pool())
+            .select(db::model::Vpc::as_select())
+            .load_async(self.pool())
             .await
             .map_err(|e| {
                 Error::from_diesel(
@@ -814,11 +821,12 @@ impl DataStore {
         use db::schema::vpc::dsl;
 
         let vpc = db::model::Vpc::new(*vpc_id, *project_id, params.clone());
-        let name = vpc.name.clone();
+        let name = vpc.name().clone();
         let vpc = diesel::insert_into(dsl::vpc)
             .values(vpc)
             .on_conflict(dsl::id)
             .do_nothing()
+            .returning(db::model::Vpc::as_returning())
             .get_result_async(self.pool())
             .await
             .map_err(|e| {
@@ -862,6 +870,7 @@ impl DataStore {
             .filter(dsl::time_deleted.is_null())
             .filter(dsl::project_id.eq(*project_id))
             .filter(dsl::name.eq(vpc_name.clone()))
+            .select(db::model::Vpc::as_select())
             .get_result_async(self.pool())
             .await
             .map_err(|e| {
@@ -881,7 +890,8 @@ impl DataStore {
             .filter(dsl::time_deleted.is_null())
             .filter(dsl::id.eq(*vpc_id))
             .set(dsl::time_deleted.eq(now))
-            .get_result_async::<db::model::Vpc>(self.pool())
+            .returning(db::model::Vpc::as_returning())
+            .get_result_async(self.pool())
             .await
             .map_err(|e| {
                 Error::from_diesel(
@@ -903,7 +913,8 @@ impl DataStore {
         paginated(dsl::vpcsubnet, dsl::name, pagparams)
             .filter(dsl::time_deleted.is_null())
             .filter(dsl::vpc_id.eq(*vpc_id))
-            .load_async::<db::model::VpcSubnet>(self.pool())
+            .select(db::model::VpcSubnet::as_select())
+            .load_async(self.pool())
             .await
             .map_err(|e| {
                 Error::from_diesel(
@@ -924,6 +935,7 @@ impl DataStore {
             .filter(dsl::time_deleted.is_null())
             .filter(dsl::vpc_id.eq(*vpc_id))
             .filter(dsl::name.eq(subnet_name.clone()))
+            .select(db::model::VpcSubnet::as_select())
             .get_result_async(self.pool())
             .await
             .map_err(|e| {
@@ -945,11 +957,12 @@ impl DataStore {
 
         let subnet =
             db::model::VpcSubnet::new(*subnet_id, *vpc_id, params.clone());
-        let name = subnet.name.clone();
+        let name = subnet.name().clone();
         let subnet = diesel::insert_into(dsl::vpcsubnet)
             .values(subnet)
             .on_conflict(dsl::id)
             .do_nothing()
+            .returning(db::model::VpcSubnet::as_returning())
             .get_result_async(self.pool())
             .await
             .map_err(|e| {
@@ -970,7 +983,8 @@ impl DataStore {
             .filter(dsl::time_deleted.is_null())
             .filter(dsl::id.eq(*subnet_id))
             .set(dsl::time_deleted.eq(now))
-            .get_result_async::<db::model::VpcSubnet>(self.pool())
+            .returning(db::model::VpcSubnet::as_returning())
+            .get_result_async(self.pool())
             .await
             .map_err(|e| {
                 Error::from_diesel(

omicron-nexus/src/db/db-macros/Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+name = "db-macros"
+version = "0.1.0"
+authors = ["Sean Klein <[email protected]>"]
+edition = "2018"
+
+[lib]
+proc-macro = true
+
+[dependencies.proc-macro2]
+version = "1.0"
+
+[dependencies.quote]
+version = "1.0"
+
+[dependencies.syn]
+version = "1.0"
+features = [ "full", "derive", "extra-traits" ]