Simplify Id requirements

.vscode/extensions.json

@@ -1,9 +0,0 @@
-{
-	"recommendations": [
-		"vadimcn.vscode-lldb",
-		"barbosshack.crates-io",
-		"usernamehw.errorlens",
-		"tamasfe.even-better-toml",
-		"rust-lang.rust-analyzer",
-	]
-}

.vscode/settings.json

@@ -1,33 +0,0 @@
-{
-	// VSCode
-	"editor.detectIndentation": false,
-	"editor.insertSpaces": false,
-	"editor.tabSize": 4,
-	"files.exclude": {
-		"**/target": true,
-		"**/Cargo.lock": true,
-	},
-	"files.insertFinalNewline": true,
-	"files.trimFinalNewlines": true,
-	"files.trimTrailingWhitespace": true,
-	"files.watcherExclude": {
-		"**/.git/**": true,
-		"**/target/**": true,
-	},
-	// Extensions
-	"crates.listPreReleases": true,
-	"evenBetterToml.formatter.alignComments": true,
-	"evenBetterToml.formatter.alignEntries": false,
-	"evenBetterToml.formatter.allowedBlankLines": 1,
-	"evenBetterToml.formatter.arrayAutoExpand": true,
-	"evenBetterToml.formatter.arrayTrailingComma": true,
-	"evenBetterToml.formatter.columnWidth": 80,
-	"evenBetterToml.formatter.reorderKeys": true,
-	"evenBetterToml.formatter.trailingNewline": true,
-	"rust-analyzer.imports.granularity.enforce": true,
-	"rust-analyzer.imports.granularity.group": "module",
-	"rust-analyzer.imports.group.enable": true,
-	"rust-analyzer.imports.merge.glob": false,
-	"rust-analyzer.imports.preferNoStd": true,
-	"rust-analyzer.showUnlinkedFileNotification": false,
-}

.zed/settings.json

@@ -0,0 +1,33 @@
+{
+	"project_name": null,
+
+	"auto_install_extensions": {
+		"tombi": true,
+		"cargo-appraiser": true,
+	},
+
+	"languages": {
+		"TOML": {
+			"format_on_save": "on",
+			"formatter": { "language_server": { "name": "tombi" } },
+		},
+	},
+
+	"lsp": {
+		"rust-analyzer": {
+			"initialization_options": {
+				"imports": {
+					"granularity": { "enforce": true, "group": "module" },
+					"group": { "enable": true },
+					"merge": { "glob": false },
+					"preferNoStd": true,
+				},
+				"server": {
+					"extraEnv": {
+						"RUSTUP_TOOLCHAIN": "stable",
+					},
+				},
+			},
+		},
+	},
+}

Cargo.toml

@@ -1,18 +1,19 @@
 [workspace]
-members = ["seamantic"]
 resolver = "2"
+members = ["seamantic"]
 
 [workspace.package]
-authors = []
 edition = "2024"
-license-file = "LICENSE.md"
 rust-version = "1.85.0"
+license-file = "LICENSE.md"
 
-[workspace.lints.rust]
+[workspace.dependencies]
-arithmetic_overflow = "forbid"
+sea-orm = { version = "2.0.0-rc.27", default-features = false }
-missing_docs = "forbid"
+sea-orm-migration = { version = "2.0.0-rc.27", default-features = false }
-unsafe_code = "forbid"
+seamantic = { path = "seamantic", version = "=0.0.12", default-features = false }
-unused_doc_comments = "forbid"
+serde = { version = "^1", default-features = false }
+serde_test = { version = "^1", default-features = false }
+tokio = { version = "^1", default-features = false }
 
 [workspace.lints.clippy]
 arithmetic_side_effects = "forbid"
@@ -24,20 +25,18 @@ indexing_slicing = "forbid"
 integer_division = "forbid"
 integer_division_remainder_used = "forbid"
 transmute_undefined_repr = "forbid"
-unchecked_duration_subtraction = "forbid"
+unchecked_time_subtraction = "forbid"
 unwrap_used = "forbid"
 
+[workspace.lints.rust]
+arithmetic_overflow = "forbid"
+missing_docs = "forbid"
+unsafe_code = "forbid"
+unused_doc_comments = "forbid"
+
 [profile.release]
-codegen-units = 1
-lto = "fat"
 opt-level = 3
-overflow-checks = true
 strip = "debuginfo"
-
+overflow-checks = true
-[workspace.dependencies]
+lto = "fat"
-sea-orm = { version = "2.0.0-rc.17", default-features = false }
+codegen-units = 1
-sea-orm-migration = { version = "2.0.0-rc.17", default-features = false }
-
-serde = { version = "^1", default-features = false }
-serde_test = { version = "^1", default-features = false }
-tokio = { version = "^1", default-features = false }

seamantic/Cargo.toml

@@ -1,41 +1,37 @@
 [package]
 name = "seamantic"
-version = "0.0.10"
+version = "0.0.12"
-
+edition.workspace = true
-categories = []
+rust-version.workspace = true
 description = "A library to enhance SeaORM"
 repository = "https://github.com/QuantumShade/seamantic"
-
-authors.workspace = true
-edition.workspace = true
 license-file.workspace = true
-rust-version.workspace = true
+categories = []
 
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
-[lints]
-workspace = true
-
 [[example]]
 name = "migrations"
 path = "examples/migrations/main.rs"
 required-features = ["sqlite"]
 
-[features]
-default = []
-serde = ["dep:serde"]
-sqlite = ["sea-orm-migration/sqlx-sqlite"]
-
 [dependencies]
 sea-orm = { workspace = true }
 sea-orm-migration = { workspace = true }
-
 serde = { workspace = true, features = ["derive", "std"], optional = true }
 
 [dev-dependencies]
 sea-orm = { workspace = true, features = ["entity-registry", "schema-sync"] }
 sea-orm-migration = { workspace = true, features = ["runtime-tokio-rustls"] }
 serde_test = { workspace = true }
-tokio = { workspace = true, features = ["rt", "macros"] }
+tokio = { workspace = true, features = ["macros", "rt"] }
+
+[features]
+default = []
+serde = ["dep:serde"]
+sqlite = ["sea-orm-migration/sqlx-sqlite"]
+
+[lints]
+workspace = true

seamantic/src/model/id.rs

@@ -12,6 +12,8 @@ use sea_orm::{ColIdx, ColumnType, DbErr, QueryResult, TryFromU64, TryGetError, T
 pub type SeaOrmRepr = i64;
 
 /// An opaque type representing a row ID
+///
+/// IDs should be tagged with `#[sea_orm(primary_key, auto_increment = false)]`
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "serde", serde(transparent))]
 #[repr(transparent)]

seamantic/src/schema/sqlite.rs

@@ -21,7 +21,7 @@ use sea_orm_migration::sea_query::{ColumnDef, IntoIden};
 ///     #[derive(Debug, Clone, DeriveEntityModel)]
 ///     #[sea_orm(table_name = "rowid_test")]
 ///     pub struct Model {
-///         #[sea_orm(column_type = "Integer", primary_key, nullable, auto_increment = false)]
+///         #[sea_orm(primary_key, auto_increment = false)]
 ///         id: Id<Model>,
 ///     }
 ///     impl ActiveModelBehavior for ActiveModel {}
@@ -77,7 +77,7 @@ mod entity_tests {
 		#[derive(Debug, Clone, DeriveEntityModel)]
 		#[sea_orm(table_name = "rowid_test")]
 		pub struct Model {
-			#[sea_orm(column_type = "Integer", primary_key, nullable, auto_increment = false)]
+			#[sea_orm(primary_key, auto_increment = false)]
 			id: Id<Model>,
 		}
 		impl ActiveModelBehavior for ActiveModel {}

tombi.toml

@@ -0,0 +1,5 @@
+toml-version = "v1.0.0"
+
+[format.rules]
+indent-style = "tab"
+indent-width = 4