File reorganize

Author: RafaelEstevamReis

Simple.Sqlite.Cipher/ConnectionFactory.cs

@@ -1,4 +1,5 @@
 using Microsoft.Data.Sqlite;
+using Simple.Sqlite.Helpers;
 using System;
 using System.IO;
 

Simple.Sqlite.Cipher/Simple.Sqlite.Cipher.csproj

@@ -30,7 +30,7 @@
 		<Compile Include="..\Simple.Sqlite\Extension\MigrationExtension.cs" Link="Extensions\MigrationExtension.cs" />
 		<Compile Include="..\Simple.Sqlite\Extension\QueryExtension.cs" Link="Extensions\QueryExtension.cs" />
 		<Compile Include="..\Simple.Sqlite\Extension\TableSchemaExtension.cs" Link="Extensions\TableSchemaExtension.cs" />
-		<Compile Include="..\Simple.Sqlite\HelperFunctions.cs" Link="HelperFunctions.cs" />
+		<Compile Include="..\Simple.Sqlite\Helpers\HelperFunctions.cs" Link="Helpers\HelperFunctions.cs" />
 		<Compile Include="..\Simple.Sqlite\Schema\ColumnSchema.cs" Link="ColumnSchema.cs" />
 		<Compile Include="..\Simple.Sqlite\Schema\TableMapper.cs" Link="TableMapper.cs" />
 		<Compile Include="..\Simple.Sqlite\Schema\TableSchema.cs" Link="TableSchema.cs" />
@@ -49,5 +49,6 @@
 	<ItemGroup>
 		<Folder Include="Extensions\" />
 		<Folder Include="Attributes\" />
+		<Folder Include="Helpers\" />
 	</ItemGroup>
 </Project>

Simple.Sqlite.xml

@@ -1,6 +1,7 @@
 namespace Simple.Sqlite;
 
 using Microsoft.Data.Sqlite;
+using Simple.Sqlite.Helpers;
 using System;
 using System.IO;
 

Simple.Sqlite/ConnectionFactory.cs

@@ -1,5 +1,6 @@
 namespace Simple.Sqlite;
 
+using Simple.Sqlite.Helpers;
 using System;
 
 /// <summary>
@@ -71,7 +72,7 @@ static T executeScalar<T>(this ISqliteConnection connection, ISqliteTransaction?
         // In SQLite DateTime is returned as STRING after aggregate operations
         if (typeof(T) == typeof(DateTime))
         {
-            if (DateTime.TryParse(obj.ToString(), out DateTime dt))
+            if (DateTime.TryParse(obj?.ToString(), out DateTime dt))
             {
                 return (T)(object)dt;
             }

Simple.Sqlite/Extension/ExecuteExtension.cs

@@ -1,6 +1,7 @@
 namespace Simple.Sqlite;
 
 using Microsoft.Data.Sqlite;
+using Simple.Sqlite.Helpers;
 using System.Collections.Generic;
 
 /// <summary>

Simple.Sqlite/Extension/InsertExtension.cs

@@ -1,6 +1,7 @@
 namespace Simple.Sqlite;
 
 using Simple.DatabaseWrapper.Helpers;
+using Simple.Sqlite.Helpers;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -84,13 +85,13 @@ static string queryBuilder<T>(ISqliteConnection connection, object parameters)
         return $"SELECT * FROM {tInfo.TypeName} WHERE {string.Join(" AND ", pairs)}";
     }
 
-    static IEnumerable<T> query<T>(ISqliteConnection connection, ISqliteTransaction? transaction, string query, object parameters, bool buffered)
+    static IEnumerable<T> query<T>(ISqliteConnection connection, ISqliteTransaction? transaction, string query, object? parameters, bool buffered)
     {
         var q = _query<T>(connection, transaction, query, parameters);
         if (buffered) q = q.ToList();
         return q;
     }
-    static IEnumerable<T> _query<T>(ISqliteConnection connection, ISqliteTransaction? transaction, string query, object parameters)
+    static IEnumerable<T> _query<T>(ISqliteConnection connection, ISqliteTransaction? transaction, string query, object? parameters)
     {
         using var cmd = new Microsoft.Data.Sqlite.SqliteCommand(query, connection.connection, transaction?.transaction);
         HelperFunctions.fillParameters(cmd, parameters, connection.typeCollection);

Simple.Sqlite/Extension/QueryExtension.cs

@@ -1,4 +1,4 @@
-namespace Simple.Sqlite;
+namespace Simple.Sqlite.Helpers;
 
 using Microsoft.Data.Sqlite;
 using Simple.DatabaseWrapper.Attributes;

Simple.Sqlite/HelperFunctions.cs Simple.Sqlite/Helpers/HelperFunctions.csSimple.Sqlite/HelperFunctions.cs renamed to Simple.Sqlite/Helpers/HelperFunctions.cs

@@ -0,0 +1,71 @@
+namespace Simple.Sqlite;
+
+using Simple.DatabaseWrapper.Attributes;
+using System;
+using System.Linq;
+
+/// <summary>
+/// A Simple KeyValue storage
+/// </summary>
+public class KeyValueStorage
+{
+    private readonly ConnectionFactory db;
+
+    /// <summary>
+    /// Creates a new KeyValueStorage using a ConnectionFactory
+    /// </summary>
+    public KeyValueStorage(ConnectionFactory db)
+    {
+        this.db = db;
+
+        using var cnn = db.GetConnection();
+        cnn.CreateTables()
+           .Add<KVStorageTable>()
+           .Commit();
+    }
+    /// <summary>
+    /// Sets a new KeyValue pair
+    /// </summary>
+    public void SetKey<T>(string key, T? value)
+    {
+        if (string.IsNullOrEmpty(key))
+        {
+            throw new ArgumentException($"'{nameof(key)}' cannot be null or empty.", nameof(key));
+        }
+
+        using var cnn = db.GetConnection();
+
+        if (value == null)
+        {
+            cnn.Execute($"DELETE FROM KVStorageTable WHERE {nameof(KVStorageTable.Key)} = @key", new { key });
+        }
+        else
+        {
+            cnn.Insert(new KVStorageTable { Key = normalizeKey(key), Value = value }, OnConflict.Replace);
+        }
+    }
+
+    /// <summary>
+    /// Gets the Value from a Key
+    /// Inexistent keys returns as null
+    /// </summary>
+    /// <returns>Key's value or NULL</returns>
+    public T? GetKey<T>(string key)
+    {
+        using var cnn = db.GetConnection();
+        var values = cnn.Query<T>("SELECT Value FROM KVStorageTable WHERE Key = @Key", new { Key = normalizeKey(key) })
+                        .ToArray();
+
+        if (values.Length == 0) return default;
+        return values[0];
+    }
+
+    private static string normalizeKey(string key) => key.Trim().ToUpper();
+
+    internal record KVStorageTable
+    {
+        [PrimaryKey]
+        public string Key { get; set; } = default!;
+        public object Value { get; set; } = default!;
+    }
+}

Simple.Sqlite/KeyValueStorage.cs

@@ -70,7 +70,7 @@ public void SetKey(string key, string? value)
 
     internal record KVStorageTable
     {
-        [Unique]
+        [PrimaryKey]
         public string Key { get; set; } = default!;
         public string Value { get; set; } = default!;
     }