Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit e1ad7eb

Browse files
committed
Move PgSql* + SqlServerMemoryOptimized data annotation attrs to SS.Interfaces
1 parent d98b969 commit e1ad7eb

File tree

4 files changed

+7
-62
lines changed

4 files changed

+7
-62
lines changed

src/ServiceStack.OrmLite.PostgreSQL/PgsqlTypes.cs

Lines changed: 0 additions & 34 deletions
This file was deleted.

src/ServiceStack.OrmLite.PostgreSQL/ServiceStack.OrmLite.PostgreSQL.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
<Compile Include="Converters\PostgreSqlIntegerConverters.cs" />
7878
<Compile Include="Converters\PostgreSqlStringConverters.cs" />
7979
<Compile Include="Converters\PostrgreSqlFloatConverters.cs" />
80-
<Compile Include="PgsqlTypes.cs" />
8180
<Compile Include="PostgreSqlDialect.cs" />
8281
<Compile Include="PostgreSqlDialectProvider.cs" />
8382
<Compile Include="PostgreSqlNamingStrategy.cs" />

src/ServiceStack.OrmLite.SqlServer/SqlServer2014OrmLiteDialectProvider.cs

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ public override string ToCreateTableStatement(Type tableType)
5454
sbConstraints.Append(GetForeignKeyOnUpdateClause(fieldDef.ForeignKey));
5555
}
5656

57-
if (tableType.HasAttribute<MemoryOptimizedAttribute>())
57+
if (tableType.HasAttribute<SqlServerMemoryOptimizedAttribute>())
5858
{
5959
sbMemOptimized.Append(" WITH (MEMORY_OPTIMIZED=ON");
60-
var attrib = tableType.FirstAttribute<MemoryOptimizedAttribute>();
61-
if (attrib.Durability == TableDurability.SchemaOnly)
60+
var attrib = tableType.FirstAttribute<SqlServerMemoryOptimizedAttribute>();
61+
if (attrib.Durability == SqlServerDurability.SchemaOnly)
6262
sbMemOptimized.Append(", DURABILITY=SCHEMA_ONLY");
63-
else if (attrib.Durability == TableDurability.SchemaAndData)
63+
else if (attrib.Durability == SqlServerDurability.SchemaAndData)
6464
sbMemOptimized.Append(", DURABILITY=SCHEMA_AND_DATA");
6565
sbMemOptimized.Append(")");
6666
}
@@ -72,23 +72,3 @@ public override string ToCreateTableStatement(Type tableType)
7272
}
7373
}
7474
}
75-
76-
namespace ServiceStack.DataAnnotations
77-
{
78-
// SQL 2014: https://msdn.microsoft.com/en-us/library/dn553122(v=sql.120).aspx
79-
// SQL 2016: https://msdn.microsoft.com/en-us/library/dn553122(v=sql.130).aspx
80-
public class MemoryOptimizedAttribute : Attribute
81-
{
82-
public MemoryOptimizedAttribute() { }
83-
84-
public MemoryOptimizedAttribute(TableDurability durability) { Durability = durability; }
85-
86-
public TableDurability? Durability { get; set; }
87-
}
88-
89-
public enum TableDurability
90-
{
91-
SchemaOnly, // (non-durable table) recreated upon server restart, data is lost, no transaction logging and checkpoints
92-
SchemaAndData // (durable table) data persists upon server restart
93-
}
94-
}

src/ServiceStack.OrmLite.SqlServerTests/MemoryOptimizedAttributeTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void CanCreateMemoryOptimizedTableWithSchemaAndDurability()
4747
}
4848
}
4949

50-
[MemoryOptimized]
50+
[SqlServerMemoryOptimized]
5151
public class TypeWithMemTableNoDurability
5252
{
5353
[AutoIncrement]
@@ -56,7 +56,7 @@ public class TypeWithMemTableNoDurability
5656
public string Name { get; set; }
5757
}
5858

59-
[MemoryOptimized(TableDurability.SchemaOnly)]
59+
[SqlServerMemoryOptimized(SqlServerDurability.SchemaOnly)]
6060
public class TypeWithMemTableSchemaOnlyDurability
6161
{
6262
[AutoIncrement]
@@ -65,7 +65,7 @@ public class TypeWithMemTableSchemaOnlyDurability
6565
public string Name { get; set; }
6666
}
6767

68-
[MemoryOptimized(TableDurability.SchemaAndData)]
68+
[SqlServerMemoryOptimized(SqlServerDurability.SchemaAndData)]
6969
public class TypeWithMemTableSchemaAndDataDurability
7070
{
7171
[AutoIncrement]

0 commit comments

Comments
 (0)