Add support for [AutoId] for auto populating Guid PK's

mythz · mythz · commit 8e5449580708 · 2018-03-27T17:53:16.000-04:00
Populated by SQL Server or PostgreSQL, or OrmLite using Guid.NewGuid()
for all other DB's
diff --git a/src/ServiceStack.OrmLite.Firebird/FirebirdOrmLiteDialectProvider.cs b/src/ServiceStack.OrmLite.Firebird/FirebirdOrmLiteDialectProvider.cs
@@ -125,7 +125,7 @@ public override string ToInsertRowStatement(IDbCommand cmd, object objWithProper
 
             foreach (var fieldDef in modelDef.FieldDefinitionsArray)
             {
-                if (fieldDef.ReturnOnInsert || (fieldDef.IsPrimaryKey && fieldDef.AutoIncrement && modelDef.HasReturnAttribute))
+                if (fieldDef.ReturnOnInsert || (fieldDef.IsPrimaryKey && fieldDef.AutoIncrement && HasInsertReturnValues(modelDef)))
                 {
                     if (sbReturningColumns.Length > 0)
                         sbReturningColumns.Append(",");
@@ -199,7 +199,7 @@ public override void PrepareParameterizedInsertStatement<T>(IDbCommand cmd, ICol
 
             foreach (var fieldDef in modelDef.FieldDefinitionsArray)
             {
-                if (fieldDef.ReturnOnInsert || (fieldDef.IsPrimaryKey && fieldDef.AutoIncrement && modelDef.HasReturnAttribute))
+                if (fieldDef.ReturnOnInsert || (fieldDef.IsPrimaryKey && fieldDef.AutoIncrement && HasInsertReturnValues(modelDef)))
                 {
                     if (sbReturningColumns.Length > 0)
                         sbReturningColumns.Append(",");
diff --git a/src/ServiceStack.OrmLite.PostgreSQL/PostgreSQLDialectProvider.cs b/src/ServiceStack.OrmLite.PostgreSQL/PostgreSQLDialectProvider.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -17,14 +18,15 @@ public class PostgreSqlDialectProvider : OrmLiteDialectProviderBase<PostgreSqlDi
     {
         public static PostgreSqlDialectProvider Instance = new PostgreSqlDialectProvider();
 
-        public bool UseReturningForLastInsertId { get; set; }
+        public bool UseReturningForLastInsertId { get; set; } = true;
+
+        public string AutoIdGuidFunction { get; set; } = "uuid_generate_v4()";
 
         public PostgreSqlDialectProvider()
         {
             base.AutoIncrementDefinition = "";
             base.ParamString = ":";
             base.SelectIdentitySql = "SELECT LASTVAL()";
-            this.UseReturningForLastInsertId = true;
             this.NamingStrategy = new PostgreSqlNamingStrategy();
             this.StringSerializer = new JsonStringSerializer();
 
@@ -221,6 +223,71 @@ public override string GetColumnDefinition(FieldDefinition fieldDef)
             return definition;
         }
 
+        public override string GetAutoIdDefaultValue(FieldDefinition fieldDef)
+        {
+            return fieldDef.FieldType == typeof(Guid)
+                ? AutoIdGuidFunction
+                : null;
+        }
+
+        protected override bool ShouldSkipInsert(FieldDefinition fieldDef) => 
+            fieldDef.ShouldSkipInsert() || fieldDef.AutoId;
+
+        protected virtual bool ShouldReturnOnInsert(ModelDefinition modelDef, FieldDefinition fieldDef) =>
+            fieldDef.ReturnOnInsert || (fieldDef.IsPrimaryKey && fieldDef.AutoIncrement && HasInsertReturnValues(modelDef)) || fieldDef.AutoId;
+
+        public override bool HasInsertReturnValues(ModelDefinition modelDef) =>
+            modelDef.FieldDefinitions.Any(x => x.ReturnOnInsert || (x.AutoId && x.FieldType == typeof(Guid)));
+
+        public override void PrepareParameterizedInsertStatement<T>(IDbCommand cmd, ICollection<string> insertFields = null)
+        {
+            var sbColumnNames = StringBuilderCache.Allocate();
+            var sbColumnValues = StringBuilderCacheAlt.Allocate();
+            var sbReturningColumns = StringBuilderCacheAlt.Allocate();
+            var modelDef = OrmLiteUtils.GetModelDefinition(typeof(T));
+
+            cmd.Parameters.Clear();
+
+            foreach (var fieldDef in modelDef.FieldDefinitionsArray)
+            {
+                if (ShouldReturnOnInsert(modelDef, fieldDef))
+                {
+                    sbReturningColumns.Append(sbReturningColumns.Length == 0 ? "RETURNING " : ",");
+                    sbReturningColumns.Append(GetQuotedColumnName(fieldDef.FieldName));
+                }
+
+                if (ShouldSkipInsert(fieldDef))
+                    continue;
+
+                //insertFields contains Property "Name" of fields to insert ( that's how expressions work )
+                if (insertFields != null && !insertFields.Contains(fieldDef.Name, StringComparer.OrdinalIgnoreCase))
+                    continue;
+
+                if (sbColumnNames.Length > 0)
+                    sbColumnNames.Append(",");
+                if (sbColumnValues.Length > 0)
+                    sbColumnValues.Append(",");
+
+                try
+                {
+                    sbColumnNames.Append(GetQuotedColumnName(fieldDef.FieldName));
+
+                    sbColumnValues.Append(this.GetParam(SanitizeFieldNameForParamName(fieldDef.FieldName)));
+                    AddParameter(cmd, fieldDef);
+                }
+                catch (Exception ex)
+                {
+                    Log.Error("ERROR in PrepareParameterizedInsertStatement(): " + ex.Message, ex);
+                    throw;
+                }
+            }
+
+            var strReturning = StringBuilderCacheAlt.ReturnAndFree(sbReturningColumns);
+            cmd.CommandText = $"INSERT INTO {GetQuotedTableName(modelDef)} ({StringBuilderCache.ReturnAndFree(sbColumnNames)}) " +
+                              $"VALUES ({StringBuilderCacheAlt.ReturnAndFree(sbColumnValues)})"
+                              + strReturning;
+        }
+        
         //Convert xmin into an integer so it can be used in comparisons
         public const string RowVersionFieldComparer = "int8in(xidout(xmin))";
 
diff --git a/src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs b/src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs
@@ -193,6 +193,13 @@ protected virtual string GetAutoIncrementDefinition(FieldDefinition fieldDef)
             return AutoIncrementDefinition;
         }
 
+        public override string GetAutoIdDefaultValue(FieldDefinition fieldDef)
+        {
+            return fieldDef.FieldType == typeof(Guid) 
+                ? "newid()" 
+                : null;
+        }
+
         public override string GetColumnDefinition(FieldDefinition fieldDef)
         {
             // https://msdn.microsoft.com/en-us/library/ms182776.aspx
@@ -310,11 +317,14 @@ protected string Sequence(string schema, string sequence)
                    + GetQuotedName(sequence);
         }
 
+        protected override bool ShouldSkipInsert(FieldDefinition fieldDef) => 
+            fieldDef.ShouldSkipInsert() || fieldDef.AutoId;
+
         protected virtual bool ShouldReturnOnInsert(ModelDefinition modelDef, FieldDefinition fieldDef) =>
-            fieldDef.ReturnOnInsert || (fieldDef.IsPrimaryKey && fieldDef.AutoIncrement && modelDef.HasReturnAttribute);
+            fieldDef.ReturnOnInsert || (fieldDef.IsPrimaryKey && fieldDef.AutoIncrement && HasInsertReturnValues(modelDef)) || fieldDef.AutoId;
 
-        protected virtual bool ShouldSkipInsert(FieldDefinition fieldDef) => 
-            fieldDef.ShouldSkipInsert();
+        public override bool HasInsertReturnValues(ModelDefinition modelDef) =>
+            modelDef.FieldDefinitions.Any(x => x.ReturnOnInsert || (x.AutoId && x.FieldType == typeof(Guid)));
 
         protected virtual bool SupportsSequences(FieldDefinition fieldDef) => false;
 
diff --git a/src/ServiceStack.OrmLite.SqlServerTests/InsertParam_GetLastInsertId.cs b/src/ServiceStack.OrmLite.SqlServerTests/InsertParam_GetLastInsertId.cs
@@ -54,7 +54,7 @@ public void Can_retrieve_ServerGuid()
                 var obj = new ServerGuid { Name = "foo" };
 
                 cmd.GetDialectProvider().PrepareParameterizedInsertStatement<ServerGuid>(cmd,
-                    insertFields: OrmLiteUtils.GetNonDefaultValueInsertFields(obj));
+                    insertFields: db.GetDialectProvider().GetNonDefaultValueInsertFields(obj));
 
                 cmd.CommandText = cmd.CommandText.Replace("VALUES", "OUTPUT inserted.Id VALUES");
 
diff --git a/src/ServiceStack.OrmLite.SqlServerTests/ReturnAttributeTests.cs b/src/ServiceStack.OrmLite.SqlServerTests/ReturnAttributeTests.cs
@@ -1,4 +1,5 @@
-﻿using System.Data;
+﻿using System;
+using System.Data;
 using System.Configuration;
 using ServiceStack.DataAnnotations;
 using ServiceStack.OrmLite;
@@ -130,5 +131,6 @@ public void Does_generate_Sql_with_Sequence()
                 Assert.That(sql, Is.EqualTo("INSERT INTO \"UserSequence\" (\"Id\",\"Name\",\"UserName\",\"Email\") OUTPUT INSERTED.\"Id\" VALUES (NEXT VALUE FOR \"Gen_UserSequence_Id\",@Name,@UserName,@Email)"), "normal Insert");
             }
         }
+
     }
 }
diff --git a/src/ServiceStack.OrmLite.sln b/src/ServiceStack.OrmLite.sln
@@ -8,7 +8,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{6CEB3EDE
 		..\build\build.bat = ..\build\build.bat
 		..\build\build.proj = ..\build\build.proj
 		..\build\build.tasks = ..\build\build.tasks
-		..\build\copy.bat = ..\build\copy.bat
 		..\README.md = ..\README.md
 		..\NuGet\ServiceStack.OrmLite.Core\servicestack.ormlite.core.nuspec = ..\NuGet\ServiceStack.OrmLite.Core\servicestack.ormlite.core.nuspec
 		..\NuGet\ServiceStack.OrmLite.Firebird\servicestack.ormlite.firebird.nuspec = ..\NuGet\ServiceStack.OrmLite.Firebird\servicestack.ormlite.firebird.nuspec
@@ -27,6 +26,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{6CEB3EDE
 		..\NuGet\ServiceStack.OrmLite.SqlServer.Core\servicestack.ormlite.sqlserver.core.nuspec = ..\NuGet\ServiceStack.OrmLite.SqlServer.Core\servicestack.ormlite.sqlserver.core.nuspec
 		..\NuGet\ServiceStack.OrmLite.SqlServer\servicestack.ormlite.sqlserver.nuspec = ..\NuGet\ServiceStack.OrmLite.SqlServer\servicestack.ormlite.sqlserver.nuspec
 		..\NuGet\ServiceStack.OrmLite.T4\servicestack.ormlite.t4.nuspec = ..\NuGet\ServiceStack.OrmLite.T4\servicestack.ormlite.t4.nuspec
+		..\lib\copy.bat = ..\lib\copy.bat
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceStack.OrmLite.Sqlite", "ServiceStack.OrmLite.Sqlite\ServiceStack.OrmLite.Sqlite.csproj", "{CF68A37D-D071-469D-AE04-68594CB95382}"
diff --git a/src/ServiceStack.OrmLite/Async/OrmLiteWriteCommandExtensionsAsync.cs b/src/ServiceStack.OrmLite/Async/OrmLiteWriteCommandExtensionsAsync.cs
@@ -269,7 +269,7 @@ internal static Task<long> InsertAsync<T>(this IDbCommand dbCmd, T obj, Action<I
             var dialectProvider = dbCmd.GetDialectProvider();
 
             dialectProvider.PrepareParameterizedInsertStatement<T>(dbCmd,
-                insertFields: OrmLiteUtils.GetNonDefaultValueInsertFields(obj));
+                insertFields: dialectProvider.GetNonDefaultValueInsertFields(obj));
 
             dialectProvider.SetParameterValues<T>(dbCmd, obj);
 
diff --git a/src/ServiceStack.OrmLite/FieldDefinition.cs b/src/ServiceStack.OrmLite/FieldDefinition.cs
@@ -36,6 +36,8 @@ public class FieldDefinition
 
         public bool AutoIncrement { get; set; }
 
+        public bool AutoId { get; set; }
+
         public bool IsNullable { get; set; }
 
         public bool IsIndexed { get; set; }
@@ -138,6 +140,7 @@ public FieldDefinition Clone(Action<FieldDefinition> modifier = null)
                 PropertyInfo = PropertyInfo,
                 IsPrimaryKey = IsPrimaryKey,
                 AutoIncrement = AutoIncrement,
+                AutoId = AutoId,
                 IsNullable = IsNullable,
                 IsIndexed = IsIndexed,
                 IsUniqueIndex = IsUniqueIndex,
diff --git a/src/ServiceStack.OrmLite/IOrmLiteDialectProvider.cs b/src/ServiceStack.OrmLite/IOrmLiteDialectProvider.cs
@@ -65,6 +65,10 @@ public interface IOrmLiteDialectProvider
 
         string GetDefaultValue(Type tableType, string fieldName);
 
+        string GetDefaultValue(FieldDefinition fieldDef);
+
+        bool HasInsertReturnValues(ModelDefinition modelDef);
+
         object GetParamValue(object value, Type fieldType);
 
         object ToDbValue(object value, Type type);
@@ -105,8 +109,10 @@ public interface IOrmLiteDialectProvider
 
         void PrepareParameterizedInsertStatement<T>(IDbCommand cmd, ICollection<string> insertFields = null);
 
+        /// <returns>If had RowVersion</returns>
         bool PrepareParameterizedUpdateStatement<T>(IDbCommand cmd, ICollection<string> updateFields = null);
 
+        /// <returns>If had RowVersion</returns>
         bool PrepareParameterizedDeleteStatement<T>(IDbCommand cmd, IDictionary<string, object> delteFieldValues);
 
         void PrepareStoredProcedureStatement<T>(IDbCommand cmd, T obj);
diff --git a/src/ServiceStack.OrmLite/ModelDefinition.cs b/src/ServiceStack.OrmLite/ModelDefinition.cs
@@ -47,8 +47,6 @@ public ModelDefinition()
 
         public bool HasAutoIncrementId => PrimaryKey != null && PrimaryKey.AutoIncrement;
 
-        public bool HasReturnAttribute => this.FieldDefinitions.Any(x => x.ReturnOnInsert);
-
         public bool HasSequenceAttribute => this.FieldDefinitions.Any(x => !x.Sequence.IsNullOrEmpty());
 
         public FieldDefinition RowVersion { get; set; }
diff --git a/src/ServiceStack.OrmLite/OrmLiteConfigExtensions.cs b/src/ServiceStack.OrmLite/OrmLiteConfigExtensions.cs
@@ -93,8 +93,11 @@ internal static ModelDefinition GetModelDefinition(this Type modelType)
                 var belongToAttribute = propertyInfo.FirstAttribute<BelongToAttribute>();
                 var isFirst = i++ == 0;
 
+                var isAutoId = propertyInfo.HasAttribute<AutoIdAttribute>();
+
                 var isPrimaryKey = (!hasPkAttr && (propertyInfo.Name == OrmLiteConfig.IdField || (!hasIdField && isFirst)))
-                    || propertyInfo.HasAttributeNamed(typeof(PrimaryKeyAttribute).Name);
+                    || propertyInfo.HasAttributeNamed(typeof(PrimaryKeyAttribute).Name)
+                    || isAutoId;
 
                 var isRowVersion = propertyInfo.Name == ModelDefinition.RowVersionName
                     && (propertyInfo.PropertyType == typeof(ulong) || propertyInfo.PropertyType == typeof(byte[]));
@@ -142,6 +145,7 @@ internal static ModelDefinition GetModelDefinition(this Type modelType)
                     AutoIncrement =
                         isPrimaryKey &&
                         propertyInfo.HasAttribute<AutoIncrementAttribute>(),
+                    AutoId = isAutoId,
                     IsIndexed = !isPrimaryKey && isIndex,
                     IsUniqueIndex = isUnique,
                     IsClustered = indexAttr != null && indexAttr.Clustered,
diff --git a/src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs b/src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs
@@ -538,6 +538,9 @@ public virtual SelectItem[] GetColumnNames(ModelDefinition modelDef, bool tableQ
             return sqlColumns;
         }
 
+        protected virtual bool ShouldSkipInsert(FieldDefinition fieldDef) => 
+            fieldDef.ShouldSkipInsert();
+
         public virtual string ToInsertRowStatement(IDbCommand cmd, object objWithProperties, ICollection<string> insertFields = null)
         {
             if (insertFields == null)
@@ -549,7 +552,7 @@ public virtual string ToInsertRowStatement(IDbCommand cmd, object objWithPropert
 
             foreach (var fieldDef in modelDef.FieldDefinitionsArray)
             {
-                if (fieldDef.ShouldSkipInsert())
+                if (ShouldSkipInsert(fieldDef))
                     continue;
 
                 if (insertFields.Count > 0 && !insertFields.Contains(fieldDef.Name, StringComparer.OrdinalIgnoreCase))
@@ -595,6 +598,15 @@ public virtual string ToInsertStatement<T>(IDbCommand dbCmd, T item, ICollection
             return MergeParamsIntoSql(dbCmd.CommandText, ToArray(dbCmd.Parameters));
         }
 
+        protected virtual object GetInsertDefaultValue(FieldDefinition fieldDef)
+        {
+            if (!fieldDef.AutoId)
+                return null;
+            if (fieldDef.FieldType == typeof(Guid))
+                return Guid.NewGuid();
+            return null;
+        }
+
         public virtual void PrepareParameterizedInsertStatement<T>(IDbCommand cmd, ICollection<string> insertFields = null)
         {
             var sbColumnNames = StringBuilderCache.Allocate();
@@ -622,7 +634,12 @@ public virtual void PrepareParameterizedInsertStatement<T>(IDbCommand cmd, IColl
                     sbColumnNames.Append(GetQuotedColumnName(fieldDef.FieldName));
                     sbColumnValues.Append(this.GetParam(SanitizeFieldNameForParamName(fieldDef.FieldName)));
 
-                    AddParameter(cmd, fieldDef);
+                    var p = AddParameter(cmd, fieldDef);
+
+                    if (fieldDef.AutoId)
+                    {
+                        p.Value = GetInsertDefaultValue(fieldDef);
+                    }
                 }
                 catch (Exception ex)
                 {
@@ -880,6 +897,12 @@ public virtual void SetParameterValues<T>(IDbCommand dbCmd, object obj)
                         throw new ArgumentException($"Field Definition '{fieldName}' was not found");
                 }
 
+                if (fieldDef.AutoId && p.Value != null)
+                {
+                    fieldDef.SetValueFn(obj, p.Value); //Auto populate default values
+                    continue;
+                }
+                
                 SetParameterValue<T>(fieldDef, p, obj);
             }
         }
@@ -1146,6 +1169,9 @@ public virtual string ToDeleteStatement(Type tableType, string sqlFilter, params
             return StringBuilderCache.ReturnAndFree(sql);
         }
 
+        public virtual bool HasInsertReturnValues(ModelDefinition modelDef) =>
+            modelDef.FieldDefinitions.Any(x => x.ReturnOnInsert);
+
         public string GetDefaultValue(Type tableType, string fieldName)
         {
             var modelDef = tableType.GetModelDefinition();
@@ -1157,7 +1183,11 @@ public virtual string GetDefaultValue(FieldDefinition fieldDef)
         {
             var defaultValue = fieldDef.DefaultValue;
             if (string.IsNullOrEmpty(defaultValue))
-                return null;
+            {
+                return fieldDef.AutoId 
+                    ? GetAutoIdDefaultValue(fieldDef) 
+                    : null;
+            }
 
             if (!defaultValue.StartsWith("{"))
                 return defaultValue;
@@ -1167,6 +1197,8 @@ public virtual string GetDefaultValue(FieldDefinition fieldDef)
                 : null;
         }
 
+        public virtual string GetAutoIdDefaultValue(FieldDefinition fieldDef) => null;
+
         public virtual string ToCreateTableStatement(Type tableType)
         {
             var sbColumns = StringBuilderCache.Allocate();
diff --git a/src/ServiceStack.OrmLite/OrmLiteUtils.cs b/src/ServiceStack.OrmLite/OrmLiteUtils.cs
@@ -954,15 +954,24 @@ internal static void SetRefFieldChildResults<Parent>(List<Parent> parents, Model
             }
         }
 
+        [Obsolete("Use dialectProvider.GetNonDefaultValueInsertFields()")]
         public static List<string> GetNonDefaultValueInsertFields<T>(T obj)
+        {
+            return OrmLiteConfig.DialectProvider.GetNonDefaultValueInsertFields(obj);
+        }
+        
+        public static List<string> GetNonDefaultValueInsertFields<T>(this IOrmLiteDialectProvider dialectProvider, T obj)
         {
             var insertFields = new List<string>();
             var modelDef = typeof(T).GetModelDefinition();
             foreach (var fieldDef in modelDef.FieldDefinitionsArray)
             {
-                if (!string.IsNullOrEmpty(fieldDef.DefaultValue))
+                if (!string.IsNullOrEmpty(dialectProvider.GetDefaultValue(fieldDef)))
                 {
-                    var value = fieldDef.GetValue(obj);
+                    if (fieldDef.AutoId)
+                        continue;
+                    
+                    var value = fieldDef.GetValue(obj);    
                     if (value == null || value.Equals(fieldDef.FieldTypeDefaultValue))
                         continue;
                 }
diff --git a/src/ServiceStack.OrmLite/OrmLiteWriteCommandExtensions.cs b/src/ServiceStack.OrmLite/OrmLiteWriteCommandExtensions.cs
diff --git a/tests/ServiceStack.OrmLite.Tests/AutoIdTests.cs b/tests/ServiceStack.OrmLite.Tests/AutoIdTests.cs

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public override string ToInsertRowStatement(IDbCommand cmd, object objWithProper`
`125`	`125`
`126`	`126`	`foreach (var fieldDef in modelDef.FieldDefinitionsArray)`
`127`	`127`	`{`
`128`		`- if (fieldDef.ReturnOnInsert \|\| (fieldDef.IsPrimaryKey && fieldDef.AutoIncrement && modelDef.HasReturnAttribute))`
	`128`	`+ if (fieldDef.ReturnOnInsert \|\| (fieldDef.IsPrimaryKey && fieldDef.AutoIncrement && HasInsertReturnValues(modelDef)))`
`129`	`129`	`{`
`130`	`130`	`if (sbReturningColumns.Length > 0)`
`131`	`131`	`sbReturningColumns.Append(",");`
`@@ -199,7 +199,7 @@ public override void PrepareParameterizedInsertStatement<T>(IDbCommand cmd, ICol`
`199`	`199`
`200`	`200`	`foreach (var fieldDef in modelDef.FieldDefinitionsArray)`
`201`	`201`	`{`
`202`		`- if (fieldDef.ReturnOnInsert \|\| (fieldDef.IsPrimaryKey && fieldDef.AutoIncrement && modelDef.HasReturnAttribute))`
	`202`	`+ if (fieldDef.ReturnOnInsert \|\| (fieldDef.IsPrimaryKey && fieldDef.AutoIncrement && HasInsertReturnValues(modelDef)))`
`203`	`203`	`{`
`204`	`204`	`if (sbReturningColumns.Length > 0)`
`205`	`205`	`sbReturningColumns.Append(",");`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using System.Data;`
	`1`	`+using System;`
	`2`	`+using System.Data;`
`2`	`3`	`using System.Configuration;`
`3`	`4`	`using ServiceStack.DataAnnotations;`
`4`	`5`	`using ServiceStack.OrmLite;`
`@@ -130,5 +131,6 @@ public void Does_generate_Sql_with_Sequence()`
`130`	`131`	`Assert.That(sql, Is.EqualTo("INSERT INTO \"UserSequence\" (\"Id\",\"Name\",\"UserName\",\"Email\") OUTPUT INSERTED.\"Id\" VALUES (NEXT VALUE FOR \"Gen_UserSequence_Id\",@Name,@UserName,@Email)"), "normal Insert");`
`131`	`132`	`}`
`132`	`133`	`}`
	`134`	`+`
`133`	`135`	`}`
`134`	`136`	`}`