Allow null useDb to unset the db connection

mythz · mythz · commit 90d0266e2802 · 2019-08-02T19:03:36.000-04:00
diff --git a/src/ServiceStack.OrmLite/DbScripts.cs b/src/ServiceStack.OrmLite/DbScripts.cs
@@ -41,7 +41,11 @@ public IDbConnection OpenDbConnection(ScriptScopeContext scope, Dictionary<strin
 
         public IgnoreResult useDb(ScriptScopeContext scope, Dictionary<string, object> dbConnOptions)
         {
-            if (dbConnOptions != null)
+            if (dbConnOptions == null)
+            {
+                scope.PageResult.Args.Remove(DbConnection);
+            }
+            else
             {
                 if (!dbConnOptions.ContainsKey("connectionString") && !dbConnOptions.ContainsKey("namedConnection"))
                     throw new NotSupportedException(nameof(useDb) + " requires either 'connectionString' or 'namedConnection' property");
diff --git a/src/ServiceStack.OrmLite/DbScriptsAsync.cs b/src/ServiceStack.OrmLite/DbScriptsAsync.cs
@@ -4,6 +4,7 @@
 using System.Threading.Tasks;
 using ServiceStack.Data;
 using ServiceStack.Script;
+using ServiceStack.Text;
 
 namespace ServiceStack.OrmLite
 {
@@ -42,7 +43,11 @@ public async Task<IDbConnection> OpenDbConnectionAsync(ScriptScopeContext scope,
 
         public IgnoreResult useDb(ScriptScopeContext scope, Dictionary<string, object> dbConnOptions)
         {
-            if (dbConnOptions != null)
+            if (dbConnOptions == null)
+            {
+                scope.PageResult.Args.Remove(DbConnection);
+            }
+            else
             {
                 if (!dbConnOptions.ContainsKey("connectionString") && !dbConnOptions.ContainsKey("namedConnection"))
                     throw new NotSupportedException(nameof(useDb) + " requires either 'connectionString' or 'namedConnection' property");

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,11 @@ public IDbConnection OpenDbConnection(ScriptScopeContext scope, Dictionary<strin`
`41`	`41`
`42`	`42`	`public IgnoreResult useDb(ScriptScopeContext scope, Dictionary<string, object> dbConnOptions)`
`43`	`43`	`{`
`44`		`- if (dbConnOptions != null)`
	`44`	`+ if (dbConnOptions == null)`
	`45`	`+ {`
	`46`	`+ scope.PageResult.Args.Remove(DbConnection);`
	`47`	`+ }`
	`48`	`+ else`
`45`	`49`	`{`
`46`	`50`	`if (!dbConnOptions.ContainsKey("connectionString") && !dbConnOptions.ContainsKey("namedConnection"))`
`47`	`51`	`throw new NotSupportedException(nameof(useDb) + " requires either 'connectionString' or 'namedConnection' property");`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using System.Threading.Tasks;`
`5`	`5`	`using ServiceStack.Data;`
`6`	`6`	`using ServiceStack.Script;`
	`7`	`+using ServiceStack.Text;`
`7`	`8`
`8`	`9`	`namespace ServiceStack.OrmLite`
`9`	`10`	`{`
`@@ -42,7 +43,11 @@ public async Task<IDbConnection> OpenDbConnectionAsync(ScriptScopeContext scope,`
`42`	`43`
`43`	`44`	`public IgnoreResult useDb(ScriptScopeContext scope, Dictionary<string, object> dbConnOptions)`
`44`	`45`	`{`
`45`		`- if (dbConnOptions != null)`
	`46`	`+ if (dbConnOptions == null)`
	`47`	`+ {`
	`48`	`+ scope.PageResult.Args.Remove(DbConnection);`
	`49`	`+ }`
	`50`	`+ else`
`46`	`51`	`{`
`47`	`52`	`if (!dbConnOptions.ContainsKey("connectionString") && !dbConnOptions.ContainsKey("namedConnection"))`
`48`	`53`	`throw new NotSupportedException(nameof(useDb) + " requires either 'connectionString' or 'namedConnection' property");`