#753 Fix for ROWVERSION and TIMESTAMP columns. Thanks to Neal Culiner.

Author: sjh37

BuildTT/BuildTT.cs

@@ -365,7 +365,7 @@ private static void CreateTT(string generatorRoot, string ttRoot)
                 column.Attributes.Add(""[MaxLength]"");
 
             if (column.IsRowVersion)
-                column.Attributes.Add(""[Timestamp]"");
+                column.Attributes.Add(""[Timestamp, ConcurrencyCheck]"");
 
             if (!column.IsMaxLength && column.MaxLength > 0)
             { 

EntityFramework.Reverse.POCO.Generator/Database.tt

@@ -349,7 +349,7 @@
                 column.Attributes.Add("[MaxLength]");
 
             if (column.IsRowVersion)
-                column.Attributes.Add("[Timestamp]");
+                column.Attributes.Add("[Timestamp, ConcurrencyCheck]");
 
             if (!column.IsMaxLength && column.MaxLength > 0)
             { 

EntityFramework.Reverse.POCO.Generator/EF.Reverse.POCO.v3.ttinclude

@@ -5777,7 +5777,10 @@
                 sb.AppendFormat(".HasPrecision({0})", c.Precision);
 
             if (c.IsRowVersion)
+            {
                 sb.Append(".IsRowVersion()");
+                c.IsConcurrencyToken = true;
+            }
 
             if (c.IsConcurrencyToken)
                 sb.Append(".IsConcurrencyToken()");
@@ -6076,7 +6079,10 @@
             //    sb.Append(".IsMaxLength()");
 
             if (c.IsRowVersion)
+            {
                 sb.Append(".IsRowVersion()");
+                c.IsConcurrencyToken = true;
+            }
 
             if (c.IsConcurrencyToken)
                 sb.Append(".IsConcurrencyToken()");
@@ -13085,7 +13091,7 @@ and limitations under the License.
             col.IsUnicode     = !(rt.TypeName == "char" || rt.TypeName == "varchar" || rt.TypeName == "text");
             col.IsMaxLength   = (rt.TypeName == "ntext");
 
-            col.IsRowVersion = col.IsStoreGenerated && !col.IsNullable && rt.TypeName == "timestamp";
+            col.IsRowVersion = col.IsStoreGenerated && rt.TypeName == "timestamp";
             if (col.IsRowVersion)
                 col.MaxLength = 8;
 

Generator/Generators/GeneratorEf6.cs

@@ -123,7 +123,10 @@ protected override void SetupConfig(Column c)
                 sb.AppendFormat(".HasPrecision({0})", c.Precision);
 
             if (c.IsRowVersion)
+            {
                 sb.Append(".IsRowVersion()");
+                c.IsConcurrencyToken = true;
+            }
 
             if (c.IsConcurrencyToken)
                 sb.Append(".IsConcurrencyToken()");

Generator/Generators/GeneratorEfCore.cs

@@ -143,7 +143,10 @@ protected override void SetupConfig(Column c)
             //    sb.Append(".IsMaxLength()");
 
             if (c.IsRowVersion)
+            {
                 sb.Append(".IsRowVersion()");
+                c.IsConcurrencyToken = true;
+            }
 
             if (c.IsConcurrencyToken)
                 sb.Append(".IsConcurrencyToken()");

Generator/Readers/DatabaseReader.cs

@@ -980,7 +980,7 @@ public Column CreateColumn(RawTable rt, Table table, IDbContextFilter filter)
             col.IsUnicode     = !(rt.TypeName == "char" || rt.TypeName == "varchar" || rt.TypeName == "text");
             col.IsMaxLength   = (rt.TypeName == "ntext");
 
-            col.IsRowVersion = col.IsStoreGenerated && !col.IsNullable && rt.TypeName == "timestamp";
+            col.IsRowVersion = col.IsStoreGenerated && rt.TypeName == "timestamp";
             if (col.IsRowVersion)
                 col.MaxLength = 8;
 

TestDatabases/SQLServer/EfrpgTest (manually created).sql

@@ -1928,6 +1928,23 @@ INSERT INTO VersionedNullable (Number) VALUES (123);
 INSERT INTO VersionedNullable (Number) VALUES (456);
 GO
 
+CREATE TABLE TimestampNotNull
+(
+    Id INT NOT NULL IDENTITY(1, 1),
+    [Version] TIMESTAMP NOT NULL,
+    Number INT NOT NULL,
+	CONSTRAINT PK_TimestampNotNull PRIMARY KEY (Id)
+);
+GO
+CREATE TABLE TimestampNullable
+(
+    Id INT NOT NULL IDENTITY(1, 1),
+    [Version] TIMESTAMP NULL,
+    Number INT NOT NULL,
+	CONSTRAINT PK_TTimestampNullable PRIMARY KEY (Id)
+);
+GO
+
 -- Table with sequences
 CREATE SEQUENCE dbo.CountBy1 AS INT START WITH 1 INCREMENT BY 1;
 CREATE SEQUENCE dbo.CountByBigInt AS BIGINT START WITH 22 INCREMENT BY 234 MINVALUE 1 MAXVALUE 9876543 CYCLE;