Merge: Autoincrement when setting a KeyColumn

richardhopton · richardhopton · commit a08c3eb96bb9 · 2011-12-01T12:05:13.000Z
diff --git a/Simple.Data.InMemoryTest/InMemoryTests.cs b/Simple.Data.InMemoryTest/InMemoryTests.cs
@@ -350,6 +350,22 @@ public void AutoIncrementShouldReturnNextIdInSequenceWhenOneRowExsists()
             Assert.AreEqual(2, newId);
         }
 
+        [Test]
+        public void ShouldBeAbleToSetAutoIncrementWhenSettingKeyColumn()
+        {
+            // Arrange
+            var adapter = new InMemoryAdapter();
+
+            // Act
+            adapter.SetKeyColumn("Users", "Id", true);
+
+            // Assert
+            Database.UseMockAdapter(adapter);
+            var db = Database.Open();
+            var firstId = db.Users.Insert(Name: "Marcus").Id;
+            Assert.AreEqual(1, firstId);
+        }
+
         [Test]
         public void SelectCountShouldReturnCount()
         {
diff --git a/Simple.Data/InMemoryAdapter.cs b/Simple.Data/InMemoryAdapter.cs
@@ -188,9 +188,11 @@ public void SetAutoIncrementColumn(string tableName, string columnName)
             _autoIncrementColumns.Add(tableName, columnName);
         }
 
-        public void SetKeyColumn(string tableName, string columnName)
+        public void SetKeyColumn(string tableName, string columnName, bool autoIncremented = false)
         {
             _keyColumns[tableName] = new[] {columnName};
+            if (autoIncremented)
+                SetAutoIncrementColumn(tableName, columnName);
         }
 
         public void SetKeyColumns(string tableName, params string[] columnNames)

Original file line number	Diff line number	Diff line change
`@@ -188,9 +188,11 @@ public void SetAutoIncrementColumn(string tableName, string columnName)`
`188`	`188`	`_autoIncrementColumns.Add(tableName, columnName);`
`189`	`189`	`}`
`190`	`190`
`191`		`- public void SetKeyColumn(string tableName, string columnName)`
	`191`	`+ public void SetKeyColumn(string tableName, string columnName, bool autoIncremented = false)`
`192`	`192`	`{`
`193`	`193`	`_keyColumns[tableName] = new[] {columnName};`
	`194`	`+ if (autoIncremented)`
	`195`	`+ SetAutoIncrementColumn(tableName, columnName);`
`194`	`196`	`}`
`195`	`197`
`196`	`198`	`public void SetKeyColumns(string tableName, params string[] columnNames)`