Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit 49f371b

Browse files
committed
Add dbNamedConnections filter + deprecate DbScripts
1 parent cc40449 commit 49f371b

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

src/ServiceStack.OrmLite/DbScripts.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ namespace ServiceStack.OrmLite
99
{
1010
[Obsolete("Use DbScripts")]
1111
public class TemplateDbFilters : DbScripts {}
12-
12+
13+
[Obsolete("Use DbScriptsAsync")]
1314
public class DbScripts : ScriptMethods
1415
{
1516
private const string DbInfo = "__dbinfo"; // Keywords.DbInfo
16-
private const string DbConnection = "__dbconnection"; // useDbConnection global
17+
private const string DbConnection = "__dbconnection"; // useDb global
1718

1819
private IDbConnectionFactory dbFactory;
1920
public IDbConnectionFactory DbFactory
@@ -163,6 +164,7 @@ public int dbExec(ScriptScopeContext scope, string sql, Dictionary<string, objec
163164
public int dbExec(ScriptScopeContext scope, string sql, Dictionary<string, object> args, object options) =>
164165
exec(db => db.ExecuteSql(sql, args), scope, options);
165166

167+
public List<string> dbNamedConnections() => OrmLiteConnectionFactory.NamedConnections.Keys.ToList();
166168
public List<string> dbTableNames(ScriptScopeContext scope) => dbTableNames(scope, null, null);
167169
public List<string> dbTableNames(ScriptScopeContext scope, Dictionary<string, object> args) => dbTableNames(scope, args, null);
168170
public List<string> dbTableNames(ScriptScopeContext scope, Dictionary<string, object> args, object options) =>

src/ServiceStack.OrmLite/DbScriptsAsync.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ public Task<object> dbExec(ScriptScopeContext scope, string sql, Dictionary<stri
165165
public Task<object> dbExec(ScriptScopeContext scope, string sql, Dictionary<string, object> args, object options) =>
166166
exec(db => db.ExecuteSqlAsync(sql, args), scope, options);
167167

168+
public List<string> dbNamedConnections() => OrmLiteConnectionFactory.NamedConnections.Keys.ToList();
168169
public Task<object> dbTableNames(ScriptScopeContext scope) => dbTableNames(scope, null, null);
169170
public Task<object> dbTableNames(ScriptScopeContext scope, Dictionary<string, object> args) => dbTableNames(scope, args, null);
170171
public Task<object> dbTableNames(ScriptScopeContext scope, Dictionary<string, object> args, object options) =>

src/ServiceStack.OrmLite/OrmLiteConnectionFactory.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
using System.Data;
44
using System.Threading;
55
using System.Threading.Tasks;
6-
using ServiceStack;
76
using ServiceStack.Data;
8-
using ServiceStack.Templates;
97
using ServiceStack.Text;
108

119
namespace ServiceStack.OrmLite
@@ -62,7 +60,7 @@ public OrmLiteConnectionFactory(string connectionString, IOrmLiteDialectProvider
6260
public Action<OrmLiteConnection> OnDispose { get; set; }
6361

6462
private OrmLiteConnection ormLiteConnection;
65-
private OrmLiteConnection OrmLiteConnection => ormLiteConnection ?? (ormLiteConnection = new OrmLiteConnection(this));
63+
private OrmLiteConnection OrmLiteConnection => ormLiteConnection ??= new OrmLiteConnection(this);
6664

6765
public virtual IDbConnection CreateDbConnection()
6866
{

0 commit comments

Comments
 (0)