Merge pull request 'Fix [Connected/Connected.Host#1]' (#1) from features/tableStorageClient into develop

Reviewed-on: #1

.editorconfig

@@ -0,0 +1,226 @@
+# Remove the line below if you want to inherit .editorconfig settings from higher directories
+root = true
+
+# C# files
+[*.cs]
+
+#### Core EditorConfig Options ####
+
+# Indentation and spacing
+indent_size = 3
+indent_style = tab
+tab_width = 3
+
+# New line preferences
+end_of_line = crlf
+insert_final_newline = false
+
+#### .NET Coding Conventions ####
+
+# Organize usings
+dotnet_separate_import_directive_groups = false
+dotnet_sort_system_directives_first = true
+file_header_template = unset
+
+# this. and Me. preferences
+dotnet_style_qualification_for_event = false
+dotnet_style_qualification_for_field = false
+dotnet_style_qualification_for_method = false
+dotnet_style_qualification_for_property = false
+
+# Language keywords vs BCL types preferences
+dotnet_style_predefined_type_for_locals_parameters_members = true
+dotnet_style_predefined_type_for_member_access = true
+
+# Parentheses preferences
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity
+
+# Modifier preferences
+dotnet_style_require_accessibility_modifiers = for_non_interface_members
+
+# Expression-level preferences
+dotnet_style_coalesce_expression = true
+dotnet_style_collection_initializer = true
+dotnet_style_explicit_tuple_names = true
+dotnet_style_namespace_match_folder = true
+dotnet_style_null_propagation = true
+dotnet_style_object_initializer = true
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+dotnet_style_prefer_auto_properties = true
+dotnet_style_prefer_compound_assignment = true
+dotnet_style_prefer_conditional_expression_over_assignment = true
+dotnet_style_prefer_conditional_expression_over_return = true
+dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed
+dotnet_style_prefer_inferred_anonymous_type_member_names = true
+dotnet_style_prefer_inferred_tuple_names = true
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true
+dotnet_style_prefer_simplified_boolean_expressions = true
+dotnet_style_prefer_simplified_interpolation = true
+
+# Field preferences
+dotnet_style_readonly_field = true
+
+# Parameter preferences
+dotnet_code_quality_unused_parameters = all
+
+# Suppression preferences
+dotnet_remove_unnecessary_suppression_exclusions = none
+
+# New line preferences
+dotnet_style_allow_multiple_blank_lines_experimental = false
+dotnet_style_allow_statement_immediately_after_block_experimental = false
+
+#### C# Coding Conventions ####
+
+# var preferences
+csharp_style_var_elsewhere = true
+csharp_style_var_for_built_in_types = true
+csharp_style_var_when_type_is_apparent = true
+
+# Expression-bodied members
+csharp_style_expression_bodied_accessors = true
+csharp_style_expression_bodied_constructors = false
+csharp_style_expression_bodied_indexers = true
+csharp_style_expression_bodied_lambdas = true
+csharp_style_expression_bodied_local_functions = false
+csharp_style_expression_bodied_methods = false
+csharp_style_expression_bodied_operators = false
+csharp_style_expression_bodied_properties = true
+
+# Pattern matching preferences
+csharp_style_pattern_matching_over_as_with_null_check = true
+csharp_style_pattern_matching_over_is_with_cast_check = true
+csharp_style_prefer_extended_property_pattern = true
+csharp_style_prefer_not_pattern = true
+csharp_style_prefer_pattern_matching = true
+csharp_style_prefer_switch_expression = true
+
+# Null-checking preferences
+csharp_style_conditional_delegate_call = true
+
+# Modifier preferences
+csharp_prefer_static_local_function = true
+csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async
+csharp_style_prefer_readonly_struct = true
+
+# Code-block preferences
+csharp_prefer_braces = when_multiline
+csharp_prefer_simple_using_statement = true
+csharp_style_namespace_declarations = file_scoped
+csharp_style_prefer_method_group_conversion = true
+csharp_style_prefer_top_level_statements = true
+
+# Expression-level preferences
+csharp_prefer_simple_default_expression = true
+csharp_style_deconstructed_variable_declaration = true
+csharp_style_implicit_object_creation_when_type_is_apparent = true
+csharp_style_inlined_variable_declaration = true
+csharp_style_prefer_index_operator = true
+csharp_style_prefer_local_over_anonymous_function = true
+csharp_style_prefer_null_check_over_type_check = true
+csharp_style_prefer_range_operator = true
+csharp_style_prefer_tuple_swap = true
+csharp_style_prefer_utf8_string_literals = true
+csharp_style_throw_expression = true
+csharp_style_unused_value_assignment_preference = discard_variable
+csharp_style_unused_value_expression_statement_preference = discard_variable
+
+# 'using' directive preferences
+csharp_using_directive_placement = outside_namespace
+
+# New line preferences
+csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false
+csharp_style_allow_embedded_statements_on_same_line_experimental = false
+
+#### C# Formatting Rules ####
+
+# New line preferences
+csharp_new_line_before_catch = true
+csharp_new_line_before_else = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_open_brace = all
+csharp_new_line_between_query_expression_clauses = true
+
+# Indentation preferences
+csharp_indent_block_contents = true
+csharp_indent_braces = false
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = true
+csharp_indent_labels = one_less_than_current
+csharp_indent_switch_labels = true
+
+# Space preferences
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_comma = true
+csharp_space_after_dot = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_after_semicolon_in_for_statement = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_around_declaration_statements = false
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_before_comma = false
+csharp_space_before_dot = false
+csharp_space_before_open_square_brackets = false
+csharp_space_before_semicolon_in_for_statement = false
+csharp_space_between_empty_square_brackets = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_name_and_open_parenthesis = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_between_square_brackets = false
+
+# Wrapping preferences
+csharp_preserve_single_line_blocks = true
+csharp_preserve_single_line_statements = false
+
+#### Naming styles ####
+
+# Naming rules
+
+dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
+dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
+dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
+
+dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.types_should_be_pascal_case.symbols = types
+dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
+dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
+
+# Symbol specifications
+
+dotnet_naming_symbols.interface.applicable_kinds = interface
+dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.interface.required_modifiers = 
+
+dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
+dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.types.required_modifiers = 
+
+dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.non_field_members.required_modifiers = 
+
+# Naming styles
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+
+dotnet_naming_style.begins_with_i.required_prefix = I
+dotnet_naming_style.begins_with_i.required_suffix = 
+dotnet_naming_style.begins_with_i.word_separator = 
+dotnet_naming_style.begins_with_i.capitalization = pascal_case

Framerwork.ServiceModel.Client.sln

@@ -0,0 +1,69 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33027.239
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{CF4933B0-B3E2-49C9-8FB3-D3FA3E2DBA3B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel.Client", "src\Connected.ServiceModel.Client\Connected.ServiceModel.Client.csproj", "{679249A7-58C5-42D9-A764-4EBDC7DE7F9D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel.Client.Storage", "src\Connected.ServiceModel.Client.Storage\Connected.ServiceModel.Client.Storage.csproj", "{1F7F8DB9-3545-4B06-BAB8-3A15611E39EA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel.Client.Data", "src\Connected.ServiceModel.Client.Data\Connected.ServiceModel.Client.Data.csproj", "{D9F21D24-E114-4901-8245-720A1094EA24}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Data", "..\connected.framework\src\Connected.Data\Connected.Data.csproj", "{DB5BEF87-2FA0-4474-9911-50681EF6D2BD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Entities", "..\connected.framework\src\Connected.Entities\Connected.Entities.csproj", "{627E1899-4765-4E45-9732-E322B8F459B9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Services", "..\connected.framework\src\Connected.Services\Connected.Services.csproj", "{422C716D-904B-42B4-AAE2-B07C44F39807}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel", "..\connected.framework.servicemodel\src\Connected.ServiceModel\Connected.ServiceModel.csproj", "{E5AD15CB-1031-4089-9B6A-FE2CFAF7B4E8}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{679249A7-58C5-42D9-A764-4EBDC7DE7F9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{679249A7-58C5-42D9-A764-4EBDC7DE7F9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{679249A7-58C5-42D9-A764-4EBDC7DE7F9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{679249A7-58C5-42D9-A764-4EBDC7DE7F9D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1F7F8DB9-3545-4B06-BAB8-3A15611E39EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F7F8DB9-3545-4B06-BAB8-3A15611E39EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F7F8DB9-3545-4B06-BAB8-3A15611E39EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1F7F8DB9-3545-4B06-BAB8-3A15611E39EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D9F21D24-E114-4901-8245-720A1094EA24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D9F21D24-E114-4901-8245-720A1094EA24}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D9F21D24-E114-4901-8245-720A1094EA24}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D9F21D24-E114-4901-8245-720A1094EA24}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DB5BEF87-2FA0-4474-9911-50681EF6D2BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB5BEF87-2FA0-4474-9911-50681EF6D2BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB5BEF87-2FA0-4474-9911-50681EF6D2BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DB5BEF87-2FA0-4474-9911-50681EF6D2BD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{627E1899-4765-4E45-9732-E322B8F459B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{627E1899-4765-4E45-9732-E322B8F459B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{627E1899-4765-4E45-9732-E322B8F459B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{627E1899-4765-4E45-9732-E322B8F459B9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{422C716D-904B-42B4-AAE2-B07C44F39807}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{422C716D-904B-42B4-AAE2-B07C44F39807}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{422C716D-904B-42B4-AAE2-B07C44F39807}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{422C716D-904B-42B4-AAE2-B07C44F39807}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5AD15CB-1031-4089-9B6A-FE2CFAF7B4E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5AD15CB-1031-4089-9B6A-FE2CFAF7B4E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5AD15CB-1031-4089-9B6A-FE2CFAF7B4E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5AD15CB-1031-4089-9B6A-FE2CFAF7B4E8}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{DB5BEF87-2FA0-4474-9911-50681EF6D2BD} = {CF4933B0-B3E2-49C9-8FB3-D3FA3E2DBA3B}
+		{627E1899-4765-4E45-9732-E322B8F459B9} = {CF4933B0-B3E2-49C9-8FB3-D3FA3E2DBA3B}
+		{422C716D-904B-42B4-AAE2-B07C44F39807} = {CF4933B0-B3E2-49C9-8FB3-D3FA3E2DBA3B}
+		{E5AD15CB-1031-4089-9B6A-FE2CFAF7B4E8} = {CF4933B0-B3E2-49C9-8FB3-D3FA3E2DBA3B}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {62DF7178-0DD2-461C-999E-51A5E1BB8CAD}
+	EndGlobalSection
+EndGlobal

src/Connected.ServiceModel.Client.Data/AggregatedCommandBuilder.cs

@@ -0,0 +1,50 @@
+using System.Collections.Immutable;
+using Connected.Entities;
+using Connected.Entities.Storage;
+
+namespace Connected.ServiceModel.Client.Data;
+internal sealed class AggregatedCommandBuilder<TEntity>
+{
+	public StorageOperation? Build(TEntity entity)
+	{
+		if (entity is not IEntity ie)
+			throw new ArgumentException(nameof(entity));
+
+		switch (ie.State)
+		{
+			case State.New:
+				return BuildInsert(ie);
+			case State.Default:
+				return BuildUpdate(ie);
+			case State.Deleted:
+				return BuildDelete(ie);
+			default:
+				throw new NotSupportedException();
+		}
+	}
+
+	public List<StorageOperation> Build(ImmutableArray<TEntity> entities)
+	{
+		var result = new List<StorageOperation>();
+
+		foreach (var entity in entities)
+			result.Add(Build(entity));
+
+		return result;
+	}
+
+	private StorageOperation? BuildInsert(IEntity entity)
+	{
+		return new InsertCommandBuilder().Build(entity);
+	}
+
+	private StorageOperation? BuildUpdate(IEntity entity)
+	{
+		return new UpdateCommandBuilder().Build(entity);
+	}
+
+	private StorageOperation? BuildDelete(IEntity entity)
+	{
+		return new DeleteCommandBuilder().Build(entity);
+	}
+}

src/Connected.ServiceModel.Client.Data/Boot.cs

@@ -0,0 +1,15 @@
+using Connected.Annotations;
+using Connected.ServiceModel.Client.Data.Remote;
+using Microsoft.Extensions.DependencyInjection;
+
+[assembly: MicroService(MicroServiceType.Provider)]
+
+namespace Connected.ServiceModel.Client.Data;
+
+internal sealed class Boot : Startup
+{
+	protected override void OnConfigureServices(IServiceCollection services)
+	{
+		services.AddScoped<RemoteTableService>();
+	}
+}

src/Connected.ServiceModel.Client.Data/CommandBuilder.cs

@@ -0,0 +1,206 @@
+using System.Data;
+using System.Reflection;
+using System.Text;
+using Connected.Entities;
+using Connected.Entities.Annotations;
+using Connected.Entities.Storage;
+using Connected.Interop;
+
+namespace Connected.ServiceModel.Client.Data;
+
+internal abstract class CommandBuilder
+{
+	private readonly List<IStorageParameter> _parameters;
+	private readonly List<PropertyInfo> _whereProperties;
+	private List<PropertyInfo> _properties;
+
+	protected CommandBuilder()
+	{
+		_parameters = new List<IStorageParameter>();
+		_whereProperties = new List<PropertyInfo>();
+
+		Text = new StringBuilder();
+	}
+
+	public StorageOperation? Build(IEntity entity)
+	{
+		Entity = entity;
+
+		if (TryGetExisting(out StorageOperation? existing))
+		{
+			/*
+			 * We need to rebuild an instance since StorageOperation
+			 * is immutable
+			 */
+			var result = new StorageOperation
+			{
+				CommandText = existing.CommandText,
+				CommandTimeout = existing.CommandTimeout,
+				CommandType = existing.CommandType,
+				Concurrency = existing.Concurrency
+			};
+
+			if (result.Parameters is null)
+				return result;
+
+			foreach (var parameter in result.Parameters)
+			{
+				if (parameter.Direction == ParameterDirection.Input)
+				{
+					if (ResolveProperty(parameter.Name) is PropertyInfo property)
+					{
+						result.AddParameter(new StorageParameter
+						{
+							Value = GetValue(property),
+							Name = parameter.Name,
+							Type = parameter.Type,
+							Direction = parameter.Direction
+						});
+					}
+				}
+			}
+
+			return result;
+		}
+
+		Schema = Entity.GetSchemaAttribute();
+
+		return OnBuild();
+	}
+
+	protected List<PropertyInfo> Properties => _properties ??= GetProperties();
+
+	protected List<PropertyInfo> WhereProperties => _whereProperties;
+
+	protected string CommandText => Text.ToString();
+
+	protected IEntity Entity { get; private set; }
+
+	protected SchemaAttribute Schema { get; private set; }
+
+	private StringBuilder Text { get; set; }
+
+	protected abstract StorageOperation OnBuild();
+
+	protected abstract bool TryGetExisting(out StorageOperation? result);
+
+	protected List<IStorageParameter> Parameters => _parameters;
+
+	protected void Write(string text)
+	{
+		Text.Append(text);
+	}
+
+	protected void Write(char text)
+	{
+		Text.Append(text);
+	}
+
+	protected void WriteLine(string text)
+	{
+		Text.AppendLine(text);
+	}
+
+	protected void Trim()
+	{
+		for (var i = Text.Length - 1; i >= 0; i--)
+		{
+			if (!Text[i].Equals(',') && !Text[i].Equals('\n') && !Text[i].Equals('\r') && !Text[i].Equals(' '))
+				break;
+
+			if (i < Text.Length)
+				Text.Length = i;
+		}
+	}
+
+	protected virtual List<PropertyInfo> GetProperties()
+	{
+		return Interop.Properties.GetImplementedProperties(Entity);
+	}
+
+	protected static string ColumnName(PropertyInfo property)
+	{
+		var dataMember = property.FindAttribute<MemberAttribute>();
+
+		return dataMember is null || string.IsNullOrEmpty(dataMember.Member) ? property.Name.ToCamelCase() : dataMember.Member;
+	}
+
+	protected static DbType ResolveDbType(PropertyInfo property)
+	{
+		return property.PropertyType.ToDbType();
+	}
+
+	protected object? GetValue(PropertyInfo property)
+	{
+		if (IsNull(property))
+			return "NULL";
+
+		return GetValue(property.GetValue(Entity), property.PropertyType.ToDbType());
+	}
+
+	private static object? GetValue(object value, DbType dbType)
+	{
+		switch (dbType)
+		{
+			case DbType.Binary:
+				if (value is byte[] bytes)
+					return Convert.ToBase64String(bytes);
+				else
+					return Convert.ToBase64String(Encoding.UTF8.GetBytes(value.ToString()));
+			default:
+				return value;
+		}
+	}
+
+	private bool IsNull(PropertyInfo property)
+	{
+		var result = property.GetValue(Entity);
+
+		if (result is null)
+			return true;
+
+		if (property.GetCustomAttribute<NullableAttribute>() is null)
+			return false;
+
+		var def = Types.GetDefault(property.PropertyType);
+
+		return TypeComparer.Compare(result, def);
+	}
+
+	protected StorageParameter CreateParameter(PropertyInfo property)
+	{
+		return CreateParameter(property, ParameterDirection.Input);
+	}
+
+	protected StorageParameter CreateParameter(PropertyInfo property, ParameterDirection direction)
+	{
+		var columnName = ColumnName(property);
+		var parameterName = $"@{columnName}";
+
+		var parameter = new StorageParameter
+		{
+			Direction = direction,
+			Name = parameterName,
+			Type = ResolveDbType(property),
+			Value = GetValue(property)
+		};
+
+		Parameters.Add(parameter);
+
+		return parameter;
+	}
+
+	private PropertyInfo ResolveProperty(string parameterName)
+	{
+		var propertyName = parameterName[1..];
+		var flags = BindingFlags.Public | BindingFlags.Instance | BindingFlags.NonPublic;
+
+		if (Entity.GetType().GetProperty(propertyName.ToPascalCase(), flags) is PropertyInfo property)
+			return property;
+
+		if (Entity.GetType().GetProperty(propertyName, flags) is PropertyInfo raw)
+			return raw;
+
+		return null;
+	}
+}

src/Connected.ServiceModel.Client.Data/Connected.ServiceModel.Client.Data.csproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net7.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\..\connected.framework.servicemodel\src\Connected.ServiceModel\Connected.ServiceModel.csproj" />
+		<ProjectReference Include="..\..\..\connected.framework\src\Connected.Data\Connected.Data.csproj" />
+		<ProjectReference Include="..\..\..\connected.framework\src\Connected.Entities\Connected.Entities.csproj" />
+		<ProjectReference Include="..\..\..\connected.framework\src\Connected.Services\Connected.Services.csproj" />
+		<ProjectReference Include="..\Connected.ServiceModel.Client\Connected.ServiceModel.Client.csproj" />
+	</ItemGroup>
+
+</Project>

src/Connected.ServiceModel.Client.Data/CqlDataType.cs

@@ -0,0 +1,17 @@
+using Connected.Expressions.Languages;
+using System.Data;
+
+namespace Connected.ServiceModel.Client.Data;
+internal sealed class CqlDataType : DataType
+{
+	public CqlDataType(SqlDbType dbType, bool notNull, int length, short precision, short scale)
+	{
+		DbType = dbType;
+		NotNull = notNull;
+		Length = length;
+		Precision = precision;
+		Scale = scale;
+	}
+
+	public SqlDbType DbType { get; }
+}

src/Connected.ServiceModel.Client.Data/CqlFormatter.cs

@@ -0,0 +1,781 @@
+using System.Linq.Expressions;
+using Connected.Expressions;
+using Connected.Expressions.Formatters;
+using Connected.Expressions.Languages;
+using Connected.Interop;
+
+namespace Connected.ServiceModel.Client.Data;
+/// <summary>
+/// This is currently the same implementation as the default (TSql) formatter.
+/// </summary>
+internal sealed class CqlFormatter : SqlFormatter
+{
+	public CqlFormatter(ExpressionCompilationContext context, QueryLanguage? language)
+		  : base(language)
+	{
+		Context = context;
+
+		HideColumnAliases = true;
+		HideTableAliases = true;
+		UseBracketsInWhere = false;
+	}
+
+	public ExpressionCompilationContext Context { get; }
+
+	public static new string Format(ExpressionCompilationContext context, Expression expression)
+	{
+		return Format(context, expression, new CqlLanguage());
+	}
+	public static string Format(ExpressionCompilationContext context, Expression expression, QueryLanguage language)
+	{
+		var formatter = new CqlFormatter(context, language);
+
+		formatter.Visit(expression);
+
+		return formatter.ToString();
+	}
+	protected override void WriteAggregateName(string aggregateName)
+	{
+		if (string.Equals(aggregateName, "LongCount", StringComparison.Ordinal))
+			Write("COUNT_BIG");
+		else
+			base.WriteAggregateName(aggregateName);
+	}
+
+	protected override void WriteTableName(string tableSchema, string tableName)
+	{
+		Write(tableName);
+	}
+	protected override Expression VisitMemberAccess(MemberExpression m)
+	{
+		if (m.Member.DeclaringType == typeof(string))
+		{
+			switch (m.Member.Name)
+			{
+				case "Length":
+					Write("LEN(");
+					Visit(m.Expression);
+					Write(")");
+					return m;
+			}
+		}
+		else if (m.Member.DeclaringType == typeof(DateTime) || m.Member.DeclaringType == typeof(DateTimeOffset))
+		{
+			switch (m.Member.Name)
+			{
+				case "Day":
+					Write("DAY(");
+					Visit(m.Expression);
+					Write(")");
+					return m;
+				case "Month":
+					Write("MONTH(");
+					Visit(m.Expression);
+					Write(")");
+					return m;
+				case "Year":
+					Write("YEAR(");
+					Visit(m.Expression);
+					Write(")");
+					return m;
+				case "Hour":
+					Write("DATEPART(hour, ");
+					Visit(m.Expression);
+					Write(")");
+					return m;
+				case "Minute":
+					Write("DATEPART(minute, ");
+					Visit(m.Expression);
+					Write(")");
+					return m;
+				case "Second":
+					Write("DATEPART(second, ");
+					Visit(m.Expression);
+					Write(")");
+					return m;
+				case "Millisecond":
+					Write("DATEPART(millisecond, ");
+					Visit(m.Expression);
+					Write(")");
+					return m;
+				case "DayOfWeek":
+					Write("(DATEPART(weekday, ");
+					Visit(m.Expression);
+					Write(") - 1)");
+					return m;
+				case "DayOfYear":
+					Write("(DATEPART(dayofyear, ");
+					Visit(m.Expression);
+					Write(") - 1)");
+					return m;
+			}
+		}
+
+		return base.VisitMemberAccess(m);
+	}
+
+	protected override Expression VisitMethodCall(MethodCallExpression m)
+	{
+		if (m.Method.DeclaringType == typeof(string))
+		{
+			switch (m.Method.Name)
+			{
+				case "StartsWith":
+					Write("(");
+					Visit(m.Object);
+					Write(" LIKE ");
+					Visit(m.Arguments[0]);
+					Write(" + '%')");
+					return m;
+				case "EndsWith":
+					Write("(");
+					Visit(m.Object);
+					Write(" LIKE '%' + ");
+					Visit(m.Arguments[0]);
+					Write(")");
+					return m;
+				case "Contains":
+					Write("(");
+					Visit(m.Object);
+					Write(" LIKE '%' + ");
+					Visit(m.Arguments[0]);
+					Write(" + '%')");
+					return m;
+				case "Concat":
+					var args = m.Arguments;
+
+					if (args.Count == 1 && args[0].NodeType == ExpressionType.NewArrayInit)
+						args = ((NewArrayExpression)args[0]).Expressions;
+					for (var i = 0; i < args.Count; i++)
+					{
+						if (i > 0)
+							Write(" + ");
+
+						Visit(args[i]);
+					}
+					return m;
+				case "IsNullOrEmpty":
+					Write("(");
+					Visit(m.Arguments[0]);
+					Write(" IS NULL OR ");
+					Visit(m.Arguments[0]);
+					Write(" = '')");
+					return m;
+				case "ToUpper":
+					Write("UPPER(");
+					Visit(m.Object);
+					Write(")");
+					return m;
+				case "ToLower":
+					Write("LOWER(");
+					Visit(m.Object);
+					Write(")");
+					return m;
+				case "Replace":
+					Write("REPLACE(");
+					Visit(m.Object);
+					Write(", ");
+					Visit(m.Arguments[0]);
+					Write(", ");
+					Visit(m.Arguments[1]);
+					Write(")");
+					return m;
+				case "Substring":
+					Write("SUBSTRING(");
+					Visit(m.Object);
+					Write(", ");
+					Visit(m.Arguments[0]);
+					Write(" + 1, ");
+
+					if (m.Arguments.Count == 2)
+						Visit(m.Arguments[1]);
+					else
+						Write("8000");
+
+					Write(")");
+					return m;
+				case "Remove":
+					Write("STUFF(");
+					Visit(m.Object);
+					Write(", ");
+					Visit(m.Arguments[0]);
+					Write(" + 1, ");
+
+					if (m.Arguments.Count == 2)
+						Visit(m.Arguments[1]);
+					else
+						Write("8000");
+
+					Write(", '')");
+					return m;
+				case "IndexOf":
+					Write("(CHARINDEX(");
+					Visit(m.Arguments[0]);
+					Write(", ");
+					Visit(m.Object);
+
+					if (m.Arguments.Count == 2 && m.Arguments[1].Type == typeof(int))
+					{
+						Write(", ");
+						Visit(m.Arguments[1]);
+						Write(" + 1");
+					}
+
+					Write(") - 1)");
+					return m;
+				case "Trim":
+					Write("RTRIM(LTRIM(");
+					Visit(m.Object);
+					Write("))");
+					return m;
+			}
+		}
+		else if (m.Method.DeclaringType == typeof(DateTime))
+		{
+			switch (m.Method.Name)
+			{
+				case "op_Subtract":
+					if (m.Arguments[1].Type == typeof(DateTime))
+					{
+						Write("DATEDIFF(");
+						Visit(m.Arguments[0]);
+						Write(", ");
+						Visit(m.Arguments[1]);
+						Write(")");
+						return m;
+					}
+					break;
+				case "AddYears":
+					Write("DATEADD(YYYY,");
+					Visit(m.Arguments[0]);
+					Write(",");
+					Visit(m.Object);
+					Write(")");
+					return m;
+				case "AddMonths":
+					Write("DATEADD(MM,");
+					Visit(m.Arguments[0]);
+					Write(",");
+					Visit(m.Object);
+					Write(")");
+					return m;
+				case "AddDays":
+					Write("DATEADD(DAY,");
+					Visit(m.Arguments[0]);
+					Write(",");
+					Visit(m.Object);
+					Write(")");
+					return m;
+				case "AddHours":
+					Write("DATEADD(HH,");
+					Visit(m.Arguments[0]);
+					Write(",");
+					Visit(m.Object);
+					Write(")");
+					return m;
+				case "AddMinutes":
+					Write("DATEADD(MI,");
+					Visit(m.Arguments[0]);
+					Write(",");
+					Visit(m.Object);
+					Write(")");
+					return m;
+				case "AddSeconds":
+					Write("DATEADD(SS,");
+					Visit(m.Arguments[0]);
+					Write(",");
+					Visit(m.Object);
+					Write(")");
+					return m;
+				case "AddMilliseconds":
+					Write("DATEADD(MS,");
+					Visit(m.Arguments[0]);
+					Write(",");
+					Visit(m.Object);
+					Write(")");
+					return m;
+			}
+		}
+		else if (m.Method.DeclaringType == typeof(Decimal))
+		{
+			switch (m.Method.Name)
+			{
+				case "Add":
+				case "Subtract":
+				case "Multiply":
+				case "Divide":
+				case "Remainder":
+					Write("(");
+					VisitValue(m.Arguments[0]);
+					Write(" ");
+					Write(GetOperator(m.Method.Name));
+					Write(" ");
+					VisitValue(m.Arguments[1]);
+					Write(")");
+					return m;
+				case "Negate":
+					Write("-");
+					Visit(m.Arguments[0]);
+					Write("");
+					return m;
+				case "Ceiling":
+				case "Floor":
+					Write(m.Method.Name.ToUpper());
+					Write("(");
+					Visit(m.Arguments[0]);
+					Write(")");
+					return m;
+				case "Round":
+					if (m.Arguments.Count == 1)
+					{
+						Write("ROUND(");
+						Visit(m.Arguments[0]);
+						Write(", 0)");
+						return m;
+					}
+					else if (m.Arguments.Count == 2 && m.Arguments[1].Type == typeof(int))
+					{
+						Write("ROUND(");
+						Visit(m.Arguments[0]);
+						Write(", ");
+						Visit(m.Arguments[1]);
+						Write(")");
+						return m;
+					}
+					break;
+				case "Truncate":
+					Write("ROUND(");
+					Visit(m.Arguments[0]);
+					Write(", 0, 1)");
+					return m;
+			}
+		}
+		else if (m.Method.DeclaringType == typeof(Math))
+		{
+			switch (m.Method.Name)
+			{
+				case "Abs":
+				case "Acos":
+				case "Asin":
+				case "Atan":
+				case "Cos":
+				case "Exp":
+				case "Log10":
+				case "Sin":
+				case "Tan":
+				case "Sqrt":
+				case "Sign":
+				case "Ceiling":
+				case "Floor":
+					Write(m.Method.Name.ToUpper());
+					Write("(");
+					Visit(m.Arguments[0]);
+					Write(")");
+					return m;
+				case "Atan2":
+					Write("ATN2(");
+					Visit(m.Arguments[0]);
+					Write(", ");
+					Visit(m.Arguments[1]);
+					Write(")");
+					return m;
+				case "Log":
+					if (m.Arguments.Count == 1)
+						goto case "Log10";
+
+					break;
+				case "Pow":
+					Write("POWER(");
+					Visit(m.Arguments[0]);
+					Write(", ");
+					Visit(m.Arguments[1]);
+					Write(")");
+					return m;
+				case "Round":
+					if (m.Arguments.Count == 1)
+					{
+						Write("ROUND(");
+						Visit(m.Arguments[0]);
+						Write(", 0)");
+						return m;
+					}
+					else if (m.Arguments.Count == 2 && m.Arguments[1].Type == typeof(int))
+					{
+						Write("ROUND(");
+						Visit(m.Arguments[0]);
+						Write(", ");
+						Visit(m.Arguments[1]);
+						Write(")");
+						return m;
+					}
+					break;
+				case "Truncate":
+					Write("ROUND(");
+					Visit(m.Arguments[0]);
+					Write(", 0, 1)");
+					return m;
+			}
+		}
+		if (m.Method.Name == "ToString")
+		{
+			if (m.Object.Type != typeof(string))
+			{
+				Write("CONVERT(NVARCHAR, ");
+				Visit(m.Object);
+				Write(")");
+			}
+			else
+				Visit(m.Object);
+
+			return m;
+		}
+		else if (!m.Method.IsStatic && string.Equals(m.Method.Name, "CompareTo", StringComparison.Ordinal) && m.Method.ReturnType == typeof(int) && m.Arguments.Count == 1)
+		{
+			Write("(CASE WHEN ");
+			Visit(m.Object);
+			Write(" = ");
+			Visit(m.Arguments[0]);
+			Write(" THEN 0 WHEN ");
+			Visit(m.Object);
+			Write(" < ");
+			Visit(m.Arguments[0]);
+			Write(" THEN -1 ELSE 1 END)");
+			return m;
+		}
+		else if (m.Method.IsStatic && string.Equals(m.Method.Name, "Compare", StringComparison.Ordinal) && m.Method.ReturnType == typeof(int) && m.Arguments.Count == 2)
+		{
+			Write("(CASE WHEN ");
+			Visit(m.Arguments[0]);
+			Write(" = ");
+			Visit(m.Arguments[1]);
+			Write(" THEN 0 WHEN ");
+			Visit(m.Arguments[0]);
+			Write(" < ");
+			Visit(m.Arguments[1]);
+			Write(" THEN -1 ELSE 1 END)");
+			return m;
+		}
+		else if (m.Method.DeclaringType == typeof(TypeComparer) && m.Method.IsStatic && string.Equals(m.Method.Name, nameof(TypeComparer.Compare), StringComparison.Ordinal) && m.Method.ReturnType == typeof(bool) && m.Arguments.Count == 2)
+		{
+			Visit(m.Arguments[0]);
+			Write(" = ");
+			Visit(m.Arguments[1]);
+			return m;
+		}
+		return base.VisitMethodCall(m);
+	}
+
+	protected override NewExpression VisitNew(NewExpression nex)
+	{
+		if (nex.Constructor.DeclaringType == typeof(DateTime))
+		{
+			if (nex.Arguments.Count == 3)
+			{
+				Write("Convert(DateTime, ");
+				Write("Convert(nvarchar, ");
+				Visit(nex.Arguments[0]);
+				Write(") + '/' + ");
+				Write("Convert(nvarchar, ");
+				Visit(nex.Arguments[1]);
+				Write(") + '/' + ");
+				Write("Convert(nvarchar, ");
+				Visit(nex.Arguments[2]);
+				Write("))");
+				return nex;
+			}
+			else if (nex.Arguments.Count == 6)
+			{
+				Write("Convert(DateTime, ");
+				Write("Convert(nvarchar, ");
+				Visit(nex.Arguments[0]);
+				Write(") + '/' + ");
+				Write("Convert(nvarchar, ");
+				Visit(nex.Arguments[1]);
+				Write(") + '/' + ");
+				Write("Convert(nvarchar, ");
+				Visit(nex.Arguments[2]);
+				Write(") + ' ' + ");
+				Write("Convert(nvarchar, ");
+				Visit(nex.Arguments[3]);
+				Write(") + ':' + ");
+				Write("Convert(nvarchar, ");
+				Visit(nex.Arguments[4]);
+				Write(") + ':' + ");
+				Write("Convert(nvarchar, ");
+				Visit(nex.Arguments[5]);
+				Write("))");
+				return nex;
+			}
+		}
+
+		return base.VisitNew(nex);
+	}
+
+	protected override Expression VisitBinary(BinaryExpression b)
+	{
+		if (b.NodeType == ExpressionType.Power)
+		{
+			Write("POWER(");
+			VisitValue(b.Left);
+			Write(", ");
+			VisitValue(b.Right);
+			Write(")");
+			return b;
+		}
+		else if (b.NodeType == ExpressionType.Coalesce)
+		{
+			Write("COALESCE(");
+			VisitValue(b.Left);
+			Write(", ");
+
+			var right = b.Right;
+
+			while (right.NodeType == ExpressionType.Coalesce)
+			{
+				var rb = (BinaryExpression)right;
+
+				VisitValue(rb.Left);
+				Write(", ");
+
+				right = rb.Right;
+			}
+
+			VisitValue(right);
+			Write(")");
+
+			return b;
+		}
+		else if (b.NodeType == ExpressionType.LeftShift)
+		{
+			Write("(");
+			VisitValue(b.Left);
+			Write(" * POWER(2, ");
+			VisitValue(b.Right);
+			Write("))");
+			return b;
+		}
+		else if (b.NodeType == ExpressionType.RightShift)
+		{
+			Write("(");
+			VisitValue(b.Left);
+			Write(" / POWER(2, ");
+			VisitValue(b.Right);
+			Write("))");
+			return b;
+		}
+
+		return base.VisitBinary(b);
+	}
+
+	protected override Expression VisitConstant(ConstantExpression c)
+	{
+		var parameter = Context.Parameters.FirstOrDefault(f => f.Value == c);
+
+		if (parameter.Value is not null)
+		{
+			Write($"@{parameter.Key}");
+
+			return c;
+		}
+
+		return base.VisitConstant(c);
+	}
+
+	protected override Expression VisitValue(Expression expr)
+	{
+		if (IsPredicate(expr))
+		{
+			Write("CASE WHEN (");
+			Visit(expr);
+			Write(") THEN 1 ELSE 0 END");
+
+			return expr;
+		}
+
+		return base.VisitValue(expr);
+	}
+
+	protected override Expression VisitConditional(ConditionalExpression c)
+	{
+		if (IsPredicate(c.Test))
+		{
+			Write("(CASE WHEN ");
+			VisitPredicate(c.Test);
+			Write(" THEN ");
+			VisitValue(c.IfTrue);
+
+			var ifFalse = c.IfFalse;
+
+			while (ifFalse is not null && ifFalse.NodeType == ExpressionType.Conditional)
+			{
+				var fc = (ConditionalExpression)ifFalse;
+
+				Write(" WHEN ");
+				VisitPredicate(fc.Test);
+				Write(" THEN ");
+				VisitValue(fc.IfTrue);
+
+				ifFalse = fc.IfFalse;
+			}
+			if (ifFalse is not null)
+			{
+				Write(" ELSE ");
+				VisitValue(ifFalse);
+			}
+
+			Write(" END)");
+		}
+		else
+		{
+			Write("(CASE ");
+			VisitValue(c.Test);
+			Write(" WHEN 0 THEN ");
+			VisitValue(c.IfFalse);
+			Write(" ELSE ");
+			VisitValue(c.IfTrue);
+			Write(" END)");
+		}
+
+		return c;
+	}
+
+	protected override Expression VisitRowNumber(RowNumberExpression rowNumber)
+	{
+		Write("ROW_NUMBER() OVER(");
+
+		if (rowNumber.OrderBy is not null && rowNumber.OrderBy.Any())
+		{
+			Write("ORDER BY ");
+
+			for (var i = 0; i < rowNumber.OrderBy.Count; i++)
+			{
+				var exp = rowNumber.OrderBy[i];
+
+				if (i > 0)
+					Write(", ");
+
+				VisitValue(exp.Expression);
+
+				if (exp.OrderType != OrderType.Ascending)
+					Write(" DESC");
+			}
+		}
+
+		Write(")");
+
+		return rowNumber;
+	}
+
+	protected override Expression VisitIf(IfCommandExpression ifx)
+	{
+		if (!Language.AllowsMultipleCommands)
+			return base.VisitIf(ifx);
+
+		Write("IF ");
+		Visit(ifx.Check);
+		WriteLine(Indentation.Same);
+		Write("BEGIN");
+		WriteLine(Indentation.Inner);
+		VisitStatement(ifx.IfTrue);
+		WriteLine(Indentation.Outer);
+
+		if (ifx.IfFalse is not null)
+		{
+			Write("END ELSE BEGIN");
+			WriteLine(Indentation.Inner);
+			VisitStatement(ifx.IfFalse);
+			WriteLine(Indentation.Outer);
+		}
+
+		Write("END");
+
+		return ifx;
+	}
+
+	protected override Expression VisitBlock(Expressions.BlockExpression block)
+	{
+		if (!Language.AllowsMultipleCommands)
+			return base.VisitBlock(block);
+
+		for (var i = 0; i < block.Commands.Count; i++)
+		{
+			if (i > 0)
+			{
+				WriteLine(Indentation.Same);
+				WriteLine(Indentation.Same);
+			}
+
+			VisitStatement(block.Commands[i]);
+		}
+
+		return block;
+	}
+
+	protected override Expression VisitDeclaration(DeclarationExpression decl)
+	{
+		if (!Language.AllowsMultipleCommands)
+			return base.VisitDeclaration(decl);
+
+		for (var i = 0; i < decl.Variables.Count; i++)
+		{
+			var v = decl.Variables[i];
+
+			if (i > 0)
+				WriteLine(Indentation.Same);
+
+			Write("DECLARE @");
+			Write(v.Name);
+			Write(" ");
+			Write(Language.TypeSystem.Format(v.DataType, false));
+		}
+
+		if (decl.Source is not null)
+		{
+			WriteLine(Indentation.Same);
+			Write("SELECT ");
+
+			for (var i = 0; i < decl.Variables.Count; i++)
+			{
+				if (i > 0)
+					Write(", ");
+
+				Write("@");
+				Write(decl.Variables[i].Name);
+				Write(" = ");
+				Visit(decl.Source.Columns[i].Expression);
+			}
+
+			if (decl.Source.From is not null)
+			{
+				WriteLine(Indentation.Same);
+				Write("FROM ");
+				VisitSource(decl.Source.From);
+			}
+
+			if (decl.Source.Where is not null)
+			{
+				WriteLine(Indentation.Same);
+				Write("WHERE ");
+				Visit(decl.Source.Where);
+			}
+		}
+		else
+		{
+			for (var i = 0; i < decl.Variables.Count; i++)
+			{
+				var v = decl.Variables[i];
+
+				if (v.Expression is not null)
+				{
+					WriteLine(Indentation.Same);
+					Write("SET @");
+					Write(v.Name);
+					Write(" = ");
+					Visit(v.Expression);
+				}
+			}
+		}
+
+		return decl;
+	}
+}

src/Connected.ServiceModel.Client.Data/CqlLanguage.cs

@@ -0,0 +1,47 @@
+using Connected.Expressions;
+using Connected.Expressions.Languages;
+using Connected.Expressions.Translation;
+using Connected.Expressions.TypeSystem;
+
+namespace Connected.ServiceModel.Client.Data;
+internal sealed class CqlLanguage : QueryLanguage
+{
+	private static CqlLanguage? _default;
+
+	static CqlLanguage()
+	{
+		SplitChars = new char[] { '.' };
+	}
+
+	public CqlLanguage()
+	{
+		TypeSystem = new CqlTypeSystem();
+	}
+
+	public override QueryTypeSystem TypeSystem { get; }
+	private static char[] SplitChars { get; }
+	public override bool AllowsMultipleCommands => true;
+	public override bool AllowSubqueryInSelectWithoutFrom => true;
+	public override bool AllowDistinctInAggregates => true;
+
+	public static CqlLanguage Default
+	{
+		get
+		{
+			if (_default is null)
+				Interlocked.CompareExchange(ref _default, new CqlLanguage(), null);
+
+			return _default;
+		}
+	}
+
+	public override string Quote(string name)
+	{
+		return name;
+	}
+
+	public override Linguist CreateLinguist(ExpressionCompilationContext context, Translator translator)
+	{
+		return new CqlLinguist(context, this, translator);
+	}
+}

src/Connected.ServiceModel.Client.Data/CqlLinguist.cs

@@ -0,0 +1,41 @@
+using System.Linq.Expressions;
+using Connected.Expressions;
+using Connected.Expressions.Languages;
+using Connected.Expressions.Translation;
+using Connected.Expressions.Translation.Rewriters;
+
+namespace Connected.ServiceModel.Client.Data;
+
+internal class CqlLinguist : Linguist
+{
+
+	public CqlLinguist(ExpressionCompilationContext context, CqlLanguage language, Translator translator)
+		 : base(context, language, translator)
+	{
+	}
+
+	public override Expression Translate(Expression expression)
+	{
+		/*
+	    * fix up any order-by's
+	    */
+		expression = OrderByRewriter.Rewrite(Language, expression);
+
+		expression = base.Translate(expression);
+		/*
+	    * convert skip/take info into RowNumber pattern
+	    */
+		expression = SkipToRowNumberRewriter.Rewrite(Language, expression);
+		/*
+	    * fix up any order-by's we may have changed
+	    */
+		expression = OrderByRewriter.Rewrite(Language, expression);
+
+		return expression;
+	}
+
+	public override string Format(Expression expression)
+	{
+		return CqlFormatter.Format(Context, expression, Language);
+	}
+}

src/Connected.ServiceModel.Client.Data/CqlTypeSystem.cs

@@ -0,0 +1,190 @@
+using Connected.Expressions.Languages;
+using Connected.Expressions.TypeSystem;
+using Connected.Interop;
+using System.Data;
+using System.Globalization;
+using System.Reflection;
+using System.Text;
+
+namespace Connected.ServiceModel.Client.Data;
+internal sealed class CqlTypeSystem : QueryTypeSystem
+{
+	public static int StringDefaultSize => int.MaxValue;
+	public static int BinaryDefaultSize => int.MaxValue;
+
+	public override DataType Parse(string typeDeclaration)
+	{
+		string[]? args = null;
+		string typeName;
+		string? remainder = null;
+		var openParen = typeDeclaration.IndexOf('(');
+
+		if (openParen >= 0)
+		{
+			typeName = typeDeclaration[..openParen].Trim();
+
+			var closeParen = typeDeclaration.IndexOf(')', openParen);
+
+			if (closeParen < openParen)
+				closeParen = typeDeclaration.Length;
+
+			var argstr = typeDeclaration[(openParen + 1)..closeParen];
+
+			args = argstr.Split(',');
+
+			remainder = typeDeclaration[(closeParen + 1)..];
+		}
+		else
+		{
+			var space = typeDeclaration.IndexOf(' ');
+
+			if (space >= 0)
+			{
+				typeName = typeDeclaration[..space];
+				remainder = typeDeclaration[(space + 1)..].Trim();
+			}
+			else
+				typeName = typeDeclaration;
+		}
+
+		var isNotNull = (remainder is not null) && remainder.ToUpper().Contains("NOT NULL");
+
+		return ResolveDataType(typeName, args, isNotNull);
+	}
+
+	public DataType ResolveDataType(string typeName, string[] args, bool isNotNull)
+	{
+		if (string.Equals(typeName, "rowversion", StringComparison.OrdinalIgnoreCase))
+			typeName = "Timestamp";
+
+		if (string.Equals(typeName, "numeric", StringComparison.OrdinalIgnoreCase))
+			typeName = "Decimal";
+
+		if (string.Equals(typeName, "sql_variant", StringComparison.OrdinalIgnoreCase))
+			typeName = "Variant";
+
+		var dbType = ResolveSqlType(typeName);
+		var length = 0;
+		short precision = 0;
+		short scale = 0;
+
+		switch (dbType)
+		{
+			case SqlDbType.Binary:
+			case SqlDbType.Char:
+			case SqlDbType.Image:
+			case SqlDbType.NChar:
+			case SqlDbType.NVarChar:
+			case SqlDbType.VarBinary:
+			case SqlDbType.VarChar:
+				length = args is null || !args.Any() ? 32 : string.Equals(args[0], "max", StringComparison.OrdinalIgnoreCase) ? int.MaxValue : int.Parse(args[0]);
+				break;
+			case SqlDbType.Money:
+				precision = args is null || !args.Any() ? (short)29 : short.Parse(args[0], NumberFormatInfo.InvariantInfo);
+				scale = args is null || args.Length < 2 ? (short)4 : short.Parse(args[1], NumberFormatInfo.InvariantInfo);
+				break;
+			case SqlDbType.Decimal:
+				precision = args is null || !args.Any() ? (short)29 : short.Parse(args[0], NumberFormatInfo.InvariantInfo);
+				scale = args is null || args.Length < 2 ? (short)0 : short.Parse(args[1], NumberFormatInfo.InvariantInfo);
+				break;
+			case SqlDbType.Float:
+			case SqlDbType.Real:
+				precision = args is null || !args.Any() ? (short)29 : short.Parse(args[0], NumberFormatInfo.InvariantInfo);
+				break;
+		}
+
+		return NewType(dbType, isNotNull, length, precision, scale);
+	}
+
+	private static DataType NewType(SqlDbType type, bool isNotNull, int length, short precision, short scale)
+	{
+		return new CqlDataType(type, isNotNull, length, precision, scale);
+	}
+
+	public static SqlDbType ResolveSqlType(string typeName)
+	{
+		return (SqlDbType)Enum.Parse(typeof(SqlDbType), typeName, true);
+	}
+
+	public override DataType ResolveColumnType(Type type)
+	{
+		var isNotNull = type.GetTypeInfo().IsValueType && !Nullables.IsNullableType(type);
+		type = Nullables.GetNonNullableType(type);
+
+		switch (Interop.TypeSystem.GetTypeCode(type))
+		{
+			case TypeCode.Boolean:
+				return NewType(SqlDbType.Bit, isNotNull, 0, 0, 0);
+			case TypeCode.SByte:
+			case TypeCode.Byte:
+				return NewType(SqlDbType.TinyInt, isNotNull, 0, 0, 0);
+			case TypeCode.Int16:
+			case TypeCode.UInt16:
+				return NewType(SqlDbType.SmallInt, isNotNull, 0, 0, 0);
+			case TypeCode.Int32:
+			case TypeCode.UInt32:
+				return NewType(SqlDbType.Int, isNotNull, 0, 0, 0);
+			case TypeCode.Int64:
+			case TypeCode.UInt64:
+				return NewType(SqlDbType.BigInt, isNotNull, 0, 0, 0);
+			case TypeCode.Single:
+			case TypeCode.Double:
+				return NewType(SqlDbType.Float, isNotNull, 0, 0, 0);
+			case TypeCode.String:
+				return NewType(SqlDbType.NVarChar, isNotNull, StringDefaultSize, 0, 0);
+			case TypeCode.Char:
+				return NewType(SqlDbType.NChar, isNotNull, 1, 0, 0);
+			case TypeCode.DateTime:
+				return NewType(SqlDbType.DateTime, isNotNull, 0, 0, 0);
+			case TypeCode.Decimal:
+				return NewType(SqlDbType.Decimal, isNotNull, 0, 29, 4);
+			default:
+				if (type == typeof(byte[]))
+					return NewType(SqlDbType.VarBinary, isNotNull, BinaryDefaultSize, 0, 0);
+				else if (type == typeof(Guid))
+					return NewType(SqlDbType.UniqueIdentifier, isNotNull, 0, 0, 0);
+				else if (type == typeof(DateTimeOffset))
+					return NewType(SqlDbType.DateTimeOffset, isNotNull, 0, 0, 0);
+				else if (type == typeof(TimeSpan))
+					return NewType(SqlDbType.Time, isNotNull, 0, 0, 0);
+				else if (type.GetTypeInfo().IsEnum)
+					return NewType(SqlDbType.Int, isNotNull, 0, 0, 0);
+				else
+					throw new NotSupportedException(nameof(ResolveColumnType));
+		}
+	}
+
+	public static bool IsVariableLength(SqlDbType dbType)
+	{
+		return dbType switch
+		{
+			SqlDbType.Image or SqlDbType.NText or SqlDbType.NVarChar or SqlDbType.Text or SqlDbType.VarBinary or SqlDbType.VarChar or SqlDbType.Xml => true,
+			_ => false,
+		};
+	}
+
+	public override string Format(DataType type, bool suppressSize)
+	{
+		var sqlType = (CqlDataType)type;
+		var sb = new StringBuilder();
+
+		sb.Append(sqlType.DbType.ToString().ToUpper());
+
+		if (sqlType.Length > 0 && !suppressSize)
+		{
+			if (sqlType.Length == int.MaxValue)
+				sb.Append("(max)");
+			else
+				sb.AppendFormat(NumberFormatInfo.InvariantInfo, "({0})", sqlType.Length);
+		}
+		else if (sqlType.Precision != 0)
+		{
+			if (sqlType.Scale != 0)
+				sb.AppendFormat(NumberFormatInfo.InvariantInfo, "({0},{1})", sqlType.Precision, sqlType.Scale);
+			else
+				sb.AppendFormat(NumberFormatInfo.InvariantInfo, "({0})", sqlType.Precision);
+		}
+
+		return sb.ToString();
+	}
+}

src/Connected.ServiceModel.Client.Data/DataParameterCollection.cs

@@ -0,0 +1,125 @@
+using System.Collections;
+using System.Data.Common;
+
+namespace Connected.ServiceModel.Client.Data;
+internal sealed class DataParameterCollection : DbParameterCollection
+{
+	private readonly object _syncRoot = new();
+	public DataParameterCollection()
+	{
+		Items = new();
+	}
+
+	private List<DbParameter> Items { get; }
+	public override int Count => Items.Count;
+
+	public override object SyncRoot => _syncRoot;
+
+	public override int Add(object value)
+	{
+		if (value is not DbParameter parameter)
+			throw new InvalidCastException(nameof(DbParameter));
+
+		Items.Add(parameter);
+
+		return Items.Count - 1;
+	}
+
+	public override void AddRange(Array values)
+	{
+		foreach (var item in values)
+			Add(item);
+	}
+
+	public override void Clear()
+	{
+		Items.Clear();
+	}
+
+	public override bool Contains(object value)
+	{
+		return Items.Contains(value);
+	}
+
+	public override bool Contains(string value)
+	{
+		return Items.FirstOrDefault(f => string.Equals(f.ParameterName, value, StringComparison.OrdinalIgnoreCase)) is not null;
+	}
+
+	public override void CopyTo(Array array, int index)
+	{
+		foreach (var item in array)
+		{
+			Insert(index, item);
+			index++;
+		}
+	}
+
+	public override IEnumerator GetEnumerator()
+	{
+		return Items.GetEnumerator();
+	}
+
+	public override int IndexOf(object value)
+	{
+		if (value is not DbParameter parameter)
+			throw new InvalidCastException(nameof(DbParameter));
+
+		return Items.IndexOf(parameter);
+	}
+
+	public override int IndexOf(string parameterName)
+	{
+		if (Items.FirstOrDefault(f => string.Equals(f.ParameterName, parameterName, StringComparison.OrdinalIgnoreCase)) is DbParameter parameter)
+			return Items.IndexOf(parameter);
+
+		return -1;
+	}
+
+	public override void Insert(int index, object value)
+	{
+		if (value is not DbParameter parameter)
+			throw new InvalidCastException(nameof(DbParameter));
+
+		Items.Insert(index, parameter);
+	}
+
+	public override void Remove(object value)
+	{
+		if (value is not DbParameter parameter)
+			throw new InvalidCastException(nameof(DbParameter));
+
+		Items.Remove(parameter);
+	}
+
+	public override void RemoveAt(int index)
+	{
+		Items.RemoveAt(index);
+	}
+
+	public override void RemoveAt(string parameterName)
+	{
+		if (Items.FirstOrDefault(f => string.Equals(f.ParameterName, parameterName, StringComparison.OrdinalIgnoreCase)) is DbParameter parameter)
+			Items.Remove(parameter);
+	}
+
+	protected override DbParameter GetParameter(int index)
+	{
+		return Items[index];
+	}
+
+	protected override DbParameter GetParameter(string parameterName)
+	{
+		return Items.First(f => string.Equals(f.ParameterName, parameterName, StringComparison.OrdinalIgnoreCase));
+	}
+
+	protected override void SetParameter(int index, DbParameter value)
+	{
+		Items[index] = value;
+	}
+
+	protected override void SetParameter(string parameterName, DbParameter value)
+	{
+		Items[IndexOf(parameterName)] = value;
+	}
+}

src/Connected.ServiceModel.Client.Data/DeleteCommandBuilder.cs

@@ -0,0 +1,56 @@
+using System.Collections.Concurrent;
+using System.Reflection;
+using Connected.Entities.Annotations;
+using Connected.Entities.Storage;
+
+namespace Connected.ServiceModel.Client.Data;
+internal sealed class DeleteCommandBuilder : CommandBuilder
+{
+	private static readonly ConcurrentDictionary<string, StorageOperation> _cache;
+
+	static DeleteCommandBuilder()
+	{
+		_cache = new();
+	}
+
+	private static ConcurrentDictionary<string, StorageOperation> Cache => _cache;
+
+	protected override StorageOperation OnBuild()
+	{
+		WriteLine($"DELETE [{Schema.Schema}].[{Schema.Name}] (");
+		WriteWhere();
+
+		var result = new StorageOperation { CommandText = CommandText };
+
+		foreach (var parameter in Parameters)
+			result.AddParameter(parameter);
+
+		Cache.TryAdd(Entity.GetType().FullName, result);
+
+		return result;
+	}
+
+	private void WriteWhere()
+	{
+		Write("WHERE ");
+
+		foreach (var property in Properties)
+		{
+			if (property.GetCustomAttribute<PrimaryKeyAttribute>() is not null)
+			{
+				var columnName = ColumnName(property);
+
+				CreateParameter(property);
+
+				Write($"{ColumnName} = @{ColumnName}");
+			}
+		}
+
+		Write(";");
+	}
+
+	protected override bool TryGetExisting(out StorageOperation? result)
+	{
+		return Cache.TryGetValue(Entity.GetType().FullName, out result);
+	}
+}

src/Connected.ServiceModel.Client.Data/InsertCommandBuilder.cs

@@ -0,0 +1,67 @@
+using System.Collections.Concurrent;
+using System.Reflection;
+using Connected.Entities.Annotations;
+using Connected.Entities.Storage;
+
+namespace Connected.ServiceModel.Client.Data;
+internal sealed class InsertCommandBuilder : CommandBuilder
+{
+	private static readonly ConcurrentDictionary<string, StorageOperation> _cache;
+
+	static InsertCommandBuilder()
+	{
+		_cache = new();
+	}
+
+	private static ConcurrentDictionary<string, StorageOperation> Cache => _cache;
+
+	protected override StorageOperation OnBuild()
+	{
+		WriteLine($"INSERT [{Schema.Schema}].[{Schema.Name}] (");
+
+		WriteColumns();
+		WriteLine(")");
+		Write("VALUES (");
+		WriteValues();
+		WriteLine(");");
+
+		var result = new StorageOperation { CommandText = CommandText };
+
+		foreach (var parameter in Parameters)
+			result.AddParameter(parameter);
+
+		Cache.TryAdd(Entity.GetType().FullName, result);
+
+		return result;
+	}
+
+	private void WriteColumns()
+	{
+		foreach (var property in Properties)
+		{
+			CreateParameter(property);
+
+			Write($"{ColumnName(property)}, ");
+		}
+
+		Trim();
+	}
+
+	private void WriteValues()
+	{
+		foreach (var property in Properties)
+		{
+			if (property.GetCustomAttribute<PrimaryKeyAttribute>() is not null)
+				continue;
+
+			Write($"@{ColumnName(property)}, ");
+		}
+
+		Trim();
+	}
+
+	protected override bool TryGetExisting(out StorageOperation? result)
+	{
+		return Cache.TryGetValue(Entity.GetType().FullName, out result);
+	}
+}

src/Connected.ServiceModel.Client.Data/Remote/RemoteTableColumn.cs

@@ -0,0 +1,12 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Connected.ServiceModel.Client.Data.Remote;
+internal sealed class RemoteTableColumn
+{
+	[Required, MaxLength(128)]
+	public string Name { get; set; } = default!;
+	[Required, MaxLength(128)]
+	public string DataType { get; set; } = default!;
+	public bool IsPartitionKey { get; set; }
+	public bool IsPrimaryKey { get; set; }
+}

src/Connected.ServiceModel.Client.Data/Remote/RemoteTableService.cs

@@ -0,0 +1,112 @@
+using System.Collections.Immutable;
+using System.Text.Json.Nodes;
+using Connected.Net;
+using Connected.ServiceModel.Client.Net;
+using Connected.ServiceModel.Client.Subscription;
+
+namespace Connected.ServiceModel.Client.Data.Remote;
+
+internal sealed class RemoteTableService
+{
+	//TODO:load it from config or environment.
+	private const string AccessToken = "Temp";
+	public RemoteTableService(IHttpService http, IConnectedServer server, ISubscriptionService subscription)
+	{
+		Http = http;
+		Server = server;
+		Subscription = subscription;
+	}
+
+	private IHttpService Http { get; }
+	private IConnectedServer Server { get; }
+	private ISubscriptionService Subscription { get; }
+	private int SubscriptionId { get; set; }
+
+	public async Task<JsonArray> Query(string commandText)
+	{
+		await Initialize();
+
+		var url = await Server.SelectUrl(new ConnectedServerUrlArgs { Kind = ConnectedUrlKind.TableStorage });
+
+		if (await Http.Post<JsonArray>($"{url}/query", new QueryTableArgs
+		{
+			CommandText = commandText,
+			AccessToken = AccessToken,
+			Subscription = SubscriptionId
+		}) is not JsonArray result)
+			return new JsonArray();
+
+		return result;
+	}
+
+	public async Task<ImmutableList<RemoteTableColumn>> QueryColumns(string tableName)
+	{
+		await Initialize();
+
+		var url = await Server.SelectUrl(new ConnectedServerUrlArgs { Kind = ConnectedUrlKind.TableStorage });
+
+		if (await Http.Post<List<RemoteTableColumn>>($"{url}/queryColumns", new TableSchemaArgs
+		{
+			TableName = tableName,
+			AccessToken = AccessToken,
+			Subscription = SubscriptionId
+		}) is not List<RemoteTableColumn> result)
+			return ImmutableList<RemoteTableColumn>.Empty;
+
+		return result.ToImmutableList();
+	}
+
+	public async Task<bool> TableExists(string tableName)
+	{
+		await Initialize();
+
+		var url = await Server.SelectUrl(new ConnectedServerUrlArgs { Kind = ConnectedUrlKind.TableStorage });
+
+		return await Http.Post<bool>($"{url}/tableExists", new TableSchemaArgs
+		{
+			TableName = tableName,
+			AccessToken = AccessToken,
+			Subscription = SubscriptionId
+		});
+	}
+
+	public async Task Update(string commandText)
+	{
+		await Initialize();
+
+		var url = await Server.SelectUrl(new ConnectedServerUrlArgs { Kind = ConnectedUrlKind.TableStorage });
+
+		await Http.Post($"{url}/update", new UpdateTableArgs
+		{
+			CommandText = commandText,
+			AccessToken = AccessToken,
+			Subscription = SubscriptionId
+		});
+	}
+
+	public async Task CreateTable(string tableName, List<RemoteTableColumn> columns)
+	{
+		await Initialize();
+
+		var url = await Server.SelectUrl(new ConnectedServerUrlArgs { Kind = ConnectedUrlKind.TableStorage });
+
+		await Http.Post($"{url}/createTable", new CreateTableArgs
+		{
+			Name = tableName,
+			Columns = columns,
+			AccessToken = AccessToken,
+			Subscription = SubscriptionId
+		});
+	}
+
+	private async Task Initialize()
+	{
+		if (SubscriptionId > 0)
+			return;
+
+		if (await Subscription.Select() is not ISubscription subscription)
+			throw new NullReferenceException(nameof(ISubscription));
+
+		SubscriptionId = subscription.Id;
+	}
+}

src/Connected.ServiceModel.Client.Data/Remote/TableArgs.cs

@@ -0,0 +1,33 @@
+using System.ComponentModel.DataAnnotations;
+using Connected.Annotations;
+
+namespace Connected.ServiceModel.Client.Data.Remote;
+internal class TableArgs : ServiceArgs
+{
+}
+
+internal sealed class QueryTableArgs : TableArgs
+{
+	[Required]
+	public string CommandText { get; set; } = default!;
+}
+
+internal sealed class TableSchemaArgs : ServiceArgs
+{
+	[Required, MaxLength(128)]
+	public string TableName { get; set; } = default!;
+}
+
+internal sealed class CreateTableArgs : ServiceArgs
+{
+	[Required, MaxLength(128)]
+	public string Name { get; set; } = default!;
+	[NonDefault]
+	public List<RemoteTableColumn> Columns { get; set; }
+}
+
+internal sealed class UpdateTableArgs : ServiceArgs
+{
+	[Required]
+	public string CommandText { get; set; } = default!;
+}

src/Connected.ServiceModel.Client.Data/Schema/ExistingSchema.cs

@@ -0,0 +1,45 @@
+using Connected.Data.Schema;
+
+namespace Connected.ServiceModel.Client.Data.Schema;
+internal sealed class ExistingSchema : ISchema
+{
+	public ExistingSchema()
+	{
+		Columns = new();
+	}
+
+	public List<ISchemaColumn> Columns { get; }
+
+	public string? Schema => null;
+
+	public string? Name { get; set; }
+
+	public string? Type { get; set; }
+
+	public bool Ignore { get; set; }
+
+	public async Task Load(SchemaExecutionContext context)
+	{
+		Name = context.Schema.Name;
+		Type = context.Schema.Type;
+
+		if (!await context.Remote.TableExists(context.Schema.Name))
+			return;
+
+		var columns = await context.Remote.QueryColumns(context.Schema.Name);
+
+		foreach (var column in columns)
+		{
+			Columns.Add(new SchemaColumn
+			{
+				Name = column.Name,
+				//TODO:populate properties
+			});
+		}
+	}
+
+	public bool Equals(ISchema? other)
+	{
+		throw new NotImplementedException();
+	}
+}

src/Connected.ServiceModel.Client.Data/Schema/SchemaColumn.cs

@@ -0,0 +1,43 @@
+using System.Data;
+using System.Reflection;
+using Connected.Data.Schema;
+using Connected.Entities.Annotations;
+
+namespace Connected.ServiceModel.Client.Data.Schema;
+internal sealed class SchemaColumn : ISchemaColumn
+{
+	public string? Name { get; set; }
+
+	public DbType DataType { get; set; }
+
+	public bool IsIdentity { get; set; }
+
+	public bool IsUnique { get; set; }
+
+	public bool IsIndex { get; set; }
+
+	public bool IsPrimaryKey { get; set; }
+
+	public bool IsVersion { get; set; }
+
+	public string? DefaultValue { get; set; }
+
+	public int MaxLength { get; set; }
+
+	public bool IsNullable { get; set; }
+
+	public string? Index { get; set; }
+
+	public int Scale { get; set; }
+
+	public int Precision { get; set; }
+
+	public DateKind DateKind { get; set; }
+
+	public BinaryKind BinaryKind { get; set; }
+
+	public int DatePrecision { get; set; }
+
+	public bool IsPartitionKey { get; set; }
+	public PropertyInfo Property { get; set; }
+}

src/Connected.ServiceModel.Client.Data/Schema/SchemaExecutionContext.cs

@@ -0,0 +1,16 @@
+using Connected.Data.Schema;
+using Connected.ServiceModel.Client.Data.Remote;
+
+namespace Connected.ServiceModel.Client.Data.Schema;
+internal sealed class SchemaExecutionContext
+{
+	public SchemaExecutionContext(ISchema schema, RemoteTableService remote)
+	{
+		Schema = schema;
+		Remote = remote;
+	}
+
+	public ExistingSchema ExistingSchema { get; set; }
+	public ISchema Schema { get; }
+	public RemoteTableService Remote { get; }
+}

src/Connected.ServiceModel.Client.Data/Schema/SynchronizationCommand.cs

@@ -0,0 +1,4 @@
+namespace Connected.ServiceModel.Client.Data.Schema;
+internal class SynchronizationCommand
+{
+}

src/Connected.ServiceModel.Client.Data/Schema/SynchronizationQuery.cs

@@ -0,0 +1,19 @@
+namespace Connected.ServiceModel.Client.Data.Schema;
+internal class SynchronizationQuery<T> : SynchronizationCommand
+{
+	protected SchemaExecutionContext Context { get; private set; }
+
+	public async Task<T> Execute(SchemaExecutionContext context)
+	{
+		Context = context;
+
+		return await OnExecute();
+	}
+
+	protected virtual async Task<T> OnExecute()
+	{
+		await Task.CompletedTask;
+
+		return default;
+	}
+}

src/Connected.ServiceModel.Client.Data/Schema/SynchronizationTransaction.cs

@@ -0,0 +1,17 @@
+namespace Connected.ServiceModel.Client.Data.Schema;
+internal class SynchronizationTransaction : SynchronizationCommand
+{
+	protected SchemaExecutionContext Context { get; private set; }
+
+	public async Task Execute(SchemaExecutionContext context)
+	{
+		Context = context;
+
+		await OnExecute();
+	}
+
+	protected virtual async Task OnExecute()
+	{
+		await Task.CompletedTask;
+	}
+}

src/Connected.ServiceModel.Client.Data/Schema/TableCreate.cs

@@ -0,0 +1,127 @@
+using Connected.Collections;
+using Connected.Interop;
+using Connected.ServiceModel.Annotations;
+using Connected.ServiceModel.Client.Data.Remote;
+
+namespace Connected.ServiceModel.Client.Data.Schema;
+internal sealed class TableCreate : TableTransaction
+{
+	//private const string KeysExceptionMessage = "A ISchemaColumn cannot have a PartitionKeyAttribute and PrimaryKeyAttribute set. Use either PartitionKey or PrimaryKey attribute.";
+	//private const string NoPartitionKeyMessage = "Schema must have at least one property with PartitionKeyAttribute.";
+
+	protected override async Task OnExecute()
+	{
+		var columns = new List<RemoteTableColumn>();
+
+		Context.Schema.Columns.SortByOrdinal();
+
+		foreach (var column in Context.Schema.Columns)
+		{
+			columns.Add(new RemoteTableColumn
+			{
+				DataType = CreateDataTypeMetaData(column),
+				IsPartitionKey = column.Property?.FindAttribute<PartitionKeyAttribute>() is not null,
+				IsPrimaryKey = column.IsPrimaryKey,
+				Name = column.Name
+			});
+		}
+
+		await Context.Remote.CreateTable(Context.Schema.Name, columns);
+	}
+
+	//private List<ISchemaColumn> PartitionKeys
+	//{
+	//	get
+	//	{
+	//		var result = new List<ISchemaColumn>();
+
+	//		foreach (var column in Context.Schema.Columns)
+	//		{
+	//			if (column.Property?.FindAttribute<PartitionKeyAttribute>() is not null)
+	//			{
+	//				if (column.IsPrimaryKey)
+	//					throw new InvalidOperationException($"{KeysExceptionMessage} ({column.Name})");
+
+	//				result.Add(column);
+	//			}
+	//		}
+
+	//		return result;
+	//	}
+	//}
+
+	//private List<ISchemaColumn> PrimaryKeys
+	//{
+	//	get
+	//	{
+	//		var result = new List<ISchemaColumn>();
+
+	//		foreach (var column in Context.Schema.Columns)
+	//		{
+	//			if (column.IsPrimaryKey)
+	//			{
+	//				if (column.Property?.FindAttribute<PartitionKeyAttribute>() is not null)
+	//					throw new InvalidOperationException($"{KeysExceptionMessage} ({column.Name})");
+
+	//				result.Add(column);
+	//			}
+	//		}
+
+	//		return result;
+	//	}
+	//}
+
+	//private string CommandText
+	//{
+	//	get
+	//	{
+	//		var partitionKeys = PartitionKeys;
+	//		var primaryKeys = PrimaryKeys;
+
+	//		if (!partitionKeys.Any())
+	//			throw new InvalidOperationException($"{NoPartitionKeyMessage} ({Context.Schema.Name})");
+
+	//		var keysCount = partitionKeys.Count + primaryKeys.Count;
+	//		var text = new StringBuilder();
+	//		var name = Temporary ? TemporaryName : Context.Schema.Name;
+
+	//		text.AppendLine($"CREATE TABLE {name}");
+	//		text.AppendLine("(");
+	//		var comma = string.Empty;
+
+	//		for (var i = 0; i < Context.Schema.Columns.Count; i++)
+	//		{
+	//			text.AppendLine($"{comma} {CreateColumnCommandText(Context.Schema.Columns[i])}");
+
+	//			comma = ",";
+	//		}
+
+	//		text.Append("PRIMARY KEY (");
+
+	//		if (keysCount > 1)
+	//			text.Append('(');
+
+	//		for (var i = 0; i < partitionKeys.Count; i++)
+	//		{
+	//			text.Append(partitionKeys[i].Name);
+
+	//			if (i < partitionKeys.Count - 1)
+	//				text.Append(',');
+	//		}
+
+	//		if (keysCount > 1)
+	//			text.Append(')');
+
+	//		for (var i = 0; i < primaryKeys.Count; i++)
+	//		{
+	//			text.Append(primaryKeys[i].Name);
+
+	//			if (i < primaryKeys.Count - 1)
+	//				text.Append(',');
+	//		}
+
+	//		text.AppendLine(");");
+
+	//		return text.ToString();
+	//	}
+}

src/Connected.ServiceModel.Client.Data/Schema/TableExists.cs

@@ -0,0 +1,8 @@
+namespace Connected.ServiceModel.Client.Data.Schema;
+internal class TableExists : SynchronizationQuery<bool>
+{
+	protected override async Task<bool> OnExecute()
+	{
+		return await Context.Remote.TableExists(Context.Schema.Name);
+	}
+}

src/Connected.ServiceModel.Client.Data/Schema/TableSynchronize.cs

@@ -0,0 +1,93 @@
+using Connected.Data.Schema;
+
+namespace Connected.ServiceModel.Client.Data.Schema;
+internal sealed class TableSynchronize : TableTransaction
+{
+	private ExistingSchema? _existingSchema;
+
+	private bool TableExists { get; set; }
+
+	protected override async Task OnExecute()
+	{
+		TableExists = await new TableExists().Execute(Context);
+
+		if (!TableExists)
+		{
+			await new TableCreate().Execute(Context);
+			return;
+		}
+
+		return;
+
+		_existingSchema = new();
+
+		await _existingSchema.Load(Context);
+
+		Context.ExistingSchema = ExistingSchema;
+
+		//TODO: implement alter table
+
+		//if (ShouldRecreate)
+		//	await new TableRecreate(ExistingSchema).Execute(Context);
+		//else if (ShouldAlter)
+		//	await new TableAlter(ExistingSchema).Execute(Context);
+	}
+
+	private bool ShouldAlter => !Context.Schema.Equals(ExistingSchema);
+	private bool ShouldRecreate => HasIdentityChanged || HasColumnMetadataChanged;
+
+	private ExistingSchema? ExistingSchema => _existingSchema;
+
+	private bool HasIdentityChanged
+	{
+		get
+		{
+			foreach (var column in Context.Schema.Columns)
+			{
+				if (ExistingSchema.Columns.FirstOrDefault(f => string.Equals(f.Name, column.Name, StringComparison.OrdinalIgnoreCase)) is not ISchemaColumn existing)
+					return true;
+
+				if (existing.IsIdentity != column.IsIdentity)
+					return true;
+			}
+
+			foreach (var existing in ExistingSchema.Columns)
+			{
+				var column = Context.Schema.Columns.FirstOrDefault(f => string.Equals(f.Name, existing.Name, StringComparison.OrdinalIgnoreCase));
+
+				if (column is null && existing.IsIdentity)
+					return true;
+				else if (column is not null && column.IsIdentity != existing.IsIdentity)
+					return true;
+			}
+
+			return false;
+		}
+	}
+
+	private bool HasColumnMetadataChanged
+	{
+		get
+		{
+			foreach (var existing in ExistingSchema.Columns)
+			{
+				if (Context.Schema.Columns.FirstOrDefault(f => string.Equals(f.Name, existing.Name, StringComparison.OrdinalIgnoreCase)) is not ISchemaColumn column)
+					continue;
+
+				if (column.DataType != existing.DataType
+					|| column.MaxLength != existing.MaxLength
+					|| column.IsNullable != existing.IsNullable
+					|| column.IsVersion != existing.IsVersion
+					|| column.Precision != existing.Precision
+					|| column.Scale != existing.Scale
+					|| column.DateKind != existing.DateKind
+					|| column.BinaryKind != existing.BinaryKind
+					|| column.DatePrecision != existing.DatePrecision)
+					return true;
+			}
+
+			return false;
+		}
+	}
+}
+

src/Connected.ServiceModel.Client.Data/Schema/TableTransaction.cs

@@ -0,0 +1,51 @@
+using System.Data;
+using System.Text;
+using Connected.Data.Schema;
+
+namespace Connected.ServiceModel.Client.Data.Schema;
+internal class TableTransaction : SynchronizationTransaction
+{
+	protected static string CreateColumnCommandText(ISchemaColumn column)
+	{
+		var builder = new StringBuilder();
+
+		builder.AppendFormat($"{column.Name} {CreateDataTypeMetaData(column)} ");
+
+		return builder.ToString();
+	}
+
+	protected static string CreateDataTypeMetaData(ISchemaColumn column)
+	{
+		return column.DataType switch
+		{
+			DbType.AnsiString => "text",
+			DbType.Binary => "blob",
+			DbType.Byte => "tinyint",
+			DbType.Boolean => "boolean",
+			DbType.Currency => "decimal",
+			DbType.Date => "timestamp",
+			DbType.DateTime => "timestamp",
+			DbType.Decimal => "decimal",
+			DbType.Double => "double",
+			DbType.Guid => "uuid",
+			DbType.Int16 => "smallint",
+			DbType.Int32 => "int",
+			DbType.Int64 => "bigint",
+			DbType.Object => "blob",
+			DbType.SByte => "smallint",
+			DbType.Single => "float",
+			DbType.String => "text",
+			DbType.Time => "time",
+			DbType.UInt16 => "int",
+			DbType.UInt32 => "bigint",
+			DbType.UInt64 => "float",
+			DbType.VarNumeric => "decimal",
+			DbType.AnsiStringFixedLength => "text",
+			DbType.StringFixedLength => "text",
+			DbType.Xml => "text",
+			DbType.DateTime2 => "timestamp",
+			DbType.DateTimeOffset => "timestamp",
+			_ => throw new NotSupportedException(),
+		};
+	}
+}

src/Connected.ServiceModel.Client.Data/TableCommand.cs

@@ -0,0 +1,68 @@
+using Connected.Data.Storage;
+using Connected.Entities.Storage;
+
+namespace Connected.ServiceModel.Client.Data;
+
+internal abstract class TableCommand : IStorageCommand
+{
+	protected TableCommand(IStorageOperation operation, IStorageConnection connection)
+	{
+		Connection = connection;
+		Operation = operation;
+	}
+
+	protected bool IsDisposed { get; private set; }
+	public IStorageOperation Operation { get; }
+	public IStorageConnection? Connection { get; protected set; }
+
+	protected virtual async ValueTask DisposeAsync(bool disposing)
+	{
+		if (!IsDisposed)
+		{
+			if (disposing)
+			{
+				Connection = null;
+
+				await OnDisposingAsync();
+			}
+
+			IsDisposed = true;
+		}
+	}
+
+	protected virtual async ValueTask OnDisposingAsync()
+	{
+		await ValueTask.CompletedTask;
+	}
+
+	protected virtual void OnDisposing()
+	{
+	}
+
+	public async ValueTask DisposeAsync()
+	{
+		await DisposeAsync(true);
+		GC.SuppressFinalize(this);
+	}
+
+	protected virtual void Dispose(bool disposing)
+	{
+		if (!IsDisposed)
+		{
+			if (disposing)
+			{
+				Connection = null;
+
+				OnDisposing();
+			}
+
+			IsDisposed = true;
+		}
+	}
+
+	public void Dispose()
+	{
+		Dispose(true);
+		GC.SuppressFinalize(this);
+	}
+}

src/Connected.ServiceModel.Client.Data/TableConnection.cs

@@ -0,0 +1,87 @@
+using System.Data;
+using System.Diagnostics.CodeAnalysis;
+using Connected.ServiceModel.Client.Data.Remote;
+
+namespace Connected.ServiceModel.Client.Data;
+/// <summary>
+/// Represents the REST connection to the TomPIT.connected Table Service.
+/// </summary>
+internal sealed class TableConnection : IDbConnection
+{
+	public TableConnection(RemoteTableService tables, string connectionString)
+	{
+		Tables = tables;
+		ConnectionString = connectionString;
+	}
+
+	public RemoteTableService Tables { get; }
+
+	/// <summary>
+	/// The connection string (URL) used when performing the requests. 
+	/// </summary>
+	[AllowNull]
+	public string ConnectionString { get; set; }
+	/// <summary>
+	/// The request timeout in seconds.
+	/// </summary>
+	public int ConnectionTimeout => 120;
+	/// <summary>
+	/// The database (partition) on the server to be used.
+	/// </summary>
+	public string Database { get; private set; }
+	/// <summary>
+	/// The connection state. It's always open since it's a stateless connection.
+	/// </summary>
+	public ConnectionState State => ConnectionState.Open;
+	/// <summary>
+	/// Starts the new storage transaction.
+	/// </summary>
+	/// <returns>A new <see cref="IDbTransaction"/>.</returns>
+	public IDbTransaction BeginTransaction()
+	{
+		return new TableTransaction(this);
+	}
+	/// <summary>
+	/// Starts the new storage transaction.
+	/// </summary>
+	/// <param name="il">The isolation level. This property is ignored on this connection since 
+	/// it's always <see cref="IsolationLevel.Snapshot"/>.</param>
+	/// <returns>A new <see cref="IDbTransaction"/>.</returns>
+	public IDbTransaction BeginTransaction(IsolationLevel il)
+	{
+		return BeginTransaction();
+	}
+	/// <summary>
+	/// The database is actually the Partition on the remote service. Calling this method
+	/// changes the partition to be used on the remote.
+	/// </summary>
+	/// <param name="databaseName">The partition name. It is created if it doesn't exist.</param>
+	public void ChangeDatabase(string databaseName)
+	{
+		Database = databaseName;
+	}
+	/// <summary>
+	/// This method completes the connection by calling  <see cref="IDbTransaction.Rollback"/>
+	/// if <see cref="IDbTransaction.Commit"/> has not been called.
+	/// </summary>
+	public void Close()
+	{
+
+	}
+
+	public IDbCommand CreateCommand()
+	{
+		return new TableDataCommand(Tables);
+	}
+
+	public void Dispose()
+	{
+	}
+	/// <summary>
+	/// This method doesn't do anything since the connection is stateless any is theoretically
+	/// always in open state.
+	/// </summary>
+	public void Open()
+	{
+	}
+}

src/Connected.ServiceModel.Client.Data/TableDataCommand.cs

@@ -0,0 +1,96 @@
+using System.Data;
+using System.Data.Common;
+using System.Diagnostics.CodeAnalysis;
+using System.Text;
+using Connected.ServiceModel.Client.Data.Remote;
+
+namespace Connected.ServiceModel.Client.Data;
+internal sealed class TableDataCommand : DbCommand
+{
+	public TableDataCommand(RemoteTableService tables)
+	{
+		Parameters = new DataParameterCollection();
+		Tables = tables;
+	}
+
+	public new DataParameterCollection Parameters { get; }
+	public RemoteTableService Tables { get; }
+	[AllowNull]
+	public override string CommandText { get; set; }
+	public override int CommandTimeout { get; set; } = 120;
+	public override CommandType CommandType { get; set; } = CommandType.Text;
+	protected override DbConnection? DbConnection { get; set; }
+	protected override DbParameterCollection DbParameterCollection => Parameters;
+	protected override DbTransaction? DbTransaction { get; set; }
+	public override bool DesignTimeVisible { get; set; }
+	public override UpdateRowSource UpdatedRowSource { get; set; }
+
+	protected override DbParameter CreateDbParameter()
+	{
+		return new TableDataParameter();
+	}
+
+	public override async Task<int> ExecuteNonQueryAsync(CancellationToken cancellationToken)
+	{
+		await Tables.Update(ParseCommandText());
+
+		return 0;
+	}
+
+	public override int ExecuteNonQuery()
+	{
+		AsyncUtils.RunSync(() => Tables.Update(ParseCommandText()));
+
+		return 0;
+	}
+
+	protected override async Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBehavior behavior, CancellationToken cancellationToken)
+	{
+		return new TableDataReader(await Tables.Query(ParseCommandText()));
+	}
+
+	protected override DbDataReader ExecuteDbDataReader(CommandBehavior behavior)
+	{
+		return new TableDataReader(AsyncUtils.RunSync(() => Tables.Query(ParseCommandText())));
+	}
+
+	private string ParseCommandText()
+	{
+		var text = new StringBuilder(CommandText);
+
+		foreach (IDbDataParameter parameter in Parameters)
+			text = text.Replace(parameter.ParameterName, ParseValue(parameter));
+
+		return text.ToString();
+	}
+
+	private static string? ParseValue(IDbDataParameter parameter)
+	{
+		if (parameter.Value is null || parameter.Value == DBNull.Value)
+			return "null";
+
+		return parameter.DbType switch
+		{
+			DbType.AnsiString or DbType.String or DbType.AnsiStringFixedLength or DbType.StringFixedLength or DbType.Xml => $"'{parameter.Value}'",
+			_ => parameter.Value.ToString(),
+		};
+	}
+
+	public override void Cancel()
+	{
+	}
+
+	public override object? ExecuteScalar()
+	{
+		var reader = ExecuteReader();
+
+		if (reader.Read())
+			return reader[0];
+
+		return null;
+	}
+
+	public override void Prepare()
+	{
+	}
+}

src/Connected.ServiceModel.Client.Data/TableDataConnection.cs

@@ -0,0 +1,62 @@
+using System.Data;
+using System.Data.Common;
+using Connected.Annotations;
+using Connected.Data.Storage;
+using Connected.ServiceModel.Client.Data.Remote;
+
+namespace Connected.ServiceModel.Client.Data;
+
+[ServiceRegistration(ServiceRegistrationMode.Auto, ServiceRegistrationScope.Transient)]
+internal sealed class TableDataConnection : DatabaseConnection
+{
+	public TableDataConnection(RemoteTableService tables, ICancellationContext context) : base(context)
+	{
+		Tables = tables;
+	}
+	private RemoteTableService Tables { get; }
+
+	protected override void SetupParameters(IStorageCommand command, IDbCommand cmd)
+	{
+		if (cmd.Parameters.Count > 0)
+		{
+			foreach (DbParameter i in cmd.Parameters)
+				i.Value = DBNull.Value;
+
+			return;
+		}
+
+		if (command.Operation.Parameters is null)
+			return;
+
+		foreach (var i in command.Operation.Parameters)
+		{
+			cmd.Parameters.Add(new TableDataParameter
+			{
+				ParameterName = i.Name,
+				DbType = i.Type,
+				Direction = i.Direction
+			});
+		}
+	}
+
+	protected override object? GetParameterValue(IDbCommand command, string parameterName)
+	{
+		if (command is TableDataCommand cmd)
+			return cmd.Parameters[parameterName].Value;
+
+		return null;
+	}
+
+	protected override void SetParameterValue(IDbCommand command, string parameterName, object? value)
+	{
+		if (command is TableDataCommand cmd)
+			cmd.Parameters[parameterName].Value = value;
+	}
+
+	protected override async Task<IDbConnection> OnCreateConnection()
+	{
+		await Task.CompletedTask;
+
+		return new TableConnection(Tables, ConnectionString);
+	}
+}

src/Connected.ServiceModel.Client.Data/TableDataParameter.cs

@@ -0,0 +1,20 @@
+using System.Data;
+using System.Data.Common;
+
+namespace Connected.ServiceModel.Client.Data;
+internal class TableDataParameter : DbParameter
+{
+	public override DbType DbType { get; set; }
+	public override ParameterDirection Direction { get; set; }
+	public override bool IsNullable { get; set; }
+	public override string? ParameterName { get; set; }
+	public override int Size { get; set; }
+	public override string? SourceColumn { get; set; }
+	public override bool SourceColumnNullMapping { get; set; }
+	public override object? Value { get; set; }
+
+	public override void ResetDbType()
+	{
+
+	}
+}

src/Connected.ServiceModel.Client.Data/TableDataReader.cs

@@ -0,0 +1,221 @@
+using System.Collections;
+using System.Data.Common;
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json.Nodes;
+
+namespace Connected.ServiceModel.Client.Data;
+internal sealed class TableDataReader : DbDataReader
+{
+	public TableDataReader(JsonArray items)
+	{
+		Items = items;
+	}
+
+	public override object this[int ordinal] => throw new NotImplementedException();
+
+	public override object this[string name] => throw new NotImplementedException();
+
+	private JsonArray Items { get; }
+	private int Index { get; set; } = -1;
+	private JsonObject? Current => Index < 0 ? null : Items[Index] as JsonObject;
+	public override int Depth => 1;
+	public override int FieldCount => Current is null ? 0 : Current.Count;
+
+	public override bool HasRows => Items.Any();
+
+	public override bool IsClosed => false;
+
+	public override int RecordsAffected => Items.Count;
+
+	public override bool GetBoolean(int ordinal)
+	{
+		return GetValue<bool>(ordinal);
+	}
+
+	public override byte GetByte(int ordinal)
+	{
+		return GetValue<byte>(ordinal);
+	}
+
+	public override long GetBytes(int ordinal, long dataOffset, byte[]? buffer, int bufferOffset, int length)
+	{
+		var value = GetValue<string>(ordinal);
+		var bytes = Convert.FromBase64String(value);
+
+		buffer ??= new byte[bufferOffset + length];
+
+		for (var i = 0; i < length; i++)
+			buffer[bufferOffset + i] = bytes[dataOffset + i];
+
+		return length;
+	}
+
+	public override char GetChar(int ordinal)
+	{
+		return GetValue<char>(ordinal);
+	}
+
+	public override long GetChars(int ordinal, long dataOffset, char[]? buffer, int bufferOffset, int length)
+	{
+		var value = GetValue<string>(ordinal);
+		var bytes = Convert.FromBase64String(value);
+
+		buffer ??= new char[bufferOffset + length];
+
+		for (var i = 0; i < length; i++)
+			buffer[bufferOffset + i] = (char)bytes[dataOffset + i];
+
+		return length;
+	}
+
+	public override string GetDataTypeName(int ordinal)
+	{
+		/*
+		 * TODO: resolve appropriate type
+		 */
+		return typeof(string).Name;
+	}
+
+	public override DateTime GetDateTime(int ordinal)
+	{
+		return GetValue<DateTime>(ordinal);
+	}
+
+	public override decimal GetDecimal(int ordinal)
+	{
+		return GetValue<decimal>(ordinal);
+	}
+
+	public override double GetDouble(int ordinal)
+	{
+		return GetValue<double>(ordinal);
+	}
+
+	public override IEnumerator GetEnumerator()
+	{
+		return Items.GetEnumerator();
+	}
+
+	[return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields | DynamicallyAccessedMemberTypes.PublicProperties)]
+	public override Type GetFieldType(int ordinal)
+	{
+		/*
+		 * TODO: resolve appropriate type
+		 */
+		return typeof(string);
+	}
+
+	public override float GetFloat(int ordinal)
+	{
+		return GetValue<float>(ordinal);
+	}
+
+	public override Guid GetGuid(int ordinal)
+	{
+		return GetValue<Guid>(ordinal);
+	}
+
+	public override short GetInt16(int ordinal)
+	{
+		return GetValue<short>(ordinal);
+	}
+
+	public override int GetInt32(int ordinal)
+	{
+		return GetValue<int>(ordinal);
+	}
+
+	public override long GetInt64(int ordinal)
+	{
+		return GetValue<long>(ordinal);
+	}
+
+	public override string GetName(int ordinal)
+	{
+		if (Current is null)
+			throw new NullReferenceException();
+
+		if (Current.ElementAt(ordinal).Key is string key)
+			return key;
+
+		throw new NullReferenceException();
+	}
+
+	public override int GetOrdinal(string name)
+	{
+		if (Current is null)
+			throw new NullReferenceException();
+
+		for (var i = 0; i < Current.Count; i++)
+		{
+			if (string.Equals(Current.ElementAt(i).Key, name, StringComparison.OrdinalIgnoreCase))
+				return i;
+		}
+
+		return -1;
+	}
+
+	public override string GetString(int ordinal)
+	{
+		return GetValue<string>(ordinal);
+	}
+
+	public override object GetValue(int ordinal)
+	{
+		return GetValue<object>(ordinal);
+	}
+
+	public override int GetValues(object[] values)
+	{
+		if (Current is null)
+			throw new NullReferenceException();
+
+		for (var i = 0; i < Current.Count; i++)
+		{
+			var value = Current.ElementAt(i);
+
+			if (value.Value is not null)
+				values[i] = value.Value.AsValue().GetValue<object>();
+		}
+
+		return Current.Count;
+	}
+
+	public override bool IsDBNull(int ordinal)
+	{
+		return false;
+	}
+
+	public override bool NextResult()
+	{
+		return false;
+	}
+
+	public override bool Read()
+	{
+		if (Items.Count >= Index + 1)
+		{
+			Index++;
+
+			return true;
+		}
+
+		return false;
+	}
+
+	private T GetValue<T>(int ordinal)
+	{
+		return GetCurrentValue(ordinal).GetValue<T>();
+	}
+
+	private JsonValue GetCurrentValue(int ordinal)
+	{
+		if (Current is null)
+			throw new NullReferenceException();
+
+		if (Current.ElementAt(ordinal).Value is not JsonValue value)
+			throw new NullReferenceException();
+
+		return value;
+	}
+}

src/Connected.ServiceModel.Client.Data/TableReader.cs

@@ -0,0 +1,74 @@
+using System.Collections.Immutable;
+using System.Data;
+using Connected.Data.Storage;
+using Connected.Entities.Storage;
+
+namespace Connected.ServiceModel.Client.Data;
+
+internal sealed class TableReader<T> : TableCommand, IStorageReader<T>
+{
+	public TableReader(IStorageOperation operation, IStorageConnection connection)
+		: base(operation, connection)
+	{
+	}
+
+	public async Task<ImmutableList<T>?> Query()
+	{
+		if (Connection is null)
+			return default;
+
+		try
+		{
+			var result = await Connection.Query<T>(this);
+
+			if (Connection.Behavior == StorageConnectionMode.Isolated)
+				await Connection.Commit();
+
+			return result;
+		}
+		finally
+		{
+			if (Connection.Behavior == StorageConnectionMode.Isolated)
+			{
+				await Connection.Close();
+				await Connection.DisposeAsync();
+
+				Connection = null;
+			}
+		}
+	}
+
+	public async Task<T?> Select()
+	{
+		try
+		{
+			if (Connection is null)
+				return default;
+
+			var result = await Connection.Select<T>(this);
+
+			if (Connection.Behavior == StorageConnectionMode.Isolated)
+				await Connection.Commit();
+
+			return result;
+		}
+		finally
+		{
+			if (Connection.Behavior == StorageConnectionMode.Isolated)
+			{
+				await Connection.Close();
+				await Connection.DisposeAsync();
+
+				Connection = null;
+			}
+		}
+	}
+
+	public async Task<IDataReader> OpenReader()
+	{
+		if (Connection is null)
+			throw new NullReferenceException(nameof(Connection));
+
+		return await Connection.OpenReader(this);
+	}
+}

src/Connected.ServiceModel.Client.Data/TableSchemaMiddleware.cs

@@ -0,0 +1,55 @@
+using Connected.Annotations;
+using Connected.Data.Schema;
+using Connected.Entities.Annotations;
+using Connected.Entities.Storage;
+using Connected.Interop;
+using Connected.Middleware;
+using Connected.ServiceModel.Client.Data.Remote;
+using Connected.ServiceModel.Client.Data.Schema;
+using Connected.ServiceModel.Client.Net;
+using Connected.ServiceModel.Data;
+
+namespace Connected.ServiceModel.Client.Data;
+
+[Priority(2)]
+internal sealed class TableSchemaMiddleware : MiddlewareComponent, ISchemaMiddleware
+{
+	public TableSchemaMiddleware(IMiddlewareService middleware, IStorageProvider storage, RemoteTableService remote, IConnectedServer connected)
+	{
+		Storage = storage;
+		Remote = remote;
+		Connected = connected;
+	}
+	private IStorageProvider Storage { get; }
+	private RemoteTableService Remote { get; }
+	private IConnectedServer Connected { get; }
+	public Type ConnectionType => typeof(TableDataConnection);
+	public string DefaultConnectionString { get; private set; } = default!;
+
+	protected override async Task OnInitialize()
+	{
+		DefaultConnectionString = await Connected.SelectUrl(new ConnectedServerUrlArgs { Kind = ConnectedUrlKind.TableStorage });
+	}
+
+	public async Task<bool> IsEntitySupported(Type entityType)
+	{
+		await Task.CompletedTask;
+		/*
+		 * This middleware supports all ITableEntity<> entities.
+		 */
+		return entityType.ImplementsInterface(typeof(ITableEntity<>));
+	}
+
+	public async Task Synchronize(Type entity, ISchema schema)
+	{
+		await Synchronize(schema, DefaultConnectionString);
+	}
+
+	private async Task Synchronize(ISchema schema, string connectionString)
+	{
+		var args = new SchemaExecutionContext(schema, Remote);
+
+		if (string.IsNullOrWhiteSpace(schema.Type) || string.Equals(schema.Type, SchemaAttribute.SchemaTypeTable, StringComparison.OrdinalIgnoreCase))
+			await new TableSynchronize().Execute(args);
+	}
+}

src/Connected.ServiceModel.Client.Data/TableStorageProvider.cs

@@ -0,0 +1,114 @@
+using System.Linq.Expressions;
+using System.Reflection;
+using Connected.Annotations;
+using Connected.Data;
+using Connected.Data.Storage;
+using Connected.Entities;
+using Connected.Entities.Storage;
+using Connected.Expressions;
+using Connected.Expressions.Evaluation;
+using Connected.Expressions.Query;
+using Connected.Expressions.Translation;
+using Connected.Interop;
+using Connected.ServiceModel.Data;
+
+namespace Connected.ServiceModel.Client.Data;
+
+[Priority(2)]
+internal class TableStorageProvider : QueryProvider, IStorageExecutor, IStorageMiddleware
+{
+	public TableStorageProvider(IStorageProvider storage)
+	{
+		Storage = storage;
+	}
+
+	private IStorageProvider Storage { get; }
+
+	protected override object? OnExecute(Expression expression)
+	{
+		return CreateExecutionPlan(expression).Compile()(this);
+	}
+
+	private static Expression<Func<IStorageExecutor, object>> CreateExecutionPlan(Expression expression)
+	{
+		var lambda = expression as LambdaExpression;
+
+		if (lambda is not null)
+			expression = lambda.Body;
+
+		var context = new ExpressionCompilationContext(new CqlLanguage());
+		var translator = new Translator(context);
+		var translation = translator.Translate(expression);
+		var parameters = lambda?.Parameters;
+		var provider = Resolve(expression, parameters, typeof(IStorage<>));
+
+		if (provider is null)
+		{
+			var rootQueryable = Resolve(expression, parameters, typeof(IQueryable));
+
+			provider = Expression.Property(rootQueryable, typeof(IQueryable).GetTypeInfo().GetDeclaredProperty(nameof(IQueryable.Provider)));
+		}
+
+		return ExecutionBuilder.Build(context, new CqlLinguist(context, CqlLanguage.Default, translator), translation, provider);
+	}
+
+	/// <summary>
+	/// Find the expression of the specified type, either in the specified expression or parameters.
+	/// </summary>
+	private static Expression Resolve(Expression expression, IList<ParameterExpression> parameters, Type type)
+	{
+		if (parameters is not null)
+		{
+			var found = parameters.FirstOrDefault(p => type.IsAssignableFrom(p.Type));
+
+			if (found is not null)
+				return found;
+		}
+
+		return SubtreeResolver.Resolve(expression, type);
+	}
+
+	public IEnumerable<TResult?> Execute<TResult>(IStorageOperation operation)
+		 where TResult : IEntity
+	{
+		var result = Storage.Open<TResult>().Query(new StorageContextArgs(operation));
+
+		if (result.IsCompleted)
+			return result.Result;
+
+		var r = result.GetAwaiter().GetResult();
+
+		return r;
+	}
+
+	public bool SupportsEntity(Type entityType)
+	{
+		return entityType.ImplementsInterface(typeof(ITableEntity<>));
+	}
+
+	public IStorageOperation CreateOperation<TEntity>(TEntity entity)
+		where TEntity : IEntity
+	{
+		var builder = new AggregatedCommandBuilder<TEntity?>();
+
+		if (builder.Build(entity) is not StorageOperation operation)
+			throw new NullReferenceException(nameof(StorageOperation));
+
+		return operation;
+	}
+
+	public IStorageReader<TEntity> OpenReader<TEntity>(IStorageOperation operation, IStorageConnection connection)
+	{
+		return new TableReader<TEntity>(operation, connection);
+	}
+
+	public IStorageWriter OpenWriter(IStorageOperation operation, IStorageConnection connection)
+	{
+		return new TableWriter(operation, connection);
+	}
+
+	public async Task Initialize()
+	{
+		await Task.CompletedTask;
+	}
+}

src/Connected.ServiceModel.Client.Data/TableTransaction.cs

@@ -0,0 +1,59 @@
+using System.Data;
+
+namespace Connected.ServiceModel.Client.Data;
+/// <summary>
+/// Defines the transaction on the remote table storage.
+/// </summary>
+/// <remarks>
+/// Connection write operations using this transaction are queued until
+/// the <see cref="Commit"/> is called.
+/// </remarks>
+internal class TableTransaction : IDbTransaction
+{
+	/// <summary>
+	/// Creates new <see cref="TableTransaction"/> object.
+	/// </summary>
+	/// <param name="connection">The storage connection associated with the transaction.</param>
+	public TableTransaction(IDbConnection connection)
+	{
+		Connection = connection;
+	}
+	/// <summary>
+	/// The storage connection that created the transaction.
+	/// </summary>
+	/// <remarks>
+	/// Multiple connections can use the transaction, but only one is directly associated with the transaction.
+	/// </remarks>
+	public IDbConnection? Connection { get; }
+	/// <summary>
+	/// The isolation level of the transaction. It's always <see cref="IsolationLevel.Snapshot"/> on this transaction.
+	/// </summary>
+	public IsolationLevel IsolationLevel { get; } = IsolationLevel.Snapshot;
+	/// <summary>
+	/// Commits this transaction. This call actually performs a REST call to the remote service.
+	/// </summary>
+	/// <exception cref="NotImplementedException"></exception>
+	public void Commit()
+	{
+		throw new NotImplementedException();
+	}
+	/// <summary>
+	/// Disposes the <see cref="TableTransaction"/> object.
+	/// </summary>
+	public void Dispose()
+	{
+		/*
+		 * Nothing really to do here.
+		 */
+	}
+	/// <summary>
+	/// Rolls back any changes made in this transaction.
+	/// </summary>
+	public void Rollback()
+	{
+		/*
+		 * This call doesm't have to do enything since we weren't perform
+		 * any calls to the remote service. We just discard the operations.
+		 */
+	}
+}

src/Connected.ServiceModel.Client.Data/TableWriter.cs

@@ -0,0 +1,38 @@
+using Connected.Data.Storage;
+using Connected.Entities.Storage;
+
+namespace Connected.ServiceModel.Client.Data;
+
+internal sealed class TableWriter : TableCommand, IStorageWriter
+{
+	public TableWriter(IStorageOperation operation, IStorageConnection connection)
+		: base(operation, connection)
+	{
+	}
+
+	public async Task<int> Execute()
+	{
+		if (Connection is null)
+			return -1;
+
+		try
+		{
+			var recordsAffected = await Connection.Execute(this);
+
+			if (Connection.Behavior == StorageConnectionMode.Isolated)
+				await Connection.Commit();
+
+			return recordsAffected;
+		}
+		finally
+		{
+			if (Connection.Behavior == StorageConnectionMode.Isolated)
+			{
+				await Connection.Close();
+				await Connection.DisposeAsync();
+
+				Connection = null;
+			}
+		}
+	}
+}

src/Connected.ServiceModel.Client.Data/UpdateCommandBuilder.cs

@@ -0,0 +1,77 @@
+using System.Collections.Concurrent;
+using System.Reflection;
+using Connected.Entities.Annotations;
+using Connected.Entities.Storage;
+
+namespace Connected.ServiceModel.Client.Data;
+internal sealed class UpdateCommandBuilder : CommandBuilder
+{
+	private static readonly ConcurrentDictionary<string, StorageOperation> _cache;
+
+	static UpdateCommandBuilder()
+	{
+		_cache = new();
+	}
+
+	private static ConcurrentDictionary<string, StorageOperation> Cache => _cache;
+	private bool SupportsConcurrency { get; set; }
+	protected override bool TryGetExisting(out StorageOperation? result)
+	{
+		return Cache.TryGetValue(Entity.GetType().FullName, out result);
+	}
+
+	protected override StorageOperation OnBuild()
+	{
+		WriteLine($"UPDATE [{Schema.Schema}].[{Schema.Name}] SET");
+
+		WriteAssignments();
+		WriteWhere();
+
+		Trim();
+		Write(';');
+
+		var result = new StorageOperation { CommandText = CommandText, Concurrency = SupportsConcurrency ? DataConcurrencyMode.Enabled : DataConcurrencyMode.Disabled };
+
+		foreach (var parameter in Parameters)
+			result.AddParameter(parameter);
+
+		Cache.TryAdd(Entity.GetType().FullName, result);
+
+		return result;
+	}
+
+	private void WriteAssignments()
+	{
+		foreach (var property in Properties)
+		{
+			if (property.GetCustomAttribute<PrimaryKeyAttribute>() is not null)
+			{
+				WhereProperties.Add(property);
+
+				continue;
+			}
+
+			var parameter = CreateParameter(property);
+
+			WriteLine($"{ColumnName(property)} = {parameter.Name},");
+		}
+
+		Trim();
+	}
+
+	private void WriteWhere()
+	{
+		WriteLine(string.Empty);
+
+		for (var i = 0; i < WhereProperties.Count; i++)
+		{
+			var property = WhereProperties[i];
+			var parameter = CreateParameter(property);
+
+			if (i == 0)
+				WriteLine($" WHERE {ColumnName(property)} = {parameter.Name}");
+			else
+				WriteLine($" AND {ColumnName(property)} = {parameter.Name}");
+		}
+	}
+}

src/Connected.ServiceModel.Client.Storage/Bootstrapper.cs

@@ -0,0 +1,15 @@
+using Connected.Annotations;
+using Connected.ServiceModel.Storage;
+using Microsoft.Extensions.DependencyInjection;
+
+[assembly: MicroService(MicroServiceType.Provider)]
+
+namespace Connected.ServiceModel.Client.Storage;
+
+internal class Bootstrapper : Startup
+{
+	protected override void OnConfigureServices(IServiceCollection services)
+	{
+		services.AddScoped(typeof(IStorageService), typeof(StorageService));
+	}
+}

src/Connected.ServiceModel.Client.Storage/Connected.ServiceModel.Client.Storage.csproj

@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\connected.framework.servicemodel\src\Connected.ServiceModel\Connected.ServiceModel.csproj" />
+    <ProjectReference Include="..\..\..\connected.framework\src\Connected.Entities\Connected.Entities.csproj" />
+    <ProjectReference Include="..\..\..\connected.framework\src\Connected.Services\Connected.Services.csproj" />
+    <ProjectReference Include="..\Connected.ServiceModel.Client\Connected.ServiceModel.Client.csproj" />
+  </ItemGroup>
+
+</Project>

src/Connected.ServiceModel.Client.Storage/StorageOps.cs

@@ -0,0 +1,28 @@
+using Connected.Net;
+using Connected.ServiceModel.Client.Net;
+using Connected.ServiceModel.Client.Subscription;
+using Connected.ServiceModel.Storage;
+using Connected.Services;
+
+namespace Connected.ServiceModel.Client.Storage;
+
+internal sealed class DeleteDirectory : ServiceAction<DeleteDirectoryArgs>
+{
+	public DeleteDirectory(ISubscriptionService subscription, IHttpService http, IConnectedServer server, ICancellationContext cancel)
+	{
+		Subscription = subscription;
+		Http = http;
+		Server = server;
+		Cancel = cancel;
+	}
+
+	public ISubscriptionService Subscription { get; }
+	public IHttpService Http { get; }
+	public IConnectedServer Server { get; }
+	public ICancellationContext Cancel { get; }
+
+	protected override async Task OnInvoke()
+	{
+		await Http.Post(await Server.SelectUrl(new ConnectedServerUrlArgs { Kind = ConnectedUrlKind.FileSystem }), Arguments, Cancel.CancellationToken);
+	}
+}

src/Connected.ServiceModel.Client.Storage/StorageService.cs

@@ -0,0 +1,57 @@
+using System.Collections.Immutable;
+using Connected.ServiceModel.Storage;
+using Connected.Services;
+
+namespace Connected.ServiceModel.Client.Storage;
+
+internal class StorageService : Service, IStorageService
+{
+	public StorageService(IContext context) : base(context)
+	{
+	}
+
+	public async Task DeleteDirectory(DeleteDirectoryArgs args)
+	{
+		await Invoke(GetOperation<DeleteDirectory>(), args);
+	}
+
+	public Task DeleteFile(DeleteFileArgs args)
+	{
+		throw new NotImplementedException();
+	}
+
+	public Task InsertDirectory(InsertDirectoryArgs args)
+	{
+		throw new NotImplementedException();
+	}
+
+	public Task MoveFile(MoveFileArgs args)
+	{
+		throw new NotImplementedException();
+	}
+
+	public Task<ImmutableList<IDirectory>?> QueryDirectories(DirectoryArgs args)
+	{
+		throw new NotImplementedException();
+	}
+
+	public Task<ImmutableList<IFile>?> QueryFiles(DirectoryArgs args)
+	{
+		throw new NotImplementedException();
+	}
+
+	public Task<byte[]?> SelectFile(FileArgs args)
+	{
+		throw new NotImplementedException();
+	}
+
+	public Task UpdateDirectory(UpdateDirectoryArgs args)
+	{
+		throw new NotImplementedException();
+	}
+
+	public Task UpdateFile(UpdateFileArgs args)
+	{
+		throw new NotImplementedException();
+	}
+}

src/Connected.ServiceModel.Client/Bootstrapper.cs

@@ -0,0 +1,16 @@
+using Connected.Annotations;
+using Connected.ServiceModel.Client.Subscription;
+using Microsoft.Extensions.DependencyInjection;
+
+[assembly: MicroService(MicroServiceType.Provider)]
+
+namespace Connected.ServiceModel.Client.Net;
+
+internal class Bootstrapper : Startup
+{
+	protected override void OnConfigureServices(IServiceCollection services)
+	{
+		services.AddScoped(typeof(IConnectedServer), typeof(ConnectedServer));
+		services.AddScoped(typeof(ISubscriptionService), typeof(SubscriptionService));
+	}
+}

src/Connected.ServiceModel.Client/Connected.ServiceModel.Client.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\connected.framework\src\Connected.Entities\Connected.Entities.csproj" />
+    <ProjectReference Include="..\..\..\connected.framework\src\Connected.Services\Connected.Services.csproj" />
+  </ItemGroup>
+
+</Project>

src/Connected.ServiceModel.Client/Net/ConnectedServer.cs

@@ -0,0 +1,15 @@
+using Connected.Services;
+
+namespace Connected.ServiceModel.Client.Net;
+
+internal class ConnectedServer : Service, IConnectedServer
+{
+	public ConnectedServer(IContext context) : base(context)
+	{
+	}
+
+	public async Task<string?> SelectUrl(ConnectedServerUrlArgs args)
+	{
+		return await Invoke(GetOperation<SelectUrl>(), args);
+	}
+}

src/Connected.ServiceModel.Client/Net/ConnectedServerArgs.cs

@@ -0,0 +1,13 @@
+namespace Connected.ServiceModel.Client.Net;
+
+public enum ConnectedUrlKind
+{
+	Root = 0,
+	FileSystem = 1,
+	TableStorage = 2
+}
+
+public sealed class ConnectedServerUrlArgs : Dto
+{
+	public ConnectedUrlKind Kind { get; set; } = ConnectedUrlKind.Root;
+}

src/Connected.ServiceModel.Client/Net/ConnectedServerOps.cs

@@ -0,0 +1,20 @@
+using Connected.Services;
+
+namespace Connected.ServiceModel.Client.Net;
+
+internal sealed class SelectUrl : ServiceFunction<ConnectedServerUrlArgs, string?>
+{
+	private const string Root = "https://localhost:7069";//"https://connected.tompit.com";
+	protected override async Task<string?> OnInvoke()
+	{
+		await Task.CompletedTask;
+
+		return Arguments.Kind switch
+		{
+			ConnectedUrlKind.Root => Root,
+			ConnectedUrlKind.FileSystem => $"{Root}/services/fileSystem",
+			ConnectedUrlKind.TableStorage => $"{Root}/services/tables",
+			_ => throw new NotImplementedException(),
+		};
+	}
+}

src/Connected.ServiceModel.Client/Net/IConnectedServer.cs

@@ -0,0 +1,6 @@
+namespace Connected.ServiceModel.Client.Net;
+
+public interface IConnectedServer
+{
+	Task<string?> SelectUrl(ConnectedServerUrlArgs args);
+}

src/Connected.ServiceModel.Client/Subscription/ISubscription.cs

@@ -0,0 +1,7 @@
+using Connected.Data;
+
+namespace Connected.ServiceModel.Client.Subscription;
+
+public interface ISubscription : IPrimaryKey<int>
+{
+}

src/Connected.ServiceModel.Client/Subscription/ISubscriptionService.cs

@@ -0,0 +1,6 @@
+namespace Connected.ServiceModel.Client.Subscription;
+
+public interface ISubscriptionService
+{
+	Task<ISubscription?> Select();
+}

src/Connected.ServiceModel.Client/Subscription/Subscription.cs

@@ -0,0 +1,9 @@
+using Connected.Entities;
+using Connected.Entities.Annotations;
+
+namespace Connected.ServiceModel.Client.Subscription;
+
+[Persistence(Persistence = ColumnPersistence.InMemory)]
+internal record Subscription : Entity<int>, ISubscription
+{
+}

src/Connected.ServiceModel.Client/Subscription/SubscriptionOps.cs

@@ -0,0 +1,16 @@
+using Connected.Services;
+
+namespace Connected.ServiceModel.Client.Subscription;
+
+internal sealed class SelectSubscription : ServiceFunction<IDto, ISubscription?>
+{
+	protected override async Task<ISubscription?> OnInvoke()
+	{
+		await Task.CompletedTask;
+
+		return new Subscription
+		{
+			Id = 1
+		};
+	}
+}

src/Connected.ServiceModel.Client/Subscription/SubscriptionService.cs

@@ -0,0 +1,15 @@
+using Connected.Services;
+
+namespace Connected.ServiceModel.Client.Subscription;
+
+internal class SubscriptionService : Service, ISubscriptionService
+{
+	public SubscriptionService(IContext context) : base(context)
+	{
+	}
+
+	public async Task<ISubscription?> Select()
+	{
+		return await Invoke(GetOperation<SelectSubscription>(), Dto.Empty);
+	}
+}