Rebase with github repository

Connected.Data/Schema/ExistingColumn.cs

@@ -1,5 +1,6 @@
 using System.Collections.Immutable;
 using System.Data;
+using System.Reflection;
 using Connected.Data.Schema.Sql;
 using Connected.Entities.Annotations;
 
@@ -44,6 +45,7 @@ internal class ExistingColumn : ISchemaColumn, IExistingSchemaColumn
 	public DateKind DateKind { get; set; } = DateKind.DateTime;
 	public BinaryKind BinaryKind { get; set; } = BinaryKind.VarBinary;
 
+	public PropertyInfo Property { get; set; }
 	public int DatePrecision { get; set; }
 
 	public ImmutableArray<string> QueryIndexColumns(string column)

Connected.Data/Schema/ISchemaColumn.cs

@@ -1,4 +1,5 @@
 using System.Data;
+using System.Reflection;
 using Connected.Entities.Annotations;
 
 namespace Connected.Data.Schema;
@@ -21,4 +22,6 @@ public interface ISchemaColumn
 	DateKind DateKind { get; }
 	BinaryKind BinaryKind { get; }
 	int DatePrecision { get; }
+
+	PropertyInfo Property { get; }
 }

Connected.Data/Schema/SchemaColumn.cs

@@ -1,13 +1,15 @@
 using System.Data;
+using System.Reflection;
 using Connected.Entities.Annotations;
 
 namespace Connected.Data.Schema;
 
 internal class SchemaColumn : IEquatable<ISchemaColumn>, ISchemaColumn
 {
-	public SchemaColumn(ISchema schema)
+	public SchemaColumn(ISchema schema, PropertyInfo property)
 	{
 		Schema = schema;
+		Property = property;
 	}
 	private ISchema Schema { get; }
 
@@ -30,6 +32,8 @@ internal class SchemaColumn : IEquatable<ISchemaColumn>, ISchemaColumn
 
 	public int Ordinal { get; set; }
 
+	public PropertyInfo Property { get; set; }
+
 	public bool Equals(ISchemaColumn? other)
 	{
 		if (other is null)

Connected.Data/Schema/SchemaService.cs

@@ -60,6 +60,7 @@ internal class SchemaService : ISchemaService
 				await middleware.Synchronize(entity, schema);
 
 				synchronized = true;
+				break;
 			}
 			/*
 			 * We should notify the environment that entity is no synchronized.
@@ -80,7 +81,7 @@ internal class SchemaService : ISchemaService
 	{
 		var persistence = entityType.GetCustomAttribute<PersistenceAttribute>();
 
-		return persistence is null || !persistence.Persistence.HasFlag(ColumnPersistence.Write);
+		return persistence is null || persistence.Persistence.HasFlag(ColumnPersistence.Write);
 	}
 
 	private static ISchema CreateSchema(Type type)
@@ -104,7 +105,7 @@ internal class SchemaService : ISchemaService
 			if (property.FindAttribute<PersistenceAttribute>() is PersistenceAttribute pa && pa.IsVirtual)
 				continue;
 
-			var column = new SchemaColumn(result)
+			var column = new SchemaColumn(result, property)
 			{
 				Name = ResolveColumnName(property),
 				DataType = DataExtensions.ToDbType(property)

Connected.Data/Schema/Sql/AdHocSchemaEntity.cs

@@ -4,8 +4,7 @@ using Connected.Entities.Annotations;
 namespace Connected.Data.Schema.Sql;
 
 [Persistence(Persistence = ColumnPersistence.InMemory)]
-internal sealed class AdHocSchemaEntity : IEntity
+internal sealed record AdHocSchemaEntity : Entity
 {
-	public State State { get; init; }
 	public bool Result { get; init; }
 }

Connected.Data/Schema/Sql/SchemaExecutionContext.cs

@@ -1,6 +1,6 @@
-using Connected.Data.Sql;
+using System.Data;
+using Connected.Data.Sql;
 using Connected.Entities.Storage;
-using System.Data;
 
 namespace Connected.Data.Schema.Sql;
 
@@ -50,7 +50,7 @@ internal class SchemaExecutionContext
 
 	public async Task Execute(string commandText)
 	{
-		await Storage.Open<AdHocSchemaEntity>().Select(new SchemaStorageArgs(new StorageOperation { CommandText = commandText }, typeof(SqlDataConnection), ConnectionString));
+		await Storage.Open<AdHocSchemaEntity>().Execute(new SchemaStorageArgs(new StorageOperation { CommandText = commandText }, typeof(SqlDataConnection), ConnectionString));
 	}
 
 	public async Task<AdHocSchemaEntity?> Select(string commandText)
@@ -74,7 +74,7 @@ internal class SchemaExecutionContext
 			Constraints.Add(type, existing);
 		}
 
-		if (ConstraintNameExists(name))
+		if (!ConstraintNameExists(name))
 			existing.Add(name);
 	}
 

Connected.Data/Schema/Sql/SpHelp.cs

@@ -1,7 +1,6 @@
-using Connected.Data.Storage;
+using System.Data;
 using Connected.Entities.Storage;
 using Connected.Interop;
-using System.Data;
 
 namespace Connected.Data.Schema.Sql;
 
@@ -53,9 +52,8 @@ internal class SpHelp : SynchronizationQuery<ObjectDescriptor>
 		if (rdr.Read())
 		{
 			Result.MetaData.Name = rdr.GetValue("Name", string.Empty);
-            Result.MetaData.Created = rdr.GetValue("Created_datetime", DateTime.MinValue);
 			Result.MetaData.Owner = rdr.GetValue("Owner", string.Empty);
-            Result.MetaData.Type = rdr.GetValue("Type", string.Empty);
+			Result.MetaData.Type = rdr.GetValue("Object_type", string.Empty);
 		}
 	}
 

Connected.Data/Storage/ConnectionProvider.cs

@@ -1,10 +1,10 @@
-using Connected.Data.Schema;
+using System.Collections.Immutable;
+using Connected.Data.Schema;
 using Connected.Data.Sharding;
 using Connected.Entities.Storage;
 using Connected.Middleware;
 using Connected.ServiceModel;
 using Connected.ServiceModel.Transactions;
-using System.Collections.Immutable;
 
 namespace Connected.Data.Storage;
 
@@ -26,7 +26,7 @@ internal sealed class ConnectionProvider : IConnectionProvider, IAsyncDisposable
 	public IMiddlewareService Middleware { get; }
 	private ITransactionContext TransactionService { get; }
 	private List<IStorageConnection> Connections => _connections;
-	public StorageConnectionMode Mode { get; set; } = StorageConnectionMode.Isolated;
+	public StorageConnectionMode Mode { get; set; } = StorageConnectionMode.Shared;
 	public async Task<ImmutableList<IStorageConnection>> Open<TEntity>(StorageContextArgs args)
 	{
 		/*

Connected.Data/Update/CommandBuilder.cs

@@ -1,10 +1,10 @@
-using Connected.Entities;
+using System.Data;
+using System.Reflection;
+using System.Text;
+using Connected.Entities;
 using Connected.Entities.Annotations;
 using Connected.Entities.Storage;
 using Connected.Interop;
-using System.Data;
-using System.Reflection;
-using System.Text;
 
 namespace Connected.Data.Update;
 
@@ -115,7 +115,20 @@ internal abstract class CommandBuilder
 
 	protected virtual List<PropertyInfo> GetProperties()
 	{
-        return Interop.Properties.GetImplementedProperties(Entity);
+		var props = Interop.Properties.GetImplementedProperties(Entity);
+		var result = new List<PropertyInfo>();
+
+		foreach (var property in props)
+		{
+			var persistence = property.FindAttribute<PersistenceAttribute>();
+
+			if (persistence is not null && persistence.Persistence.HasFlag(ColumnPersistence.InMemory))
+				continue;
+
+			result.Add(property);
+		}
+
+		return result;
 	}
 
 	protected static bool IsVersion(PropertyInfo property)

Connected.Expressions/Formatters/SqlFormatter.cs

@@ -1,11 +1,11 @@
-using Connected.Expressions.Languages;
+using System.Collections.ObjectModel;
-using Connected.Expressions.Translation;
-using Connected.Expressions.Visitors;
-using System.Collections.ObjectModel;
 using System.Globalization;
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Text;
+using Connected.Expressions.Languages;
+using Connected.Expressions.Translation;
+using Connected.Expressions.Visitors;
 
 namespace Connected.Expressions.Formatters;
 
@@ -34,6 +34,7 @@ public class SqlFormatter : DatabaseVisitor
 	protected virtual QueryLanguage? Language { get; }
 	protected bool HideColumnAliases { get; set; }
 	protected bool HideTableAliases { get; set; }
+	protected bool UseBracketsInWhere { get; set; } = true;
 	protected bool IsNested { get; set; }
 	public int IndentationWidth { get; set; } = 2;
 	private StringBuilder Text { get; }
@@ -316,6 +317,7 @@ public class SqlFormatter : DatabaseVisitor
 		var left = b.Left;
 		var right = b.Right;
 
+		if (UseBracketsInWhere)
 			Write(OpenBracket);
 
 		switch (b.NodeType)
@@ -445,6 +447,7 @@ public class SqlFormatter : DatabaseVisitor
 				throw new NotSupportedException($"The binary operator '{b.NodeType}' is not supported");
 		}
 
+		if (UseBracketsInWhere)
 			Write(CloseBracket);
 
 		return b;
@@ -630,11 +633,7 @@ public class SqlFormatter : DatabaseVisitor
 		}
 
 		if (select.Where is not null)
-        {
+			WriteWhere(select.Where);
-            WriteLine(Indentation.Same);
-            Write("WHERE ");
-            VisitPredicate(select.Where);
-        }
 
 		if (select.GroupBy is not null && select.GroupBy.Any())
 		{
@@ -672,6 +671,13 @@ public class SqlFormatter : DatabaseVisitor
 		return select;
 	}
 
+	protected virtual void WriteWhere(Expression expression)
+	{
+		WriteLine(Indentation.Same);
+		Write("WHERE ");
+		VisitPredicate(expression);
+	}
+
 	protected virtual void WriteTopClause(Expression expression)
 	{
 		Write("TOP (");

Connected.Expressions/Translation/Rewriters/WhereClauseRewriter.cs

@@ -1,11 +1,11 @@
-using Connected.Expressions.Visitors;
+using System.Linq.Expressions;
-using System.Linq.Expressions;
+using Connected.Expressions.Visitors;
 
 namespace Connected.Expressions.Translation.Rewriters;
 
 public class WhereClauseRewriter : DatabaseVisitor
 {
-    private WhereClauseRewriter(ExpressionCompilationContext context)
+	protected WhereClauseRewriter(ExpressionCompilationContext context)
 	{
 		Context = context;
 	}

Connected.Instance/EntitySynchronizer.cs

@@ -46,7 +46,7 @@ internal static class EntitySynchronizer
 		else
 		{
 			/*
-			 * entitySynchronization = token1, token2,...
+			 * entitySynchronization = token1; token2,...
 			 */
 			var tokens = value.Split(',');
 			/*
@@ -66,13 +66,20 @@ internal static class EntitySynchronizer
 
 					await Synchronize(schemaService, Assembly.Load(AssemblyName.GetAssemblyName(subTokens[1])), logger);
 				}
-				else if (string.Equals(subTokens[1], "type", StringComparison.OrdinalIgnoreCase))
+				else if (string.Equals(subTokens[0], "type", StringComparison.OrdinalIgnoreCase))
 				{
-					logger.LogTrace("Loading type '{type}'", subTokens[1]);
+					var typeTokens = subTokens[1].Split("/");
 
-					if (Type.GetType(subTokens[1]) is not Type type)
+					if (typeTokens.Length != 2)
+						throw new ArgumentException("Invalid entitySyncronization token '{token}'. Expected type:[assembly]/[type].", subTokens[1]);
+
+					var qualifier = $"{typeTokens[1]}, {typeTokens[0]}";
+
+					logger.LogTrace("Loading type '{type}'", qualifier);
+
+					if (Type.GetType(qualifier) is not Type type)
 					{
-						logger.LogWarning("Entity type '{type}' could not be loaded. Synchronization on the specified type could not be performed.", subTokens[1]);
+						logger.LogWarning("Entity type '{type}' could not be loaded. Synchronization on the specified type could not be performed.", qualifier);
 						continue;
 					}
 

Connected.Interop/Generics.cs

@@ -18,5 +18,33 @@
 
 			return false;
 		}
+
+		public static bool ImplementsInterface(this Type type, Type interfaceType)
+		{
+			var interfaces = type.GetInterfaces();
+
+			foreach (var i in interfaces)
+			{
+				if (!i.IsGenericType)
+				{
+					if (i == interfaceType)
+						return true;
+
+					continue;
+				}
+
+				var definition = i.GetGenericTypeDefinition();
+
+				if (definition == interfaceType)
+					return true;
+			}
+
+			return false;
+		}
+
+		public static bool ImplementsInterface<TInterface>(this Type type)
+		{
+			return ImplementsInterface(type, typeof(TInterface));
+		}
 	}
 }

Connected.Interop/Merging/JsonMerger.cs

@@ -63,7 +63,7 @@ namespace Connected.Interop.Merging
 
 			var addMethod = property.PropertyType.GetMethod(nameof(IList.Add), BindingFlags.Public | BindingFlags.Instance | BindingFlags.NonPublic);
 			var instance = addMethod is not null ? Activator.CreateInstance(property.PropertyType) : Array.CreateInstance(property.PropertyType, array.Count);
-			var elementType = instance.GetType().GetElementType();
+			var elementType = property.PropertyType.GenericTypeArguments[0];
 
 			for (var i = 0; i < array.Count; i++)
 			{

Connected.Interop/Serializer.cs

@@ -1,9 +1,9 @@
-using Connected.Interop.Merging;
+using System.Collections;
-using System.Collections;
 using System.Reflection;
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Nodes;
+using Connected.Interop.Merging;
 
 namespace Connected.Interop;
 
@@ -41,12 +41,17 @@ public static class Serializer
 		using var ms = new MemoryStream();
 		using var writer = new Utf8JsonWriter(ms, new JsonWriterOptions { Indented = true, SkipValidation = false });
 
+		if (value is JsonNode json)
+			json.WriteTo(writer);
+		else
+		{
 			if (value.GetType().IsEnumerable())
 				SerializeArray(writer, null, value);
 			else if (value.GetType().IsTypePrimitive())
 				SerializePrimitive(writer, value);
 			else
 				SerializeObject(writer, null, value);
+		}
 
 		await writer.FlushAsync();
 
@@ -78,18 +83,20 @@ public static class Serializer
 		if (value is null)
 			return;
 
+		var enumerable = property.GetValue(value) as IEnumerable;
+
+		if (enumerable is null)
+			return;
+
 		if (property is not null)
 			writer.WriteStartArray(property.Name.ToCamelCase());
 		else
 			writer.WriteStartArray();
 
-		if (value is IEnumerable enumerable)
-		{
 		var enumerator = enumerable.GetEnumerator();
 
 		while (enumerator.MoveNext())
 			SerializeObject(writer, null, enumerator.Current);
-		}
 
 		writer.WriteEndArray();
 	}
@@ -100,11 +107,13 @@ public static class Serializer
 			SerializeArray(writer, property, value);
 		else if (!property.PropertyType.IsTypePrimitive())
 			SerializeObject(writer, property, value);
-
+		else
+		{
 			writer.WritePropertyName(property.Name.ToCamelCase());
 
 			SerializePrimitive(writer, property.GetValue(value));
 		}
+	}
 
 	private static void SerializePrimitive(Utf8JsonWriter writer, object? value)
 	{

Connected.Interop/TypeSystem.cs

@@ -96,8 +96,10 @@ namespace Connected.Interop
 				return DbType.Byte;
 			else if (underlyingType == typeof(bool))
 				return DbType.Boolean;
-			else if (underlyingType == typeof(DateTime) || underlyingType == typeof(DateTimeOffset))
+			else if (underlyingType == typeof(DateTime))
 				return DbType.DateTime2;
+			else if (underlyingType == typeof(DateTimeOffset))
+				return DbType.DateTimeOffset;
 			else if (underlyingType == typeof(decimal))
 				return DbType.Decimal;
 			else if (underlyingType == typeof(double))

Connected.Net/HttpExtensions.cs

@@ -68,7 +68,11 @@ public static class HttpExtensions
 	}
 	public static async Task<TResult?> Post<TResult>(this IHttpService factory, string? requestUri, object? content, CancellationToken cancellationToken = default)
 	{
-		return await HandleResponse<TResult>(await factory.CreateClient().SendAsync(await CreatePostMessage(requestUri, content), cancellationToken));
+		var client = factory.CreateClient();
+		var message = await CreatePostMessage(requestUri, content);
+		var response = await client.SendAsync(message, cancellationToken);
+
+		return await HandleResponse<TResult>(response);
 	}
 	private static HttpRequestMessage CreateGetMessage(string? requestUri)
 	{