Remove unused attribute and refactoring

Joy-less · Joy-less · commit 3df9abfc7b34 · 2024-12-02T23:32:17.000Z
diff --git a/SQLiteSharp/Attributes.cs b/SQLiteSharp/Attributes.cs
@@ -5,7 +5,7 @@ public class TableAttribute(string name) : Attribute {
     public string Name { get; set; } = name;
 
     /// <summary>
-    /// Flag whether to create the table without <c>rowid</c> (see <see href="https://sqlite.org/withoutrowid.html"/>).<br/>
+    /// Whether to create the table without <c>rowid</c> (see <see href="https://sqlite.org/withoutrowid.html"/>).<br/>
     /// The default is <see langword="false"/> so that SQLite adds an implicit <c>rowid</c> to every table created.
     /// </summary>
     public bool WithoutRowId { get; set; }
@@ -38,10 +38,6 @@ public IndexedAttribute(string name, int order) {
     }
 }
 
-[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
-public class IgnoreAttribute : Attribute {
-}
-
 [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
 public class UniqueAttribute : IndexedAttribute {
     public override bool Unique {
@@ -51,8 +47,7 @@ public override bool Unique {
 }
 
 [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
-public class MaxLengthAttribute(int length) : Attribute {
-    public int Value { get; } = length;
+public class IgnoreAttribute : Attribute {
 }
 
 /// <summary>
diff --git a/SQLiteSharp/CollationType.cs b/SQLiteSharp/CollationType.cs
diff --git a/SQLiteSharp/ColumnMap.cs b/SQLiteSharp/ColumnMap.cs
@@ -47,13 +47,19 @@ public void SetValue(object obj, object? value) {
                 throw new InvalidProgramException();
         }
     }
+    public void SetSqliteValue(object obj, SqliteValue sqliteValue) {
+        TypeSerializer typeSerializer = Orm.GetTypeSerializer(ClrType);
+        object? value = typeSerializer.Deserialize(sqliteValue, ClrType);
+        SetValue(obj, value);
+    }
     public object? GetValue(object obj) {
         return ClrMember switch {
             PropertyInfo propertyInfo => propertyInfo.GetValue(obj),
             FieldInfo fieldInfo => fieldInfo.GetValue(obj),
             _ => throw new InvalidProgramException(),
         };
     }
+
     private static Type GetMemberType(MemberInfo memberInfo) {
         return memberInfo switch {
             PropertyInfo propertyInfo => propertyInfo.PropertyType,
diff --git a/SQLiteSharp/Orm.cs b/SQLiteSharp/Orm.cs
@@ -44,40 +44,6 @@ public TypeSerializer GetTypeSerializer(Type type) {
         // Serializer not found
         throw new InvalidOperationException($"No {nameof(TypeSerializer)} found for '{type}'");
     }
-    public object? ReadColumn(Sqlite3Statement statement, int index, Type type) {
-        TypeSerializer typeSerializer = GetTypeSerializer(type);
-        SqliteValue value = SQLiteRaw.GetColumnValue(statement, index);
-        return typeSerializer.Deserialize(value, type);
-    }
-    public void BindParameter(Sqlite3Statement statement, int index, object? value) {
-        if (value is null) {
-            SQLiteRaw.BindNull(statement, index);
-            return;
-        }
-
-        TypeSerializer typeSerializer = GetTypeSerializer(value.GetType());
-        SqliteValue rawValue = typeSerializer.Serialize(value);
-
-        switch (rawValue.SqliteType) {
-            case SqliteType.Null:
-                SQLiteRaw.BindNull(statement, index);
-                break;
-            case SqliteType.Integer:
-                SQLiteRaw.BindInt64(statement, index, rawValue.AsInteger);
-                break;
-            case SqliteType.Float:
-                SQLiteRaw.BindDouble(statement, index, rawValue.AsFloat);
-                break;
-            case SqliteType.Text:
-                SQLiteRaw.BindText(statement, index, rawValue.AsText);
-                break;
-            case SqliteType.Blob:
-                SQLiteRaw.BindBlob(statement, index, rawValue.AsBlob);
-                break;
-            default:
-                throw new NotImplementedException($"Cannot bind column type '{rawValue.SqliteType}'");
-        }
-    }
     public string GetSqlDeclaration(ColumnMap column) {
         TypeSerializer typeSerializer = GetTypeSerializer(column.ClrType);
 
@@ -110,9 +76,6 @@ public static string GetCollation(MemberInfo memberInfo) {
     public static IEnumerable<IndexedAttribute> GetIndexes(MemberInfo memberInfo) {
         return memberInfo.GetCustomAttributes<IndexedAttribute>();
     }
-    public static int? GetMaxStringLength(MemberInfo memberInfo) {
-        return memberInfo.GetCustomAttribute<MaxLengthAttribute>()?.Value;
-    }
     public static Type AsUnderlyingType(Type Type) {
         return Nullable.GetUnderlyingType(Type) ?? Type;
     }
diff --git a/SQLiteSharp/SQLiteCommand.cs b/SQLiteSharp/SQLiteCommand.cs
@@ -43,7 +43,7 @@ public IEnumerable<object> ExecuteQuery(TableMap map) {
                         continue;
                     }
                     // Read value from found column
-                    object? value = Connection.Orm.ReadColumn(statement, i, column.ClrType);
+                    object? value = ReadColumn(statement, i, column.ClrType);
                     column.SetValue(obj, value);
                 }
                 OnInstanceCreated?.Invoke(obj);
@@ -68,7 +68,7 @@ public T ExecuteScalar<T>() {
         try {
             Result result = SQLiteRaw.Step(statement);
             if (result is Result.Row) {
-                object? columnValue = Connection.Orm.ReadColumn(statement, 0, typeof(T));
+                object? columnValue = ReadColumn(statement, 0, typeof(T));
                 if (columnValue is not null) {
                     Value = (T)columnValue;
                 }
@@ -92,7 +92,7 @@ public IEnumerable<T> ExecuteQueryScalars<T>() {
                 throw new InvalidOperationException("QueryScalars should return at least one column");
             }
             while (SQLiteRaw.Step(statement) is Result.Row) {
-                object? value = Connection.Orm.ReadColumn(statement, 0, typeof(T));
+                object? value = ReadColumn(statement, 0, typeof(T));
                 if (value is null) {
                     yield return default!;
                 }
@@ -121,9 +121,43 @@ private void BindParameters(Sqlite3Statement statement) {
             int index = name is not null
                 ? SQLiteRaw.BindParameterIndex(statement, name)
                 : nextIndex++;
-            Connection.Orm.BindParameter(statement, index, value);
+            BindParameter(statement, index, value);
         }
     }
+    private void BindParameter(Sqlite3Statement statement, int index, object? value) {
+        if (value is null) {
+            SQLiteRaw.BindNull(statement, index);
+            return;
+        }
+
+        TypeSerializer typeSerializer = Connection.Orm.GetTypeSerializer(value.GetType());
+        SqliteValue rawValue = typeSerializer.Serialize(value);
+
+        switch (rawValue.SqliteType) {
+            case SqliteType.Null:
+                SQLiteRaw.BindNull(statement, index);
+                break;
+            case SqliteType.Integer:
+                SQLiteRaw.BindInt64(statement, index, rawValue.AsInteger);
+                break;
+            case SqliteType.Float:
+                SQLiteRaw.BindDouble(statement, index, rawValue.AsFloat);
+                break;
+            case SqliteType.Text:
+                SQLiteRaw.BindText(statement, index, rawValue.AsText);
+                break;
+            case SqliteType.Blob:
+                SQLiteRaw.BindBlob(statement, index, rawValue.AsBlob);
+                break;
+            default:
+                throw new NotImplementedException($"Cannot bind column type '{rawValue.SqliteType}'");
+        }
+    }
+    private object? ReadColumn(Sqlite3Statement statement, int index, Type type) {
+        TypeSerializer typeSerializer = Connection.Orm.GetTypeSerializer(type);
+        SqliteValue value = SQLiteRaw.GetColumnValue(statement, index);
+        return typeSerializer.Deserialize(value, type);
+    }
 
     private record struct Parameter(string? Name, object? Value) {
         public string? Name { get; set; } = Name;
diff --git a/SQLiteSharp/SQLiteConnection.cs b/SQLiteSharp/SQLiteConnection.cs
@@ -584,8 +584,8 @@ public int Insert(object obj, string? modifier = null) {
         int rowCount = Execute(query, values);
 
         if (map.HasAutoIncrementedPrimaryKey) {
-            long id = SQLiteRaw.GetLastInsertRowid(Handle);
-            map.SetAutoIncrementedPrimaryKey(obj, id);
+            long rowId = SQLiteRaw.GetLastInsertRowId(Handle);
+            map.SetPrimaryKeyValue(obj, rowId);
         }
 
         return rowCount;
diff --git a/SQLiteSharp/SQLiteRaw.cs b/SQLiteSharp/SQLiteRaw.cs
@@ -31,7 +31,7 @@ public static Result Reset(Sqlite3Statement statement) {
     public static Result Finalize(Sqlite3Statement statement) {
         return (Result)Sqlite3.sqlite3_finalize(statement);
     }
-    public static long GetLastInsertRowid(Sqlite3DatabaseHandle db) {
+    public static long GetLastInsertRowId(Sqlite3DatabaseHandle db) {
         return Sqlite3.sqlite3_last_insert_rowid(db);
     }
     public static int BindParameterIndex(Sqlite3Statement statement, string name) {
diff --git a/SQLiteSharp/TableMap.cs b/SQLiteSharp/TableMap.cs
@@ -17,8 +17,8 @@ public TableMap(Type type, Orm? orm = null) {
 
         TableAttribute? tableAttribute = type.GetCustomAttribute<TableAttribute>();
 
-        TableName = !string.IsNullOrEmpty(tableAttribute?.Name) ? tableAttribute!.Name : Type.Name;
-        WithoutRowId = tableAttribute is not null && tableAttribute.WithoutRowId;
+        TableName = tableAttribute?.Name ?? Type.Name;
+        WithoutRowId = tableAttribute?.WithoutRowId ?? false;
 
         MemberInfo[] members = [.. type.GetProperties(), .. type.GetFields()];
         List<ColumnMap> columns = new(members.Length);
@@ -48,8 +48,8 @@ public string GetByPrimaryKeySql {
         }
     }
 
-    public void SetAutoIncrementedPrimaryKey(object obj, long id) {
-        PrimaryKey!.SetValue(obj, Convert.ChangeType(id, PrimaryKey.ClrType));
+    public void SetPrimaryKeyValue(object obj, SqliteValue rawValue) {
+        PrimaryKey?.SetSqliteValue(obj, rawValue);
     }
 
     public ColumnMap? FindColumnByMemberName(string memberName) {

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ public class TableAttribute(string name) : Attribute {`
`5`	`5`	`public string Name { get; set; } = name;`
`6`	`6`
`7`	`7`	`/// <summary>`
`8`		`- /// Flag whether to create the table without <c>rowid</c> (see <see href="https://sqlite.org/withoutrowid.html"/>).<br/>`
	`8`	`+ /// Whether to create the table without <c>rowid</c> (see <see href="https://sqlite.org/withoutrowid.html"/>).<br/>`
`9`	`9`	`/// The default is <see langword="false"/> so that SQLite adds an implicit <c>rowid</c> to every table created.`
`10`	`10`	`/// </summary>`
`11`	`11`	`public bool WithoutRowId { get; set; }`
`@@ -38,10 +38,6 @@ public IndexedAttribute(string name, int order) {`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
`41`		`-[AttributeUsage(AttributeTargets.Property \| AttributeTargets.Field)]`
`42`		`-public class IgnoreAttribute : Attribute {`
`43`		`-}`
`44`		`-`
`45`	`41`	`[AttributeUsage(AttributeTargets.Property \| AttributeTargets.Field)]`
`46`	`42`	`public class UniqueAttribute : IndexedAttribute {`
`47`	`43`	`public override bool Unique {`
`@@ -51,8 +47,7 @@ public override bool Unique {`
`51`	`47`	`}`
`52`	`48`
`53`	`49`	`[AttributeUsage(AttributeTargets.Property \| AttributeTargets.Field)]`
`54`		`-public class MaxLengthAttribute(int length) : Attribute {`
`55`		`- public int Value { get; } = length;`
	`50`	`+public class IgnoreAttribute : Attribute {`
`56`	`51`	`}`
`57`	`52`
`58`	`53`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -584,8 +584,8 @@ public int Insert(object obj, string? modifier = null) {`
`584`	`584`	`int rowCount = Execute(query, values);`
`585`	`585`
`586`	`586`	`if (map.HasAutoIncrementedPrimaryKey) {`
`587`		`- long id = SQLiteRaw.GetLastInsertRowid(Handle);`
`588`		`- map.SetAutoIncrementedPrimaryKey(obj, id);`
	`587`	`+ long rowId = SQLiteRaw.GetLastInsertRowId(Handle);`
	`588`	`+ map.SetPrimaryKeyValue(obj, rowId);`
`589`	`589`	`}`
`590`	`590`
`591`	`591`	`return rowCount;`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public static Result Reset(Sqlite3Statement statement) {`
`31`	`31`	`public static Result Finalize(Sqlite3Statement statement) {`
`32`	`32`	`return (Result)Sqlite3.sqlite3_finalize(statement);`
`33`	`33`	`}`
`34`		`- public static long GetLastInsertRowid(Sqlite3DatabaseHandle db) {`
	`34`	`+ public static long GetLastInsertRowId(Sqlite3DatabaseHandle db) {`
`35`	`35`	`return Sqlite3.sqlite3_last_insert_rowid(db);`
`36`	`36`	`}`
`37`	`37`	`public static int BindParameterIndex(Sqlite3Statement statement, string name) {`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ public TableMap(Type type, Orm? orm = null) {`
`17`	`17`
`18`	`18`	`TableAttribute? tableAttribute = type.GetCustomAttribute<TableAttribute>();`
`19`	`19`
`20`		`- TableName = !string.IsNullOrEmpty(tableAttribute?.Name) ? tableAttribute!.Name : Type.Name;`
`21`		`- WithoutRowId = tableAttribute is not null && tableAttribute.WithoutRowId;`
	`20`	`+ TableName = tableAttribute?.Name ?? Type.Name;`
	`21`	`+ WithoutRowId = tableAttribute?.WithoutRowId ?? false;`
`22`	`22`
`23`	`23`	`MemberInfo[] members = [.. type.GetProperties(), .. type.GetFields()];`
`24`	`24`	`List<ColumnMap> columns = new(members.Length);`
`@@ -48,8 +48,8 @@ public string GetByPrimaryKeySql {`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`- public void SetAutoIncrementedPrimaryKey(object obj, long id) {`
`52`		`- PrimaryKey!.SetValue(obj, Convert.ChangeType(id, PrimaryKey.ClrType));`
	`51`	`+ public void SetPrimaryKeyValue(object obj, SqliteValue rawValue) {`
	`52`	`+ PrimaryKey?.SetSqliteValue(obj, rawValue);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`public ColumnMap? FindColumnByMemberName(string memberName) {`