Synced to latest EF release commit

npgsql · Apr 3, 2015 · 8d96f24 · 8d96f24
1 parent 5a911de
commit 8d96f24
Show file tree

Hide file tree

Showing 8 changed files with 315 additions and 185 deletions.
diff --git a/external/EntityFramework b/external/EntityFramework
diff --git a/src/Npgsql.EntityFramework7/Metadata/NpgsqlSequenceBuilder.cs b/src/Npgsql.EntityFramework7/Metadata/NpgsqlSequenceBuilder.cs
@@ -31,7 +31,8 @@ public virtual NpgsqlSequenceBuilder IncrementBy(int increment)
                 increment,
                 _sequence.MinValue,
                 _sequence.MaxValue,
-                _sequence.Type);
+                _sequence.Type,
+                _sequence.Cycle);
 
             model.Npgsql().AddOrReplaceSequence(_sequence);
 
@@ -49,7 +50,8 @@ public virtual NpgsqlSequenceBuilder Start(long startValue)
                 _sequence.IncrementBy,
                 _sequence.MinValue,
                 _sequence.MaxValue,
-                _sequence.Type);
+                _sequence.Type,
+                _sequence.Cycle);
 
             model.Npgsql().AddOrReplaceSequence(_sequence);
 
@@ -67,7 +69,8 @@ public virtual NpgsqlSequenceBuilder Type<T>()
                 _sequence.IncrementBy,
                 _sequence.MinValue,
                 _sequence.MaxValue,
-                typeof(T));
+                typeof(T),
+                _sequence.Cycle);
 
             model.Npgsql().AddOrReplaceSequence(_sequence);
 
@@ -85,7 +88,8 @@ public virtual NpgsqlSequenceBuilder Max(long maximum)
                 _sequence.IncrementBy,
                 _sequence.MinValue,
                 maximum,
-                _sequence.Type);
+                _sequence.Type,
+                _sequence.Cycle);
 
             model.Npgsql().AddOrReplaceSequence(_sequence);
 
@@ -103,7 +107,27 @@ public virtual NpgsqlSequenceBuilder Min(long minimum)
                 _sequence.IncrementBy,
                 minimum,
                 _sequence.MaxValue,
-                _sequence.Type);
+                _sequence.Type,
+                _sequence.Cycle);
+
+            model.Npgsql().AddOrReplaceSequence(_sequence);
+
+            return this;
+        }
+
+        public virtual NpgsqlSequenceBuilder Cycle(bool cycle = true)
+        {
+            var model = (Model)_sequence.Model;
+
+            _sequence = new Sequence(
+                _sequence.Name,
+                _sequence.Schema,
+                _sequence.StartValue,
+                _sequence.IncrementBy,
+                _sequence.MinValue,
+                _sequence.MaxValue,
+                _sequence.Type,
+                cycle);
 
             model.Npgsql().AddOrReplaceSequence(_sequence);
 

diff --git a/src/Npgsql.EntityFramework7/Migrations/CreateDatabaseOperation.cs b/src/Npgsql.EntityFramework7/Migrations/CreateDatabaseOperation.cs
@@ -1,26 +1,13 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System.Collections.Generic;
 using JetBrains.Annotations;
-using Microsoft.Data.Entity;
 using Microsoft.Data.Entity.Relational.Migrations.Operations;
-using Microsoft.Data.Entity.Utilities;
 
 namespace Npgsql.EntityFramework7.Migrations
 {
     public class CreateDatabaseOperation : MigrationOperation
     {
-        public CreateDatabaseOperation(
-            [NotNull] string name,
-            [CanBeNull] IReadOnlyDictionary<string, string> annotations = null)
-            : base(annotations)
-        {
-            Check.NotEmpty(name, nameof(name));
-
-            Name = name;
-        }
-
-        public virtual string Name { get; }
+        public virtual string Name { get;[param: NotNull] set; }
     }
 }
diff --git a/src/Npgsql.EntityFramework7/Migrations/DropDatabaseOperation.cs b/src/Npgsql.EntityFramework7/Migrations/DropDatabaseOperation.cs
@@ -1,26 +1,13 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System.Collections.Generic;
 using JetBrains.Annotations;
-using Microsoft.Data.Entity;
 using Microsoft.Data.Entity.Relational.Migrations.Operations;
-using Microsoft.Data.Entity.Utilities;
 
 namespace Npgsql.EntityFramework7.Migrations
 {
     public class DropDatabaseOperation : MigrationOperation
     {
-        public DropDatabaseOperation(
-            [NotNull] string name,
-            [CanBeNull] IReadOnlyDictionary<string, string> annotations = null)
-            : base(annotations)
-        {
-            Check.NotEmpty(name, nameof(name));
-
-            Name = name;
-        }
-
-        public virtual string Name { get; }
+        public virtual string Name { get;[param: NotNull] set; }
     }
 }
diff --git a/src/Npgsql.EntityFramework7/Migrations/NpgsqlHistoryRepository.cs b/src/Npgsql.EntityFramework7/Migrations/NpgsqlHistoryRepository.cs
@@ -129,28 +129,30 @@ public virtual MigrationOperation GetDeleteOperation(string migrationId)
         {
             Check.NotEmpty(migrationId, nameof(migrationId));
 
-            return new SqlOperation(
-                new StringBuilder()
+            return new SqlOperation
+            {
+                Sql = new StringBuilder()
                     .AppendLine("DELETE FROM [dbo].[__MigrationHistory]")
                     .Append("WHERE [MigrationId] = '").Append(_sql.EscapeLiteral(migrationId))
                         .Append("' AND [ContextKey] = '").Append(_sql.EscapeLiteral(_contextType.FullName))
                         .AppendLine("';")
-                    .ToString(),
-                suppressTransaction: false);
+                    .ToString()
+            };
         }
 
         public virtual MigrationOperation GetInsertOperation(IHistoryRow row)
         {
             Check.NotNull(row, nameof(row));
 
-            return new SqlOperation(
-                new StringBuilder()
+            return new SqlOperation
+            {
+                Sql = new StringBuilder()
                     .AppendLine("INSERT INTO [dbo].[__MigrationHistory] ([MigrationId], [ContextKey], [ProductVersion])")
                     .Append("VALUES ('").Append(_sql.EscapeLiteral(row.MigrationId)).Append("', '")
                         .Append(_sql.EscapeLiteral(_contextType.FullName)).Append("', '")
                         .Append(_sql.EscapeLiteral(row.ProductVersion)).AppendLine("');")
-                    .ToString(),
-                suppressTransaction: false);
+                    .ToString()
+            };
         }
 
         public virtual string BeginIfNotExists(string migrationId)