WIP: features si-id

Signed-off-by: Nick Gerace <[email protected]>
systeminit · Dec 19, 2024 · f82fd2f · f82fd2f
1 parent a6021ae
commit f82fd2f
Show file tree

Hide file tree

Showing 10 changed files with 976 additions and 1,082 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lib/dal/Cargo.toml b/lib/dal/Cargo.toml
@@ -25,7 +25,7 @@ si-data-pg = { path = "../../lib/si-data-pg" }
 si-events = { path = "../../lib/si-events-rs" }
 si-frontend-types = { path = "../../lib/si-frontend-types-rs" }
 si-hash = { path = "../../lib/si-hash" }
-si-id = { path = "../../lib/si-id" }
+si-id = { path = "../../lib/si-id", features = ["postgres-types"] }
 si-layer-cache = { path = "../../lib/si-layer-cache" }
 si-pkg = { path = "../../lib/si-pkg" }
 si-runtime = { path = "../../lib/si-runtime-rs" }

diff --git a/lib/module-index-server/Cargo.toml b/lib/module-index-server/Cargo.toml
@@ -14,7 +14,7 @@ buck2-resources = { path = "../../lib/buck2-resources" }
 module-index-types = { path = "../../lib/module-index-types" }
 si-data-pg = { path = "../../lib/si-data-pg" }
 si-hash = { path = "../../lib/si-hash" }
-si-id = { path = "../../lib/si-id" }
+si-id = { path = "../../lib/si-id", features = ["sea-orm-types"] }
 si-jwt-public-key = { path = "../../lib/si-jwt-public-key" }
 si-pkg = { path = "../../lib/si-pkg" }
 si-posthog = { path = "../../lib/si-posthog-rs" }

diff --git a/lib/si-id/Cargo.toml b/lib/si-id/Cargo.toml
@@ -8,9 +8,13 @@ edition.workspace = true
 rust-version.workspace = true
 publish.workspace = true
 
+[features]
+postgres-types = ["dep:postgres-types"]
+sea-orm-types = ["dep:sea-orm"]
+
 [dependencies]
 derive_more = { workspace = true }
-postgres-types = { workspace = true }
-sea-orm = { workspace = true }
+postgres-types = { workspace = true, optional = true }
+sea-orm = { workspace = true, optional = true }
 serde = { workspace = true }
 ulid = { workspace = true }
diff --git a/lib/si-id/src/lib.rs b/lib/si-id/src/lib.rs
@@ -63,24 +63,24 @@ id!(ViewId);
 id!(WorkspaceSnapshotNodeId);
 
 // Please keep these alphabetically sorted!
-id_with_pg_types!(ActionId);
-id_with_pg_types!(CachedModuleId);
-id_with_pg_types!(ChangeSetId);
-id_with_pg_types!(ComponentId);
-id_with_pg_types!(FuncId);
-id_with_pg_types!(FuncRunId);
-id_with_pg_types!(UserPk);
-id_with_pg_types!(WorkspaceIntegrationId);
+id_with_postgres_types!(ActionId);
+id_with_postgres_types!(CachedModuleId);
+id_with_postgres_types!(ChangeSetId);
+id_with_postgres_types!(ComponentId);
+id_with_postgres_types!(FuncId);
+id_with_postgres_types!(FuncRunId);
+id_with_postgres_types!(UserPk);
+id_with_postgres_types!(WorkspaceIntegrationId);
 
 // Please keep these alphabetically sorted!
-id_with_pg_and_sea_orm_types!(ModuleIndexModuleId);
-id_with_pg_and_sea_orm_types!(SchemaId);
+id_with_postgres_and_sea_orm_types!(ModuleIndexModuleId);
+id_with_postgres_and_sea_orm_types!(SchemaId);
 
 // Please keep these alphabetically sorted!
 id_with_none_and_sea_orm_types!(SchemaVariantId);
 
 // Please keep these alphabetically sorted!
-id_with_none_and_pg_types!(AttributeValueId);
-id_with_none_and_pg_types!(KeyPairPk);
-id_with_none_and_pg_types!(WorkspacePk);
-id_with_none_and_pg_types!(WorkspaceId);
+id_with_none_and_postgres_types!(AttributeValueId);
+id_with_none_and_postgres_types!(KeyPairPk);
+id_with_none_and_postgres_types!(WorkspacePk);
+id_with_none_and_postgres_types!(WorkspaceId);