@@ -363,7 +363,11 @@ namespace SubSonic.Extensions IColumn col = tbl.GetColumn(key); if(col != null) { +<<<<<<< HEAD if(!col.IsPrimaryKey && !col.IsReadOnly) +======= + if(!col.IsPrimaryKey && !col.IsComputed) +>>>>>>> e8141cffb4c5a6c22269f402c7e08dcfc8ff6c23 query.Set(col).EqualTo(settings[key]); } } @@ -399,7 +403,11 @@ namespace SubSonic.Extensions IColumn col = tbl.GetColumn(key); if(col != null) { +<<<<<<< HEAD if(!col.AutoIncrement && !col.IsReadOnly) +======= + if(!col.AutoIncrement && !col.IsComputed) +>>>>>>> e8141cffb4c5a6c22269f402c7e08dcfc8ff6c23 query.Value(col.QualifiedName, hashed[key], col.DataType); } } SubSonic.Core/Extensions/Database.cs @@ -53,6 +53,7 @@ namespace SubSonic.Schema public int MaxLength { get; set; } public bool IsNullable { get; set; } public bool IsReadOnly { get; set; } + public bool IsComputed { get; set; } public bool AutoIncrement { get; set; } public int NumberScale { get; set; } public int NumericPrecision { get; set; } SubSonic.Core/Schema/DatabaseColumn.cs @@ -10,6 +10,7 @@ namespace SubSonic.Schema int MaxLength { get; set; } bool IsNullable { get; set; } bool IsReadOnly { get; set; } + bool IsComputed { get; set; } bool AutoIncrement { get; set; } int NumberScale { get; set; } int NumericPrecision { get; set; } SubSonic.Core/Schema/IColumn.cs @@ -13,6 +13,23 @@ namespace SubSonic.Tests.BugReports { /// Issue 32 - ActiveRecord - IsLoaded not set true when query is executed /// http://github.com/subsonic/SubSonic-3.0/issues#issue/32 /// </summary> + + [Fact] + public void Github_Issue95_Booleans_Always_Set_True() { + var p = Product.SingleOrDefault(x => x.ProductID == 1); + p.Discontinued = true; + p.Save(); + + p = Product.SingleOrDefault(x => x.ProductID == 1); + Assert.Equal(p.Discontinued, true); + + p.Discontinued = false; + p.Save(); + + p = Product.SingleOrDefault(x => x.ProductID == 1); + Assert.Equal(p.Discontinued, false); + + } [Fact] public void UsingLinq_With_ActiveRecord_Product_Should_Set_IsLoaded_True() { var list = from p in Product.All() SubSonic.Tests/BugReports/ActiveRecord.cs e0e4ba29bec73bb9ce8dca8b6bd24b008d149ae3 Rob Conery robconery@gmail.com http://github.com/subsonic/SubSonic-3.0/commit/c8c4e93e5b18ff5254a8b3ef3a2daa4a71c2aac3 c8c4e93e5b18ff5254a8b3ef3a2daa4a71c2aac3 2009-10-28T16:17:32-07:00 2009-10-28T16:17:32-07:00 Updated bit for booleans e78267855d5fad39dbb2dde247279d11461104a0 Rob Conery robconery@gmail.com