106: ParameterTemplates of Type "Other" break Parameter type inference

richardhopton · richardhopton · commit 67f932146df3 · 2011-10-30T09:39:11.000Z
diff --git a/Simple.Data.Ado/CommandBuilder.cs b/Simple.Data.Ado/CommandBuilder.cs
@@ -255,9 +255,20 @@ public static void SetBetweenInCommandText(IDbCommand command, string name)
 
         private static IDbDataParameter CreateSingleParameter(IDbParameterFactory parameterFactory, object value, ParameterTemplate template)    
         {
-            if (template.Column != null) return CreateSingleParameter(parameterFactory, value, template.Name, template.Column);
+            if (template.Column != null)
+            {
+                return CreateSingleParameter(parameterFactory, value, template.Name, template.Column);
+            }
 
-            var parameter = parameterFactory.CreateParameter(template.Name, template.DbType, template.MaxLength);
+            var parameter = default(IDbDataParameter);
+            if (template.Type == ParameterType.NameOnly)
+            {
+                parameter = parameterFactory.CreateParameter(template.Name);
+            }
+            else
+            {
+                parameter = parameterFactory.CreateParameter(template.Name, template.DbType, template.MaxLength);
+            }
             parameter.Value = CommandHelper.FixObjectType(value);
             return parameter;
         }
diff --git a/Simple.Data.Ado/CommandTemplate.cs b/Simple.Data.Ado/CommandTemplate.cs
@@ -120,11 +120,21 @@ private static void RewriteSqlEqualityToInClause(IDbCommand command, ParameterTe
         private IDbDataParameter CreateParameter(IDbCommand command, ParameterTemplate parameterTemplate, object value, string suffix = "")
         {
             var factory = _createGetParameterFactoryFunc(command);
-            var parameter = parameterTemplate.Column != null
-                                ? factory.CreateParameter(parameterTemplate.Name + suffix,
-                                                          parameterTemplate.Column)
-                                : factory.CreateParameter(parameterTemplate.Name, parameterTemplate.DbType,
-                                                          parameterTemplate.MaxLength);
+            var parameter = default(IDbDataParameter);
+            if(parameterTemplate.Column != null)
+            {
+                parameter = factory.CreateParameter(parameterTemplate.Name + suffix,
+                                                    parameterTemplate.Column);
+            }
+            else if (parameterTemplate.Type == ParameterType.NameOnly)
+            {
+                parameter = factory.CreateParameter(parameterTemplate.Name);
+            }
+            else
+            {
+                parameter = factory.CreateParameter(parameterTemplate.Name, parameterTemplate.DbType,
+                                                    parameterTemplate.MaxLength);
+            }
             parameter.Value = FixObjectType(value);
             return parameter;
         }
diff --git a/Simple.Data.Ado/GenericDbParameterFactory.cs b/Simple.Data.Ado/GenericDbParameterFactory.cs
@@ -14,6 +14,14 @@ public GenericDbParameterFactory(IDbCommand command)
             _command = command;
         }
 
+        public IDbDataParameter CreateParameter(string name)
+        {
+            if (name == null) throw new ArgumentNullException("name");
+            var parameter = _command.CreateParameter();
+            parameter.ParameterName = name;
+            return parameter;
+        }
+        
         public IDbDataParameter CreateParameter(string name, Column column)
         {
             if (name == null) throw new ArgumentNullException("name");
diff --git a/Simple.Data.Ado/IDbParameterFactory.cs b/Simple.Data.Ado/IDbParameterFactory.cs
@@ -6,6 +6,7 @@
 
     public interface IDbParameterFactory
     {
+        IDbDataParameter CreateParameter(string name);
         IDbDataParameter CreateParameter(string name, Column column);
         IDbDataParameter CreateParameter(string name, DbType dbType, int maxLength);
     }
diff --git a/Simple.Data.Ado/ParameterTemplate.cs b/Simple.Data.Ado/ParameterTemplate.cs
@@ -27,7 +27,7 @@ public ParameterTemplate(string name, Column column)
             _column = column;
             if (column == null)
             {
-                _type = ParameterType.Other;
+                _type = ParameterType.NameOnly;
                 return;
             }
             _type = ParameterType.Column;
@@ -116,6 +116,7 @@ enum ParameterType
     {
         Column,
         FixedValue,
-        Other
+        Other,
+        NameOnly
     }
 }
diff --git a/Simple.Data.SqlCe40/SqlCeDbParameterFactory.cs b/Simple.Data.SqlCe40/SqlCeDbParameterFactory.cs
@@ -16,6 +16,14 @@ public IDbDataParameter CreateParameter(string name, Column column)
             return new SqlCeParameter(name, sqlCeColumn.SqlDbType, 0, column.ActualName);
         }
 
+        public IDbDataParameter CreateParameter(string name)
+        {
+            return new SqlCeParameter
+                {
+                    ParameterName = name
+                };
+        }
+
         public IDbDataParameter CreateParameter(string name, DbType dbType, int maxLength)
         {
             IDbDataParameter parameter = new SqlCeParameter
diff --git a/Simple.Data.SqlServer/SqlCeDbParameterFactory.cs b/Simple.Data.SqlServer/SqlCeDbParameterFactory.cs
@@ -9,9 +9,17 @@
     [Export(typeof(IDbParameterFactory))]
     public class SqlDbParameterFactory : IDbParameterFactory
     {
+        public IDbDataParameter CreateParameter(string name)
+        {
+            return new SqlParameter
+                {
+                    ParameterName = name
+                };
+        }
+
         public IDbDataParameter CreateParameter(string name, Column column)
         {
-            var sqlColumn = (SqlColumn) column;
+            var sqlColumn = (SqlColumn)column;
             return new SqlParameter(name, sqlColumn.SqlDbType, column.MaxLength, column.ActualName);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,14 @@ public GenericDbParameterFactory(IDbCommand command)`
`14`	`14`	`_command = command;`
`15`	`15`	`}`
`16`	`16`
	`17`	`+ public IDbDataParameter CreateParameter(string name)`
	`18`	`+ {`
	`19`	`+ if (name == null) throw new ArgumentNullException("name");`
	`20`	`+ var parameter = _command.CreateParameter();`
	`21`	`+ parameter.ParameterName = name;`
	`22`	`+ return parameter;`
	`23`	`+ }`
	`24`	`+`
`17`	`25`	`public IDbDataParameter CreateParameter(string name, Column column)`
`18`	`26`	`{`
`19`	`27`	`if (name == null) throw new ArgumentNullException("name");`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`
`7`	`7`	`public interface IDbParameterFactory`
`8`	`8`	`{`
	`9`	`+ IDbDataParameter CreateParameter(string name);`
`9`	`10`	`IDbDataParameter CreateParameter(string name, Column column);`
`10`	`11`	`IDbDataParameter CreateParameter(string name, DbType dbType, int maxLength);`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public ParameterTemplate(string name, Column column)`
`27`	`27`	`_column = column;`
`28`	`28`	`if (column == null)`
`29`	`29`	`{`
`30`		`- _type = ParameterType.Other;`
	`30`	`+ _type = ParameterType.NameOnly;`
`31`	`31`	`return;`
`32`	`32`	`}`
`33`	`33`	`_type = ParameterType.Column;`
`@@ -116,6 +116,7 @@ enum ParameterType`
`116`	`116`	`{`
`117`	`117`	`Column,`
`118`	`118`	`FixedValue,`
`119`		`- Other`
	`119`	`+ Other,`
	`120`	`+ NameOnly`
`120`	`121`	`}`
`121`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,14 @@ public IDbDataParameter CreateParameter(string name, Column column)`
`16`	`16`	`return new SqlCeParameter(name, sqlCeColumn.SqlDbType, 0, column.ActualName);`
`17`	`17`	`}`
`18`	`18`
	`19`	`+ public IDbDataParameter CreateParameter(string name)`
	`20`	`+ {`
	`21`	`+ return new SqlCeParameter`
	`22`	`+ {`
	`23`	`+ ParameterName = name`
	`24`	`+ };`
	`25`	`+ }`
	`26`	`+`
`19`	`27`	`public IDbDataParameter CreateParameter(string name, DbType dbType, int maxLength)`
`20`	`28`	`{`
`21`	`29`	`IDbDataParameter parameter = new SqlCeParameter`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,17 @@`
`9`	`9`	`[Export(typeof(IDbParameterFactory))]`
`10`	`10`	`public class SqlDbParameterFactory : IDbParameterFactory`
`11`	`11`	`{`
	`12`	`+ public IDbDataParameter CreateParameter(string name)`
	`13`	`+ {`
	`14`	`+ return new SqlParameter`
	`15`	`+ {`
	`16`	`+ ParameterName = name`
	`17`	`+ };`
	`18`	`+ }`
	`19`	`+`
`12`	`20`	`public IDbDataParameter CreateParameter(string name, Column column)`
`13`	`21`	`{`
`14`		`- var sqlColumn = (SqlColumn) column;`
	`22`	`+ var sqlColumn = (SqlColumn)column;`
`15`	`23`	`return new SqlParameter(name, sqlColumn.SqlDbType, column.MaxLength, column.ActualName);`
`16`	`24`	`}`
`17`	`25`