JoinSpec refactored

Common/UploadManager.cs

@@ -105,9 +105,8 @@ namespace FLocal.Common {
 						Config.instance.mainConnection.LoadIdsByConditions(
 							Upload.TableSpec.instance,
 							condition,
-							Diapasone.unlimited,
+							Diapasone.unlimited
-							new JoinSpec[0]
+						).Single()
-						)[0]
 					)
 				);
 			}

Common/dataobjects/Account.cs

@@ -81,8 +81,7 @@ namespace FLocal.Common.dataobjects {
 								ComparisonType.EQUAL,
 								name
 							),
-							Diapasone.unlimited,
+							Diapasone.unlimited
-							new JoinSpec[0]
 						);
 						if(ids.Count > 1) {
 							throw new CriticalException("not unique");

Common/dataobjects/AccountIndicator.cs

@@ -72,8 +72,7 @@ namespace FLocal.Common.dataobjects {
 								ComparisonType.EQUAL,
 								account.id.ToString()
 							),
-							Diapasone.unlimited,
+							Diapasone.unlimited
-							new JoinSpec[0]
 						);
 						if(ids.Count > 1) {
 							throw new CriticalException("not unique");

Common/dataobjects/AccountSettings.cs

@@ -118,8 +118,7 @@ namespace FLocal.Common.dataobjects {
 								ComparisonType.EQUAL,
 								account.id.ToString()
 							),
-							Diapasone.unlimited,
+							Diapasone.unlimited
-							new JoinSpec[0]
 						);
 						if(ids.Count > 1) {
 							throw new CriticalException("not unique");

Common/dataobjects/Board.cs

@@ -156,8 +156,7 @@ namespace FLocal.Common.dataobjects {
 									FLocal.Core.DB.conditions.ComparisonType.EQUAL,
 									this.id.ToString()
 								),
-								Diapasone.unlimited,
+								Diapasone.unlimited
-								new JoinSpec[0]
 							) select int.Parse(stringId);
 							Board.LoadByIds(ids);
 							return ids;

Common/dataobjects/Category.cs

@@ -54,8 +54,7 @@ namespace FLocal.Common.dataobjects {
 							IEnumerable<int> ids = from stringId in Config.instance.mainConnection.LoadIdsByConditions(
 								TableSpec.instance,
 								new FLocal.Core.DB.conditions.EmptyCondition(),
-								Diapasone.unlimited,
+								Diapasone.unlimited
-								new JoinSpec[0]
 							) select int.Parse(stringId);
 							Category.LoadByIds(ids);
 							return ids;
@@ -84,8 +83,7 @@ namespace FLocal.Common.dataobjects {
 									FLocal.Core.DB.conditions.ComparisonType.EQUAL,
 									this.id.ToString()
 								),
-								Diapasone.unlimited,
+								Diapasone.unlimited
-								new JoinSpec[0]
 							) select int.Parse(stringId);
 							Board.LoadByIds(ids);
 							return ids;

Common/dataobjects/User.cs

@@ -133,8 +133,7 @@ namespace FLocal.Common.dataobjects {
 								ComparisonType.EQUAL,
 								name
 							),
-							Diapasone.unlimited,
+							Diapasone.unlimited
-							new JoinSpec[0]
 						);
 						if(ids.Count > 1) {
 							throw new CriticalException("not unique");

Core/DB/JoinSpec.cs

@@ -6,13 +6,32 @@ using System.Text;
 namespace FLocal.Core.DB {
 	public class JoinSpec {
 
+		private class TableSpec : ITableSpec {
+			private readonly string _name;
+			public TableSpec(string name) {
+				this._name = name;
+			}
+			public string name {
+				get {
+					return this._name;
+				}
+			}
+			public string idName {
+				get {
+					throw new NotImplementedException();
+				}
+			}
+		}
+
 		public readonly ColumnSpec mainColumn;
 
 		public readonly ITableSpec additionalTable;
+		public readonly ITableSpec additionalTableJoin;
 
-		public JoinSpec(ColumnSpec mainColumn, ITableSpec additionalTable) {
+		public JoinSpec(ColumnSpec mainColumn, ITableSpec additionalTable, string alias) {
 			this.mainColumn = mainColumn;
-			this.additionalTable = additionalTable;
+			this.additionalTableJoin = additionalTable;
+			this.additionalTable = new TableSpec(alias);
 		}
 
 	}