* src/**/*: Flush; syncs to DbLinq r1053. Adds

[mono.git] / mcs / class / System.Data.Linq / src / DbLinq / Vendor / Implementation / Vendor.cs

diff --git a/mcs/class/System.Data.Linq/src/DbLinq/Vendor/Implementation/Vendor.cs b/mcs/class/System.Data.Linq/src/DbLinq/Vendor/Implementation/Vendor.cs
index 83acecd4b59b6d59bb76558bdf754c9e3a9c8671..3dc1ce7b66bc92710cad9e12a49e1e1f7380b4d9 100644 (file)
--- a/mcs/class/System.Data.Linq/src/DbLinq/Vendor/Implementation/Vendor.cs
+++ b/mcs/class/System.Data.Linq/src/DbLinq/Vendor/Implementation/Vendor.cs
@@ -166,21 +166,25 @@ namespace DbLinq.Vendor.Implementation
         /// </summary>\r
         public IDbConnection CreateDbConnection(string connectionString)\r
         {\r
-            var reConnectionType = new System.Text.RegularExpressions.Regex(@"DbLinqConnectionType=([^;]+)");\r
+            var reConnectionType = new System.Text.RegularExpressions.Regex(@"DbLinqConnectionType=([^;]*)");\r
+            string connTypeVal = null;\r
             if (!reConnectionType.IsMatch(connectionString))\r
-                throw new ArgumentException("No DbLinqConnectionType parameter found.  " +\r
-                    "Please specify the assembly qualified type name to use for the Connection Type.",\r
-                    "connectionString");\r
+            {\r
+                connTypeVal = "System.Data.SqlClient.SqlConnection, System.Data";\r
+            }\r
+            else\r
+            {\r
+                var    match        = reConnectionType.Match(connectionString);\r
+                connTypeVal         = match.Groups[1].Value;\r
+                connectionString    = reConnectionType.Replace(connectionString, "");\r
+            }\r
 \r
-            var    match        = reConnectionType.Match(connectionString);\r
-            string connTypeVal  = match.Groups[1].Value;\r
             var    connType     = Type.GetType(connTypeVal);\r
             if (connType == null)\r
                 throw new ArgumentException(string.Format(\r
                         "Could not load the specified DbLinqConnectionType `{0}'.",\r
                         connTypeVal),\r
                     "connectionString");\r
-            connectionString = reConnectionType.Replace(connectionString, "");\r
             return (IDbConnection)Activator.CreateInstance(connType, connectionString);\r
         }\r
     }\r