Merge pull request #127 from mobilebilly/feature/persisted-computed-c…

…olumn Support persisted computed column
sethreno · Mar 13, 2017 · 0e0ad52 · 0e0ad52
2 parents 3b10457 + 9e7d5b1
commit 0e0ad52
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 10 deletions.
diff --git a/model/Models/Column.cs b/model/Models/Column.cs
@@ -57,17 +57,21 @@ public string IdentityText {
 			}
 		}
 
-		public string RowGuidColText => IsRowGuidCol ? " ROWGUIDCOL " : string.Empty;
+    public string RowGuidColText => IsRowGuidCol ? " ROWGUIDCOL " : string.Empty;
+
+    public bool Persisted { get; set; }
 
-		public ColumnDiff Compare(Column c) {
+	    public ColumnDiff Compare(Column c) {
 			return new ColumnDiff(this, c);
 		}
 
 		private string ScriptBase(bool includeDefaultConstraint) {
-			if (!string.IsNullOrEmpty(ComputedDefinition))
-				return $"[{Name}] AS {ComputedDefinition}";
+		    if (!string.IsNullOrEmpty(ComputedDefinition)) {
+		        var persistedSetting = Persisted ? " PERSISTED" : string.Empty;
+		        return $"[{Name}] AS {ComputedDefinition}{persistedSetting}";
+		    }
 
-			var val = new StringBuilder($"[{Name}] [{Type}]");
+		    var val = new StringBuilder($"[{Name}] [{Type}]");
 
 			switch (Type) {
 				case "bigint":
@@ -171,9 +175,9 @@ public ColumnDiff(Column target, Column source) {
 
 		private bool IsDiffBase => Source.IsNullable != Target.IsNullable || Source.Length != Target.Length ||
 								   Source.Position != Target.Position || Source.Type != Target.Type || Source.Precision != Target.Precision ||
-								   Source.Scale != Target.Scale || Source.ComputedDefinition != Target.ComputedDefinition;
+								   Source.Scale != Target.Scale || Source.ComputedDefinition != Target.ComputedDefinition || Source.Persisted != Target.Persisted;
 
-		public bool DefaultIsDiff => Source.DefaultText != Target.DefaultText;
+        public bool DefaultIsDiff => Source.DefaultText != Target.DefaultText;
 
 		public bool OnlyDefaultIsDiff => DefaultIsDiff && !IsDiffBase;
 

diff --git a/model/Models/Database.cs b/model/Models/Database.cs
@@ -669,14 +669,17 @@ private void LoadColumnComputes(SqlCommand cm) {
 						object_schema_name(object_id) as TABLE_SCHEMA,
 						object_name(object_id) as TABLE_NAME,
 						name as COLUMN_NAME,
-						definition as DEFINITION
+						definition as DEFINITION,
+						is_persisted as PERSISTED
 					from sys.computed_columns cc
 					";
 			using (var dr = cm.ExecuteReader()) {
 				while (dr.Read()) {
 					var t = FindTable((string)dr["TABLE_NAME"], (string)dr["TABLE_SCHEMA"]);
-					t.Columns.Find((string)dr["COLUMN_NAME"]).ComputedDefinition = (string)dr["DEFINITION"];
-				}
+				    var column = t.Columns.Find((string) dr["COLUMN_NAME"]);
+                    column.ComputedDefinition = (string)dr["DEFINITION"];
+                    column.Persisted = (bool)dr["PERSISTED"];
+                }
 			}
 		}
 

diff --git a/test/ColumnTester.cs b/test/ColumnTester.cs
@@ -45,6 +45,23 @@ public void no_trailing_space_with_no_name_default()
                 Assert.AreEqual("       DEFAULT 0", lines[1]);
             }
 
+
+
+            [Test]
+            public void computed_column()
+            {
+                var c = new Column("test", "int", false, null) {ComputedDefinition = "(A + B)"};
+
+                Assert.AreEqual("[test] AS (A + B)", c.ScriptCreate());
+            }
+
+            [Test]
+            public void computed_column_persisted()
+            {
+                var c = new Column("test", "int", false, null) {ComputedDefinition = "(A + B)", Persisted = true};
+
+                Assert.AreEqual("[test] AS (A + B) PERSISTED", c.ScriptCreate());
+            }
         }
 	}
 }