105: Allow Adapter to specify Default Schema

markrendle · Nov 1, 2011 · 6abd8c2 · 6abd8c2
1 parent 3783604
commit 6abd8c2
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 19 deletions.
diff --git a/Simple.Data.Ado/AdoAdapter.IAdapterWithFunctions.cs b/Simple.Data.Ado/AdoAdapter.IAdapterWithFunctions.cs
@@ -18,7 +18,7 @@ public bool IsValidFunction(string functionName)
 
 	    public IEnumerable<ResultSet> Execute(string functionName, IDictionary<string, object> parameters)
 	    {
-	        var executor = _executors.GetOrAdd(functionName, f => _connectionProvider.GetProcedureExecutor(this, ObjectName.Parse(f)));
+	        var executor = _executors.GetOrAdd(functionName, f => _connectionProvider.GetProcedureExecutor(this, _schema.BuildObjectName(f)));
 	        return executor.Execute(parameters);
 	    }
 	}

diff --git a/Simple.Data.Ado/AdoAdapterFinder.cs b/Simple.Data.Ado/AdoAdapterFinder.cs
@@ -5,6 +5,7 @@
 using System.Data.Common;
 using System.Linq;
 using System.Text;
+using Simple.Data.Ado.Schema;
 
 namespace Simple.Data.Ado
 {
@@ -15,6 +16,7 @@ class AdoAdapterFinder
         private readonly AdoAdapter _adapter;
         private readonly IDbTransaction _transaction;
         private readonly IDbConnection _connection;
+        private readonly DatabaseSchema _schema;
 
         public AdoAdapterFinder(AdoAdapter adapter) : this(adapter, null)
         {
@@ -34,7 +36,7 @@ public AdoAdapterFinder(AdoAdapter adapter, IDbTransaction transaction)
 
         public IDictionary<string, object> FindOne(string tableName, SimpleExpression criteria)
         {
-            if (criteria == null) return FindAll(ObjectName.Parse(tableName)).FirstOrDefault();
+            if (criteria == null) return FindAll(_adapter.GetSchema().BuildObjectName(tableName)).FirstOrDefault();
             var commandTemplate = GetCommandTemplate(tableName, criteria);
             return ExecuteSingletonQuery(commandTemplate, criteria.GetValues());
         }
@@ -43,15 +45,15 @@ public AdoAdapterFinder(AdoAdapter adapter, IDbTransaction transaction)
         {
             if (criteria == null)
             {
-                return _ => FindAll(ObjectName.Parse(tableName)).FirstOrDefault();
+                return _ => FindAll(_adapter.GetSchema().BuildObjectName(tableName)).FirstOrDefault();
             }
             var commandTemplate = GetCommandTemplate(tableName, criteria);
             return args => ExecuteSingletonQuery(commandTemplate, args);
         }
 
         public IEnumerable<IDictionary<string, object>> Find(string tableName, SimpleExpression criteria)
         {
-            if (criteria == null) return FindAll(ObjectName.Parse(tableName));
+            if (criteria == null) return FindAll(_adapter.GetSchema().BuildObjectName(tableName));
             var commandTemplate = GetCommandTemplate(tableName, criteria);
             return ExecuteQuery(commandTemplate, criteria.GetValues());
         }
@@ -65,8 +67,8 @@ private CommandTemplate GetCommandTemplate(string tableName, SimpleExpression cr
             return tableCommandCache.GetOrAdd(hash,
                                               _ =>
                                               new FindHelper(_adapter.GetSchema())
-                                                  .GetFindByCommand(ObjectName.Parse(tableName), criteria)
-                                                  .GetCommandTemplate(_adapter.GetSchema().FindTable(ObjectName.Parse(tableName))));
+                                                  .GetFindByCommand(_adapter.GetSchema().BuildObjectName(tableName), criteria)
+                                                  .GetCommandTemplate(_adapter.GetSchema().FindTable(_adapter.GetSchema().BuildObjectName(tableName))));
         }
 
         private IEnumerable<IDictionary<string, object>> FindAll(ObjectName tableName)

diff --git a/Simple.Data.Ado/Joiner.cs b/Simple.Data.Ado/Joiner.cs
@@ -67,7 +67,7 @@ public IEnumerable<string> GetJoinClauses(IEnumerable<JoinClause> joins, IComman
             {
                 var builder = new StringBuilder(JoinKeyword);
                 builder.AppendFormat(" JOIN {0}{1} ON ({2})",
-                    _schema.FindTable(ObjectName.Parse(join.Table.ToString())).QualifiedName,
+                    _schema.FindTable(_schema.BuildObjectName(join.Table.ToString())).QualifiedName,
                     string.IsNullOrWhiteSpace(join.Table.Alias) ? string.Empty : " " + _schema.QuoteObjectName(join.Table.Alias),
                     expressionFormatter.Format(join.JoinExpression));
                 yield return builder.ToString().Trim();

diff --git a/Simple.Data.Ado/ObjectName.cs b/Simple.Data.Ado/ObjectName.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Simple.Data.Ado.Schema;
 
 namespace Simple.Data.Ado
 {
@@ -24,15 +25,6 @@ public ObjectName(string schema, string name)
             _name = name;
         }
 
-        public static ObjectName Parse(string text)
-        {
-            if (text == null) throw new ArgumentNullException("text");
-            if (!text.Contains('.')) return new ObjectName(Properties.Settings.Default.DefaultSchema ?? "dbo", text);
-            var schemaDotTable = text.Split('.');
-            if (schemaDotTable.Length != 2) throw new InvalidOperationException("Could not parse table name.");
-            return new ObjectName(schemaDotTable[0], schemaDotTable[1]);
-        }
-
         public string Name
         {
             get { return _name; }

diff --git a/Simple.Data.Ado/QueryBuilder.cs b/Simple.Data.Ado/QueryBuilder.cs
@@ -70,7 +70,7 @@ private void SetQueryContext(SimpleQuery query)
             _havingCriteria = _query.Clauses.OfType<HavingClause>().Aggregate(SimpleExpression.Empty,
                                                                               (seed, having) => seed && having.Criteria);
 
-            _tableName = ObjectName.Parse(query.TableName.Split('.').Last());
+            _tableName = _schema.BuildObjectName(query.TableName.Split('.').Last());
             _table = _schema.FindTable(_tableName);
             _commandBuilder.SetText(GetSelectClause(_tableName));
         }

diff --git a/Simple.Data.Ado/Schema/DatabaseSchema.cs b/Simple.Data.Ado/Schema/DatabaseSchema.cs
@@ -63,6 +63,11 @@ public Procedure FindProcedure(ObjectName procedureName)
             return _lazyProcedures.Value.Find(procedureName);
         }
 
+        private String GetDefaultSchema()
+        {
+            return _schemaProvider.GetDefaultSchema();
+        }
+
         private TableCollection CreateTableCollection()
         {
             return new TableCollection(_schemaProvider.GetTables()
@@ -101,5 +106,14 @@ public static void ClearCache()
         {
             Instances.Clear();
         }
+
+        public ObjectName BuildObjectName(String text)
+        {
+            if (text == null) throw new ArgumentNullException("text");
+            if (!text.Contains('.')) return new ObjectName(this.GetDefaultSchema(), text);
+            var schemaDotTable = text.Split('.');
+            if (schemaDotTable.Length != 2) throw new InvalidOperationException("Could not parse table name.");
+            return new ObjectName(schemaDotTable[0], schemaDotTable[1]);
+        }
     }
-}
+}
diff --git a/Simple.Data.Ado/Schema/ISchemaProvider.cs b/Simple.Data.Ado/Schema/ISchemaProvider.cs
@@ -13,5 +13,6 @@ public interface ISchemaProvider
         IEnumerable<ForeignKey> GetForeignKeys(Table table);
         string QuoteObjectName(string unquotedName);
         string NameParameter(string baseName);
+        string GetDefaultSchema();
     }
 }
diff --git a/Simple.Data.Mocking/Ado/MockSchemaProvider.cs b/Simple.Data.Mocking/Ado/MockSchemaProvider.cs
@@ -154,6 +154,9 @@ public void Reset()
             _tables.Clear();
         }
 
-
+        public String GetDefaultSchema()
+        {
+            return "dbo";
+        }
     }
 }
diff --git a/Simple.Data.SqlCe40/SqlCe40SchemaProvider.cs b/Simple.Data.SqlCe40/SqlCe40SchemaProvider.cs
@@ -165,5 +165,10 @@ private DataTable SelectToDataTable(string sql)
 
             return dataTable;
         }
+
+        public String GetDefaultSchema()
+        {
+            return "dbo";
+        }
     }
 }
diff --git a/Simple.Data.SqlServer/SqlSchemaProvider.cs b/Simple.Data.SqlServer/SqlSchemaProvider.cs
@@ -189,5 +189,10 @@ private static SqlDbType DbTypeFromInformationSchemaTypeName(string informationS
         {
             return DbTypeLookup.GetSqlDbType(informationSchemaTypeName);
         }
+
+        public String GetDefaultSchema()
+        {
+            return "dbo";
+        }
     }
 }