LoadByIds while in transaction implemented in DBConnection and SQLConnector

Core/DB/IDBConnection.cs

@@ -18,6 +18,8 @@ namespace FLocal.Core.DB {
 
 		void lockRow(Transaction transaction, ITableSpec table, string id);
 
+		List<Dictionary<string, string>> LoadByIds(Transaction transaction, ITableSpec table, List<string> ids);
+
 		void update(Transaction transaction, ITableSpec table, string id, Dictionary<string, string> data);
 
 		string insert(Transaction transaction, ITableSpec table, Dictionary<string, string> data);

MySQLConnector/Connection.cs

@@ -31,49 +31,53 @@ namespace FLocal.MySQLConnector {
 			return connection;
 		}
 
-		public List<Dictionary<string, string>> LoadByIds(ITableSpec table, List<string> ids) {
+		private List<Dictionary<string, string>> _LoadByIds(DbCommand command, ITableSpec table, List<string> ids, bool forUpdate) {
-			lock(this) {
+			command.CommandType = System.Data.CommandType.Text;
-				using(DbCommand command = this.connection.CreateCommand()) {
-					command.CommandType = System.Data.CommandType.Text;
 
-					ParamsHolder paramsHolder = new ParamsHolder();
+			ParamsHolder paramsHolder = new ParamsHolder();
-					List<string> placeholder = new List<string>();
+			List<string> placeholder = new List<string>();
-					foreach(string id in ids) {
+			foreach(string id in ids) {
-						placeholder.Add(this.traits.markParam(paramsHolder.Add(id)));
+				placeholder.Add(this.traits.markParam(paramsHolder.Add(id)));
-					}
+			}
 
-					command.CommandText = "SELECT * FROM " + table.compile(this.traits) + " WHERE " + table.getIdSpec().compile(this.traits) + " IN (" + string.Join(", ", placeholder.ToArray()) + ")";
+			command.CommandText = "SELECT * FROM " + table.compile(this.traits) + " WHERE " + table.getIdSpec().compile(this.traits) + " IN (" + string.Join(", ", placeholder.ToArray()) + ")" + (forUpdate ? " FOR UPDATE" : "");
-					//command.Prepare();
+			//command.Prepare();
-					foreach(KeyValuePair<string, string> kvp in paramsHolder.data) {
+			foreach(KeyValuePair<string, string> kvp in paramsHolder.data) {
-						command.AddParameter(kvp.Key, kvp.Value);
+				command.AddParameter(kvp.Key, kvp.Value);
-					}
+			}
 
-					Dictionary<string, Dictionary<string, string>> rawResult = new Dictionary<string, Dictionary<string, string>>();
+			Dictionary<string, Dictionary<string, string>> rawResult = new Dictionary<string, Dictionary<string, string>>();
-					using(DbDataReader reader = command.ExecuteReader()) {
+			using(DbDataReader reader = command.ExecuteReader()) {
-						while(reader.Read()) {
+				while(reader.Read()) {
-							Dictionary<string, string> row = new Dictionary<string,string>();
+					Dictionary<string, string> row = new Dictionary<string,string>();
-							for(int i=0; i<reader.FieldCount; i++) {
+					for(int i=0; i<reader.FieldCount; i++) {
 //								throw new CriticalException("Name: " + reader.GetName(i));
-								object value = reader.GetValue(i);
+						object value = reader.GetValue(i);
-								string sValue;
+						string sValue;
-								if(value is DateTime) {
+						if(value is DateTime) {
-									sValue = ((DateTime)value).Ticks.ToString();
+							sValue = ((DateTime)value).Ticks.ToString();
-								} else {
+						} else {
-									sValue = value.ToString();
+							sValue = value.ToString();
-								}
-								row.Add(reader.GetName(i), sValue);
-							}
-							rawResult.Add(row[table.idName], row);
 						}
+						row.Add(reader.GetName(i), sValue);
 					}
+					rawResult.Add(row[table.idName], row);
+				}
+			}
 
-					List<Dictionary<string, string>> result = new List<Dictionary<string,string>>();
+			List<Dictionary<string, string>> result = new List<Dictionary<string,string>>();
-					foreach(string id in ids) {
+			foreach(string id in ids) {
-						if(rawResult.ContainsKey(id)) {
+				if(rawResult.ContainsKey(id)) {
-							result.Add(rawResult[id]);
+					result.Add(rawResult[id]);
-						}
+				}
-					}
+			}
-					return result;
+			return result;
+		}
+
+		public List<Dictionary<string, string>> LoadByIds(ITableSpec table, List<string> ids) {
+			lock(this) {
+				using(DbCommand command = this.connection.CreateCommand()) {
+					return this._LoadByIds(command, table, ids, false);
 				}
 			}
 		}
@@ -209,6 +213,16 @@ namespace FLocal.MySQLConnector {
 			}
 		}
 
+		public List<Dictionary<string, string>> LoadByIds(FLocal.Core.DB.Transaction _transaction, ITableSpec table, List<string> ids) {
+			Transaction transaction = (Transaction)_transaction;
+			lock(transaction) {
+				using(DbCommand command = transaction.sqlconnection.CreateCommand()) {
+					command.Transaction = transaction.sqltransaction;
+					return this._LoadByIds(command, table, ids, true);
+				}
+			}
+		}
+
 		public void update(FLocal.Core.DB.Transaction _transaction, ITableSpec table, string id, Dictionary<string, string> data) {
 			Transaction transaction = (Transaction)_transaction;
 			lock(transaction) {