Fix for issue ThatRendle#190

ThatRendle · ThatRendle · commit 6a703b249a88 · 2012-05-20T00:10:06.000+01:00
diff --git a/Simple.Data.BehaviourTest/SchemaQualifiedTableTest.cs b/Simple.Data.BehaviourTest/SchemaQualifiedTableTest.cs
@@ -15,11 +15,14 @@ public class SchemaQualifiedTableTest
         static Database CreateDatabase(MockDatabase mockDatabase)
         {
             var mockSchemaProvider = new MockSchemaProvider();
-            mockSchemaProvider.SetTables(new[] { "foo", "Users", "BASE TABLE" });
+            mockSchemaProvider.SetTables(new[] {"foo", "Users", "BASE TABLE"},
+                                         new[] {"foo.bar", "Test", "BASE TABLE"});
             mockSchemaProvider.SetColumns(new[] { "foo", "Users", "Id" },
                                           new[] { "foo", "Users", "Name" },
                                           new[] { "foo", "Users", "Password" },
-                                          new[] { "foo", "Users", "Age" });
+                                          new[] { "foo", "Users", "Age" },
+                                          new[] { "foo.bar", "Test", "Id"},
+                                          new[] { "foo.bar", "Test", "Value"});
             mockSchemaProvider.SetPrimaryKeys(new object[] { "foo", "Users", "Id", 0 });
             return new Database(new AdoAdapter(new MockConnectionProvider(new MockDbConnection(mockDatabase), mockSchemaProvider)));
         }
@@ -243,5 +246,15 @@ public void TestInsertOnTable()
             Assert.AreEqual("Phil", mockDatabase.Parameters[0]);
             Assert.AreEqual(42, mockDatabase.Parameters[1]);
         }
+
+        [Test]
+        public void TestFindWithDotInSchemaName()
+        {
+            var mockDatabase = new MockDatabase();
+            dynamic database = CreateDatabase(mockDatabase);
+            database.foobar.Test.Find(database.foobar.Test.Id == 1);
+            Assert.AreEqual("select [foo.bar].[Test].[Id], [foo.bar].[Test].[Value] from [foo.bar].[Test] where [foo.bar].[Test].[id] = @p1".ToLowerInvariant(), mockDatabase.Sql.ToLowerInvariant());
+            Assert.AreEqual(1, mockDatabase.Parameters[0]);
+        }
     }
 }
diff --git a/Simple.Data.SqlServer/SqlSchemaProvider.cs b/Simple.Data.SqlServer/SqlSchemaProvider.cs
@@ -156,12 +156,11 @@ public Type DataTypeToClrType(string dataType)
 
         private DataTable GetColumnsDataTable(Table table)
         {
-            var columnSelect =
-                string.Format(
-                    @"SELECT name, is_identity, type_name(system_type_id) as type_name, max_length from sys.columns 
-where object_id = object_id('{0}.{1}', 'TABLE') or object_id = object_id('{0}.{1}', 'VIEW') order by column_id",
-                    table.Schema, table.ActualName);
-            return SelectToDataTable(columnSelect);
+            const string columnSelect = @"SELECT name, is_identity, type_name(system_type_id) as type_name, max_length from sys.columns 
+where object_id = object_id(@tableName, 'TABLE') or object_id = object_id(@tableName, 'VIEW') order by column_id";
+            var @tableName = new SqlParameter("@tableName", SqlDbType.NVarChar, 128);
+            @tableName.Value = string.Format("[{0}].[{1}]", table.Schema, table.ActualName);
+            return SelectToDataTable(columnSelect, @tableName);
         }
 
         private DataTable GetPrimaryKeys()
@@ -188,13 +187,14 @@ private EnumerableRowCollection<DataRow> GetForeignKeys(string tableName)
                     row => row["TABLE_NAME"].ToString().Equals(tableName, StringComparison.InvariantCultureIgnoreCase));
         }
 
-        private DataTable SelectToDataTable(string sql)
+        private DataTable SelectToDataTable(string sql, params SqlParameter[] parameters)
         {
             var dataTable = new DataTable();
             using (var cn = ConnectionProvider.CreateConnection() as SqlConnection)
             {
                 using (var adapter = new SqlDataAdapter(sql, cn))
                 {
+                    adapter.SelectCommand.Parameters.AddRange(parameters);
                     adapter.Fill(dataTable);
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -156,12 +156,11 @@ public Type DataTypeToClrType(string dataType)`
`156`	`156`
`157`	`157`	`private DataTable GetColumnsDataTable(Table table)`
`158`	`158`	`{`
`159`		`- var columnSelect =`
`160`		`- string.Format(`
`161`		`- @"SELECT name, is_identity, type_name(system_type_id) as type_name, max_length from sys.columns`
`162`		`-where object_id = object_id('{0}.{1}', 'TABLE') or object_id = object_id('{0}.{1}', 'VIEW') order by column_id",`
`163`		`- table.Schema, table.ActualName);`
`164`		`- return SelectToDataTable(columnSelect);`
	`159`	`+ const string columnSelect = @"SELECT name, is_identity, type_name(system_type_id) as type_name, max_length from sys.columns`
	`160`	`+where object_id = object_id(@tableName, 'TABLE') or object_id = object_id(@tableName, 'VIEW') order by column_id";`
	`161`	`+ var @tableName = new SqlParameter("@tableName", SqlDbType.NVarChar, 128);`
	`162`	`+ @tableName.Value = string.Format("[{0}].[{1}]", table.Schema, table.ActualName);`
	`163`	`+ return SelectToDataTable(columnSelect, @tableName);`
`165`	`164`	`}`
`166`	`165`
`167`	`166`	`private DataTable GetPrimaryKeys()`
`@@ -188,13 +187,14 @@ private EnumerableRowCollection<DataRow> GetForeignKeys(string tableName)`
`188`	`187`	`row => row["TABLE_NAME"].ToString().Equals(tableName, StringComparison.InvariantCultureIgnoreCase));`
`189`	`188`	`}`
`190`	`189`
`191`		`- private DataTable SelectToDataTable(string sql)`
	`190`	`+ private DataTable SelectToDataTable(string sql, params SqlParameter[] parameters)`
`192`	`191`	`{`
`193`	`192`	`var dataTable = new DataTable();`
`194`	`193`	`using (var cn = ConnectionProvider.CreateConnection() as SqlConnection)`
`195`	`194`	`{`
`196`	`195`	`using (var adapter = new SqlDataAdapter(sql, cn))`
`197`	`196`	`{`
	`197`	`+ adapter.SelectCommand.Parameters.AddRange(parameters);`
`198`	`198`	`adapter.Fill(dataTable);`
`199`	`199`	`}`
`200`	`200`