Cleaned up warnings, moved known schemas into core project.

Author: drunkcod

DataBoss.Specs/DataBossMappingSource.cs

@@ -6,6 +6,8 @@
 using System.Linq;
 using System.Reflection;
 
+using LinqTableAttribute = System.Data.Linq.Mapping.TableAttribute;
+
 namespace DataBoss.Specs
 {
 	class DataBossMappingSource : MappingSource
@@ -20,11 +22,11 @@ public DataBossTable(MetaModel model, Type rowType) {
 				this.rowType = rowType;
 			}
 
-			public override MetaModel Model { get { return model; } }
+			public override MetaModel Model => model;
 
 			public override string TableName { 
 				get { 
-					var linqTable = rowType.GetCustomAttributes(typeof(System.Data.Linq.Mapping.TableAttribute), true).Cast<System.Data.Linq.Mapping.TableAttribute>().SingleOrDefault();
+					var linqTable = rowType.GetCustomAttributes(typeof(LinqTableAttribute), true).Cast<LinqTableAttribute>().SingleOrDefault();
 					if(linqTable != null)
 						return linqTable.Name;
 					var table = rowType.GetCustomAttributes(typeof(System.ComponentModel.DataAnnotations.Schema.TableAttribute), true).Cast<System.ComponentModel.DataAnnotations.Schema.TableAttribute>().Single();
@@ -73,25 +75,25 @@ public DataBossRowType(MetaTable table, Type type) {
 				}
 			}
 
-			public override MetaTable Table { get { return table; } }
+			public override MetaTable Table => table;
 
-			public override Type Type { get { return type; } }
+			public override Type Type => type;
 
-			public override ReadOnlyCollection<MetaAssociation> Associations { get { return NoAssociations; } }
+			public override ReadOnlyCollection<MetaAssociation> Associations => NoAssociations;
 
-			public override ReadOnlyCollection<MetaDataMember> PersistentDataMembers { get { return members.AsReadOnly(); } }
+			public override ReadOnlyCollection<MetaDataMember> PersistentDataMembers => members.AsReadOnly();
 
-			public override MetaType InheritanceRoot { get { return null; } }
+			public override MetaType InheritanceRoot => null;
 
 			public override MetaType GetInheritanceType(Type type) {
 				if(type == this.type)
 					return this;
 				throw new NotSupportedException("Can't locate inheritance type for " + type.FullName);
 			}
 
-			public override bool IsEntity { get { return false; } }
+			public override bool IsEntity => false;
 
-			public override ReadOnlyCollection<MetaDataMember> IdentityMembers { get { return NoMembers; } }
+			public override ReadOnlyCollection<MetaDataMember> IdentityMembers => NoMembers;
 
 			public override bool CanInstantiate {
 				get { throw new NotImplementedException(); }
@@ -132,7 +134,7 @@ public override bool HasAnyValidateMethod {
 				get { throw new NotImplementedException(); }
 			}
 
-			public override bool HasInheritance { get { return false; } }
+			public override bool HasInheritance => false;
 
 			public override bool HasInheritanceCode {
 				get { throw new NotImplementedException(); }
@@ -197,19 +199,19 @@ public DataBossDataMember(MetaType declaringType, MemberInfo member, Type member
 				this.name = name;
 			}
 
-			public override string MappedName { get { return name; } }
+			public override string MappedName => name;
 
-			public override MemberInfo Member { get { return member; } }
+			public override MemberInfo Member => member;
 
-			public override bool IsAssociation { get { return false; } }
+			public override bool IsAssociation => false;
 
-			public override bool IsDeferred { get { return false; } }
+			public override bool IsDeferred => false;
 
-			public override Type Type { get { return memberType; } }
+			public override Type Type => memberType;
 
-			public override string DbType { get { return DataBossScripter.ToDbType(memberType, member); } }
+			public override string DbType => DataBossScripter.ToDbType(memberType, member);
 
-			public override MetaType DeclaringType { get { return declaringType; } }
+			public override MetaType DeclaringType => declaringType;
 
 			public override MetaAssociation Association {
 				get { throw new NotImplementedException(); }
@@ -297,9 +299,9 @@ public DataBossMetaModel(Type contextType) {
 				this.contextType = contextType;
 			}
 
-			public override Type ContextType { get { return contextType; } }
+			public override Type ContextType => contextType;
 
-			public override Type ProviderType { get { return typeof(Sql2005Provider); } }
+			public override Type ProviderType => typeof(Sql2005Provider);
 
 			public override MetaTable GetTable(Type rowType) {
 				MetaTable cached;

DataBoss.Specs/DataBossMigratorSpec.cs

@@ -22,8 +22,14 @@ public void Begin(DataBossMigrationInfo info) {}
 
 			public bool Execute(string query) {
 				var result = true;
-				if(OnExecute != null)
-					result = OnExecute(query);
+				if(OnExecute != null) {
+					try {
+						result = OnExecute(query);
+					} catch(Exception e) {
+						result = false;
+						OnError?.Invoke(this, new ErrorEventArgs(e));
+					}
+				}
 				ExecutedQueries.Add(query);
 				return result;
 			}

DataBoss.Specs/DataBossSpec.cs

@@ -5,16 +5,10 @@
 using System.Data.Linq.Mapping;
 using System.Data.SqlClient;
 using System.Linq;
+using DataBoss.SqlServer;
 
 namespace DataBoss.Specs
 {
-	[Table(Name = "sys.objects")]
-	class SysObjects
-	{
-		[Column(Name = "name")]
-		public string Name;
-	}
-
 	[Feature("DataBoss")]
 	public class DataBossSpec
 	{

DataBoss.Specs/ObjectReaderSpec.cs

@@ -127,11 +127,16 @@ public void converter_fills_public_fields() {
 		}
 
 		class ValueRow<T> { public T Value; }
+
 		public void supports_float_field() {
 			var source = new SimpleDataReader("Value");
-			source.Add(3.14f);
+			var expected = new ValueRow<float> { Value = 3.14f };
+			source.Add(expected.Value);
 			var reader = new ObjectReader();
-			Check.That(() => reader.Read<ValueRow<float>>(source).Count() == source.Count);
+			var rows = (ValueRow<float>[])Check.That(() => reader.Read<ValueRow<float>>(source).ToArray() != null);
+			Check.That(
+				() => rows.Length == 1,
+				() => rows[0].Value == expected.Value);
 		}
 
 		public void can_read_nullable_field() {

DataBoss/DataBoss.csproj

@@ -68,6 +68,7 @@
     <Compile Include="Properties\Version.cs" />
     <Compile Include="Schema\ClusteredAttribute.cs" />
     <Compile Include="Schema\DataBossHistory.cs" />
+    <Compile Include="SqlServer\SysObjects.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Usage.txt">

DataBoss/DataBossScriptMigrationScope.cs

@@ -25,9 +25,14 @@ public void Begin(DataBossMigrationInfo info) {
 		}
 
 		public bool Execute(string query) {
-			output.WriteLine(query);
-			output.WriteLine(BatchSeparator);
-			return true;
+			try {
+				output.WriteLine(query);
+				output.WriteLine(BatchSeparator);
+				return true;
+			} catch(Exception e) {
+				OnError?.Invoke(this, new ErrorEventArgs(e));
+				return false;
+			}
 		}
 
 		public void Done() {

DataBoss/SqlServer/SysObjects.cs

@@ -0,0 +1,11 @@
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace DataBoss.SqlServer
+{
+	[Table("sys.objects")]
+	public class SysObjects
+	{
+		[Column("name")]
+		public string Name;
+	}
+}