RUSSEK-Software/DynamORM
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
grzegorz.russek
2016-10-19 08:36:38 +00:00
parent d8b6c8f488
commit 22e4534296
5 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AmalgamationTool/AmalgamationTool.csproj
View File

@@ -43,7 +43,9 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="DynamORM.Amalgamation.cs" /> <Compile Include="DynamORM.Amalgamation.cs">
<ExcludeFromStyleCop>True</ExcludeFromStyleCop>
</Compile>
<Compile Include="Program.cs" /> <Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup> </ItemGroup>

6
AmalgamationTool/DynamORM.Amalgamation.cs
View File

@@ -2749,7 +2749,7 @@ namespace DynamORM
/// <summary>Reads the type of column from the schema.</summary> /// <summary>Reads the type of column from the schema.</summary>
/// <param name="schema">The schema.</param> /// <param name="schema">The schema.</param>
/// <returns>GEneric parameter type.</returns> /// <returns>Generic parameter type.</returns>
protected virtual DbType ReadSchemaType(dynamic schema) protected virtual DbType ReadSchemaType(dynamic schema)
{ {
Type type = (Type)schema.DATATYPE; Type type = (Type)schema.DATATYPE;
@@ -2757,7 +2757,7 @@ namespace DynamORM
// Small hack for SQL Server Provider // Small hack for SQL Server Provider
if (type == typeof(string) && Provider != null && Provider.GetType() == typeof(System.Data.SqlClient.SqlClientFactory)) if (type == typeof(string) && Provider != null && Provider.GetType() == typeof(System.Data.SqlClient.SqlClientFactory))
{ {
var map = (schema as IDictionary<string, object>); var map = schema as IDictionary<string, object>;
string typeName = (map.TryGetValue("DATATYPENAME") ?? string.Empty).ToString(); string typeName = (map.TryGetValue("DATATYPENAME") ?? string.Empty).ToString();
switch (typeName) switch (typeName)
@@ -7874,7 +7874,7 @@ namespace DynamORM
return string.Format("({0})", str); return string.Format("({0})", str);
// TODO: Make special condiion // TODO: Make special condiion
//throw new InvalidOperationException(string.Format("The parameters in this command '{0}' cannot be added to a null collection.", node.Parameters)); ////throw new InvalidOperationException(string.Format("The parameters in this command '{0}' cannot be added to a null collection.", node.Parameters));
// Copy parameters to new comand // Copy parameters to new comand
foreach (KeyValuePair<string, IParameter> parameter in node.Parameters) foreach (KeyValuePair<string, IParameter> parameter in node.Parameters)

2
DynamORM/Builders/Implementation/DynamicQueryBuilder.cs
View File

@@ -413,7 +413,7 @@ namespace DynamORM.Builders.Implementation
return string.Format("({0})", str); return string.Format("({0})", str);
// TODO: Make special condiion // TODO: Make special condiion
//throw new InvalidOperationException(string.Format("The parameters in this command '{0}' cannot be added to a null collection.", node.Parameters)); ////throw new InvalidOperationException(string.Format("The parameters in this command '{0}' cannot be added to a null collection.", node.Parameters));
// Copy parameters to new comand // Copy parameters to new comand
foreach (KeyValuePair<string, IParameter> parameter in node.Parameters) foreach (KeyValuePair<string, IParameter> parameter in node.Parameters)

7
DynamORM/DynamicDatabase.cs
View File

@@ -1374,7 +1374,7 @@ namespace DynamORM
/// <summary>Reads the type of column from the schema.</summary> /// <summary>Reads the type of column from the schema.</summary>
/// <param name="schema">The schema.</param> /// <param name="schema">The schema.</param>
/// <returns>GEneric parameter type.</returns> /// <returns>Generic parameter type.</returns>
protected virtual DbType ReadSchemaType(dynamic schema) protected virtual DbType ReadSchemaType(dynamic schema)
{ {
Type type = (Type)schema.DATATYPE; Type type = (Type)schema.DATATYPE;
@@ -1382,10 +1382,11 @@ namespace DynamORM
// Small hack for SQL Server Provider // Small hack for SQL Server Provider
if (type == typeof(string) && Provider != null && Provider.GetType() == typeof(System.Data.SqlClient.SqlClientFactory)) if (type == typeof(string) && Provider != null && Provider.GetType() == typeof(System.Data.SqlClient.SqlClientFactory))
{ {
var map = (schema as IDictionary<string, object>); var map = schema as IDictionary<string, object>;
string typeName = (map.TryGetValue("DATATYPENAME") ?? string.Empty).ToString(); string typeName = (map.TryGetValue("DATATYPENAME") ?? string.Empty).ToString();
switch (typeName){ switch (typeName)
{
case "varchar": case "varchar":
return DbType.AnsiString; return DbType.AnsiString;
case "nvarchar": case "nvarchar":

8
Tester/Program.cs
View File

@@ -13,10 +13,10 @@ namespace Tester
DynamORM.DynamicDatabaseOptions.SingleConnection | DynamORM.DynamicDatabaseOptions.SingleTransaction | DynamORM.DynamicDatabaseOptions.SupportStoredProcedures | DynamORM.DynamicDatabaseOptions.SingleConnection | DynamORM.DynamicDatabaseOptions.SingleTransaction | DynamORM.DynamicDatabaseOptions.SupportStoredProcedures |
DynamORM.DynamicDatabaseOptions.SupportSchema | DynamORM.DynamicDatabaseOptions.SupportTop); DynamORM.DynamicDatabaseOptions.SupportSchema | DynamORM.DynamicDatabaseOptions.SupportTop);
//return new DynamORM.DynamicDatabase(System.Data.SQLite.SQLiteFactory.Instance, ////return new DynamORM.DynamicDatabase(System.Data.SQLite.SQLiteFactory.Instance,
// "Data Source=test.db3;", //// "Data Source=test.db3;",
// DynamORM.DynamicDatabaseOptions.SingleConnection | DynamORM.DynamicDatabaseOptions.SingleTransaction | //// DynamORM.DynamicDatabaseOptions.SingleConnection | DynamORM.DynamicDatabaseOptions.SingleTransaction |
// DynamORM.DynamicDatabaseOptions.SupportSchema | DynamORM.DynamicDatabaseOptions.SupportLimitOffset); //// DynamORM.DynamicDatabaseOptions.SupportSchema | DynamORM.DynamicDatabaseOptions.SupportLimitOffset);
} }
private static void Main(string[] args) private static void Main(string[] args)