Support long ints (#458)

Add UseLegacyIdentityColumn option
sebastienros · Sep 29, 2022 · b2f85e8 · b2f85e8
1 parent 97d05ef
commit b2f85e8
Show file tree

Hide file tree

Showing 50 changed files with 285 additions and 364 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -75,7 +75,10 @@ jobs:
       run: dotnet test --configuration Release --filter YesSql.Tests.MySqlTests --no-restore --no-build --framework net6.0
 
     - name: Test - SQL Server 2019 .NET 6.0
-      run: dotnet test --configuration release --filter yessql.tests.sqlserver2019tests --no-restore --no-build --framework net6.0
+      run: dotnet test --configuration release --filter YesSql.Tests.SqlServer2019Tests --no-restore --no-build --framework net6.0
+
+    - name: Test - PostgresQL Legacy Identity - No Schema
+      run: dotnet test --configuration release --filter YesSql.Tests.PostgreSqlLegacyIdentityTests --no-restore --no-build --framework net6.0
 
     - name: Pack with dotnet
       run: dotnet pack --output artifacts --configuration Release --no-restore --no-build -p:PackageVersion=$GITHUB_RUN_NUMBER

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -76,4 +76,7 @@ jobs:
       run: dotnet test --configuration Release --filter YesSql.Tests.MySqlTests --no-restore --no-build --framework net6.0
 
     - name: Test - SQL Server 2019 .NET 6.0
-      run: dotnet test --configuration release --filter yessql.tests.sqlserver2019tests --no-restore --no-build --framework net6.0
+      run: dotnet test --configuration release --filter YesSql.Tests.SqlServer2019Tests --no-restore --no-build --framework net6.0
+
+    - name: Test - PostgresQL Legacy Identity - No Schema
+      run: dotnet test --configuration release --filter YesSql.Tests.PostgreSqlLegacyIdentityTests --no-restore --no-build --framework net6.0
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -65,7 +65,10 @@ jobs:
       run: dotnet test --configuration Release --filter YesSql.Tests.MySqlTests --no-restore --no-build --framework net6.0
 
     - name: Test - SQL Server 2019 .NET 6.0
-      run: dotnet test --configuration Release --filter YesSql.Tests.SqlServer2019Tests --no-restore --no-build --framework net6.0
+      run: dotnet test --configuration release --filter YesSql.Tests.SqlServer2019Tests --no-restore --no-build --framework net6.0
+
+    - name: Test - PostgresQL Legacy Identity - No Schema
+      run: dotnet test --configuration release --filter YesSql.Tests.PostgreSqlLegacyIdentityTests --no-restore --no-build --framework net6.0
 
     - name: Pack
       run: |

diff --git a/samples/YesSql.Bench/Program.cs b/samples/YesSql.Bench/Program.cs
@@ -72,7 +72,7 @@ static async Task MainAsync(string[] args)
 
     public class User
     {
-        public int Id { get; set; }
+        public long Id { get; set; }
         public string Name { get; set; }
         public bool Adult { get; set; }
         public int Age { get; set; }

diff --git a/samples/YesSql.Samples.Web/Models/BlogPost.cs b/samples/YesSql.Samples.Web/Models/BlogPost.cs
@@ -1,10 +1,10 @@
-using System;
+using System;
 
 namespace YesSql.Samples.Web.Models
 {
     public class BlogPost
     {
-        public int Id { get; set; }
+        public long Id { get; set; }
 
         public string Title { get; set; }
 

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <Copyright>Sebastien Ros</Copyright>
         <Authors>Sebastien Ros</Authors>
-        <TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <DebugType>portable</DebugType>
         <PackageProjectUrl>https://github.com/sebastienros/yessql</PackageProjectUrl>

diff --git a/src/YesSql.Abstractions/Commands/ICreateTableCommand.cs b/src/YesSql.Abstractions/Commands/ICreateTableCommand.cs
@@ -1,11 +1,11 @@
 using System;
-using System.Data;
 
 namespace YesSql.Sql.Schema
 {
     public interface ICreateTableCommand : ISchemaCommand
     {
         ICreateTableCommand Column(string columnName, Type dbType, Action<ICreateColumnCommand> column = null);
         ICreateTableCommand Column<T>(string columnName, Action<ICreateColumnCommand> column = null);
+        public ICreateTableCommand Column(bool useInt64Type, string columnName, Action<ICreateColumnCommand> column = null) => useInt64Type ? Column<int>(columnName, column) : Column<long>(columnName, column);
     }
 }
diff --git a/src/YesSql.Abstractions/Document.cs b/src/YesSql.Abstractions/Document.cs
@@ -8,7 +8,7 @@ public class Document
         /// <summary>
         /// The unique identifier of the document in the database.
         /// </summary>
-        public int Id { get; set; }
+        public long Id { get; set; }
 
         /// <summary>
         /// The type of the document.

diff --git a/src/YesSql.Abstractions/IConfiguration.cs b/src/YesSql.Abstractions/IConfiguration.cs
@@ -85,6 +85,11 @@ public interface IConfiguration
         /// Gets or sets the <see cref="ISqlDialect" /> instance.
         /// </summary>
         ISqlDialect SqlDialect { get; set; }
+
+        /// <summary>
+        /// Whether to use legacy Int64 identity columns.
+        /// </summary>
+        bool UseLegacyIdentityColumn { get; set; }
     }
 
     public static class ConfigurationExtensions

diff --git a/src/YesSql.Abstractions/ISession.cs b/src/YesSql.Abstractions/ISession.cs
@@ -39,7 +39,7 @@ public interface ISession : IDisposable, IAsyncDisposable
         /// <returns>
         /// <c>true</c> if the object was imported, <c>false</c> otherwise.
         /// </returns>
-        bool Import(object item, int id, int version, string collection = null);
+        bool Import(object item, long id, long version, string collection = null);
 
         /// <summary>
         /// Removes an item from the identity map.
@@ -55,7 +55,7 @@ public interface ISession : IDisposable, IAsyncDisposable
         /// Loads objects by id.
         /// </summary>
         /// <returns>A collection of objects in the same order they were defined.</returns>
-        Task<IEnumerable<T>> GetAsync<T>(int[] ids, string collection = null) where T : class;
+        Task<IEnumerable<T>> GetAsync<T>(long[] ids, string collection = null) where T : class;
 
         /// <summary>
         /// Creates a new <see cref="IQuery"/> object.
@@ -135,11 +135,17 @@ public static class SessionExtensions
         /// Loads an object by its id.
         /// </summary>
         /// <returns>The object or <c>null</c>.</returns>
-        public async static Task<T> GetAsync<T>(this ISession session, int id, string collection = null) where T : class
+        public async static Task<T> GetAsync<T>(this ISession session, long id, string collection = null) where T : class
         {
             return (await session.GetAsync<T>(new[] { id }, collection)).FirstOrDefault();
         }
 
+        /// <summary>
+        /// Loads objects by id.
+        /// </summary>
+        /// <returns>A collection of objects in the same order they were defined.</returns>
+        public static Task<IEnumerable<T>> GetAsync<T>(this ISession session, int[] ids, string collection = null) where T : class => session.GetAsync<T>(ids.Select(x => (long)x).ToArray(), collection);
+
         /// <summary>
         /// Imports an object in the local identity map.
         /// </summary>

diff --git a/src/YesSql.Abstractions/ISqlDialect.cs b/src/YesSql.Abstractions/ISqlDialect.cs
@@ -90,6 +90,11 @@ public interface ISqlDialect
         /// </summary>
         string IdentityColumnString { get; }
 
+        /// <summary>
+        /// Gets the Int64 primary key with identity column SQL statement.
+        /// </summary>
+        string LegacyIdentityColumnString { get; }
+
         /// <summary>
         /// Gets the identity select SQL statement to append to an insert in order to return the last generated identifier.
         /// </summary>

diff --git a/src/YesSql.Abstractions/Indexes/IIndex.cs b/src/YesSql.Abstractions/Indexes/IIndex.cs
@@ -1,10 +1,10 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace YesSql.Indexes
 {
     public interface IIndex
     {
-        int Id { get; set; }
+        long Id { get; set; }
         void AddDocument(Document document);
         void RemoveDocument(Document document);
         IEnumerable<Document> GetAddedDocuments();

diff --git a/src/YesSql.Abstractions/Indexes/MapIndex.cs b/src/YesSql.Abstractions/Indexes/MapIndex.cs
@@ -1,12 +1,12 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace YesSql.Indexes
 {
     public abstract class MapIndex : IIndex
     {
         private Document Document { get; set; }
 
-        public int Id { get; set; }
+        public long Id { get; set; }
 
         void IIndex.AddDocument(Document document)
         {

diff --git a/src/YesSql.Abstractions/Indexes/ReduceIndex.cs b/src/YesSql.Abstractions/Indexes/ReduceIndex.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace YesSql.Indexes
 {
@@ -9,7 +9,7 @@ public ReduceIndex()
             Documents = new List<Document>();
         }
 
-        public int Id { get; set; }
+        public long Id { get; set; }
 
         List<Document> RemovedDocuments = new List<Document>();
 

diff --git a/src/YesSql.Abstractions/Storage/DocumentIdentity.cs b/src/YesSql.Abstractions/Storage/DocumentIdentity.cs
@@ -1,24 +1,24 @@
-using System;
+using System;
 
 namespace YesSql.Storage
 {
     public class DocumentIdentity : IIdentityEntity
     {
-        public DocumentIdentity(int id, object entity)
+        public DocumentIdentity(long id, object entity)
         {
             Id = id;
             Entity = entity;
             EntityType = entity.GetType();
         }
 
-        public DocumentIdentity(int id, Type type)
+        public DocumentIdentity(long id, Type type)
         {
             Id = id;
             Entity = null;
             EntityType = type;
         }
 
-        public int Id { get; set; }
+        public long Id { get; set; }
         public object Entity { get; set; }
         public Type EntityType { get; set; }
     }

diff --git a/src/YesSql.Abstractions/Storage/IIdentityEntity.cs b/src/YesSql.Abstractions/Storage/IIdentityEntity.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -8,7 +8,7 @@ namespace YesSql.Storage
 {
     public interface IIdentityEntity
     {
-        int Id { get; set; }
+        long Id { get; set; }
         object Entity { get; set; }
         Type EntityType { get; set; }
     }

diff --git a/src/YesSql.Abstractions/YesSql.Abstractions.csproj b/src/YesSql.Abstractions/YesSql.Abstractions.csproj
@@ -1,8 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-        <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
-        <PackageReference Include="System.Memory" Version="4.5.0" />
-    </ItemGroup>
     <ItemGroup>
         <!-- Latest minimum LTS version. We don't want to force a higher version to applications -->
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />

diff --git a/src/YesSql.Core/Commands/CreateIndexCommand.cs b/src/YesSql.Core/Commands/CreateIndexCommand.cs
@@ -11,13 +11,13 @@ namespace YesSql.Commands
 {
     public sealed class CreateIndexCommand : IndexCommand
     {
-        private readonly int[] _addedDocumentIds;
+        private readonly long[] _addedDocumentIds;
 
         public override int ExecutionOrder { get; } = 2;
 
         public CreateIndexCommand(
             IIndex index,
-            IEnumerable<int> addedDocumentIds,
+            IEnumerable<long> addedDocumentIds,
             IStore store,
             string collection) : base(index, store, collection)
         {
@@ -44,11 +44,11 @@ public override async Task ExecuteAsync(DbConnection connection, DbTransaction t
                 command.CommandText = sql;
                 GetProperties(command, Index, "", dialect);
                 command.AddParameter($"DocumentId", Index.GetAddedDocuments().Single().Id);
-                Index.Id = Convert.ToInt32(await command.ExecuteScalarAsync());
+                Index.Id = Convert.ToInt64(await command.ExecuteScalarAsync());
             }
             else
             {
-                Index.Id = await connection.ExecuteScalarAsync<int>(sql, Index, transaction);
+                Index.Id = await connection.ExecuteScalarAsync<long>(sql, Index, transaction);
 
                 var reduceIndex = Index as ReduceIndex;
                 var bridgeTableName = _store.Configuration.TableNameConvention.GetIndexTable(type, Collection) + "_" + documentTable;
@@ -93,7 +93,7 @@ public override bool AddToBatch(ISqlDialect dialect, List<string> queries, DbCom
             actions.Add(dr =>
             {
                 dr.Read();
-                Index.Id = Convert.ToInt32(dr[0]);
+                Index.Id = Convert.ToInt64(dr[0]);
                 dr.NextResult();
             });
 

diff --git a/src/YesSql.Core/Commands/DeleteDocumentCommand.cs b/src/YesSql.Core/Commands/DeleteDocumentCommand.cs
@@ -37,7 +37,7 @@ public override bool AddToBatch(ISqlDialect dialect, List<string> queries, DbCom
 
             var deleteCmd = $"delete from {dialect.QuoteForTableName(_store.Configuration.TablePrefix + documentTable, _store.Configuration.Schema)} where {dialect.QuoteForColumnName("Id")} = @Id_{index};";
             queries.Add(deleteCmd);
-            command.AddParameter($"Id_{index}", Document.Id, DbType.Int32);
+            command.AddParameter($"Id_{index}", Document.Id);
 
             return true;
         }

diff --git a/src/YesSql.Core/Commands/DeleteMapIndexCommand.cs b/src/YesSql.Core/Commands/DeleteMapIndexCommand.cs
@@ -4,20 +4,19 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace YesSql.Commands
 {
     public sealed class DeleteMapIndexCommand : IIndexCommand, ICollectionName
     {
         private readonly IStore _store;
-        public int DocumentId { get; }
+        public long DocumentId { get; }
         public Type IndexType { get; }
         public string Collection { get; }
         public int ExecutionOrder { get; } = 1;
 
-        public DeleteMapIndexCommand(Type indexType, int documentId, IStore store, string collection)
+        public DeleteMapIndexCommand(Type indexType, long documentId, IStore store, string collection)
         {
             IndexType = indexType;
             DocumentId = documentId;
@@ -43,7 +42,7 @@ public bool AddToBatch(ISqlDialect dialect, List<string> queries, DbCommand comm
 
             queries.Add(sql);
 
-            command.AddParameter($"Id_{index}", DocumentId, DbType.Int32);
+            command.AddParameter($"Id_{index}", DocumentId);
 
             return true;
         }

diff --git a/src/YesSql.Core/Commands/UpdateDocumentCommand.cs b/src/YesSql.Core/Commands/UpdateDocumentCommand.cs
@@ -72,9 +72,9 @@ public override bool AddToBatch(ISqlDialect dialect, List<string> queries, DbCom
             queries.Add(updateCmd);
 
             batchCommand
-                .AddParameter("Id_" + index, Document.Id, DbType.Int32)
-                .AddParameter("Content_" + index, Document.Content, DbType.String)
-                .AddParameter("Version_" + index, Document.Version, DbType.Int64);
+                .AddParameter("Id_" + index, Document.Id)
+                .AddParameter("Content_" + index, Document.Content)
+                .AddParameter("Version_" + index, Document.Version);
 
             return true;
         }

diff --git a/src/YesSql.Core/Commands/UpdateIndexCommand.cs b/src/YesSql.Core/Commands/UpdateIndexCommand.cs
@@ -6,21 +6,20 @@
 using System.Linq;
 using System.Threading.Tasks;
 using YesSql.Indexes;
-using YesSql.Sql.Schema;
 
 namespace YesSql.Commands
 {
     public sealed class UpdateIndexCommand : IndexCommand
     {
-        private readonly int[] _addedDocumentIds;
-        private readonly int[] _deletedDocumentIds;
+        private readonly long[] _addedDocumentIds;
+        private readonly long[] _deletedDocumentIds;
 
         public override int ExecutionOrder { get; } = 3;
 
         public UpdateIndexCommand(
             IIndex index,
-            IEnumerable<int> addedDocumentIds,
-            IEnumerable<int> deletedDocumentIds,
+            IEnumerable<long> addedDocumentIds,
+            IEnumerable<long> deletedDocumentIds,
             IStore _store,
             string collection) : base(index, _store, collection)
         {
@@ -93,7 +92,7 @@ public override bool AddToBatch(ISqlDialect dialect, List<string> queries, DbCom
             var parameter = command.CreateParameter();
             parameter.ParameterName = $"Id{index}";
             parameter.Value = Index.Id;
-            parameter.DbType = System.Data.DbType.Int32;
+            parameter.DbType = System.Data.DbType.Int64;
             command.Parameters.Add(parameter);
 
             // Update the documents list
@@ -106,7 +105,7 @@ public override bool AddToBatch(ISqlDialect dialect, List<string> queries, DbCom
                 parameter = command.CreateParameter();
                 parameter.ParameterName = $"Id_{index}";
                 parameter.Value = Index.Id;
-                parameter.DbType = System.Data.DbType.Int32;
+                parameter.DbType = System.Data.DbType.Int64;
                 command.Parameters.Add(parameter);
 
                 for (var i = 0; i < _addedDocumentIds.Length; i++)
@@ -117,7 +116,7 @@ public override bool AddToBatch(ISqlDialect dialect, List<string> queries, DbCom
                     parameter = command.CreateParameter();
                     parameter.ParameterName = $"AddedId_{index}_{i}";
                     parameter.Value = _addedDocumentIds[i];
-                    parameter.DbType = System.Data.DbType.Int32;
+                    parameter.DbType = System.Data.DbType.Int64;
                     command.Parameters.Add(parameter);
                 }
 
@@ -129,7 +128,7 @@ public override bool AddToBatch(ISqlDialect dialect, List<string> queries, DbCom
                     parameter = command.CreateParameter();
                     parameter.ParameterName = $"RemovedId_{index}_{i}";
                     parameter.Value = _deletedDocumentIds[i];
-                    parameter.DbType = System.Data.DbType.Int32;
+                    parameter.DbType = System.Data.DbType.Int64;
                     command.Parameters.Add(parameter);
                 }
             }