Skip to content

Commit fd57fef

Browse files
author
ActiveDbSoft
committed
3.3.4
1 parent 388481e commit fd57fef

File tree

24 files changed

+135
-133
lines changed

24 files changed

+135
-133
lines changed

‎CookieStorage/CookieStorage.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,13 +179,13 @@
179179
</ItemGroup>
180180
<ItemGroup>
181181
<Reference Include="ActiveQueryBuilder.Core">
182-
<HintPath>..\packages\ActiveQueryBuilder.Core.3.5.4.1109\lib\net\ActiveQueryBuilder.Core.dll</HintPath>
182+
<HintPath>..\packages\ActiveQueryBuilder.Core.3.5.5.1110\lib\net\ActiveQueryBuilder.Core.dll</HintPath>
183183
</Reference>
184184
<Reference Include="ActiveQueryBuilder.View">
185-
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.3.3\lib\net\ActiveQueryBuilder.View.dll</HintPath>
185+
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.3.4\lib\net\ActiveQueryBuilder.View.dll</HintPath>
186186
</Reference>
187187
<Reference Include="ActiveQueryBuilder.Web.Server">
188-
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.3.3\lib\net\ActiveQueryBuilder.Web.Server.dll</HintPath>
188+
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.3.4\lib\net\ActiveQueryBuilder.Web.Server.dll</HintPath>
189189
</Reference>
190190
</ItemGroup>
191191
<PropertyGroup>

‎CookieStorage/aqb.client.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CookieStorage/packages.config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ActiveQueryBuilder.Core" version="3.5.4.1109" targetFramework="net40" />
4-
<package id="ActiveQueryBuilder.SQLiteMetadataProvider" version="3.5.4.1109" targetFramework="net40" />
5-
<package id="ActiveQueryBuilder.OLEDBMetadataProvider" version="3.5.4.1109" targetFramework="net40" />
6-
<package id="ActiveQueryBuilder.MSSQLMetadataProvider" version="3.5.4.1109" targetFramework="net40" />
7-
<package id="ActiveQueryBuilder.Web.MVC" version="3.3.3" targetFramework="net40" />
3+
<package id="ActiveQueryBuilder.Core" version="3.5.5.1110" targetFramework="net40" />
4+
<package id="ActiveQueryBuilder.SQLiteMetadataProvider" version="3.5.5.1110" targetFramework="net40" />
5+
<package id="ActiveQueryBuilder.OLEDBMetadataProvider" version="3.5.5.1110" targetFramework="net40" />
6+
<package id="ActiveQueryBuilder.MSSQLMetadataProvider" version="3.5.5.1110" targetFramework="net40" />
7+
<package id="ActiveQueryBuilder.Web.MVC" version="3.3.4" targetFramework="net40" />
88
<package id="Antlr" version="3.4.1.9004" targetFramework="net461" />
99
<package id="bootstrap" version="3.0.0" targetFramework="net461" />
1010
<package id="jQuery" version="1.10.2" targetFramework="net461" />

‎CrossDomain/CrossDomain.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,10 +186,10 @@
186186
</ItemGroup>
187187
<ItemGroup>
188188
<Reference Include="ActiveQueryBuilder.Core">
189-
<HintPath>..\packages\ActiveQueryBuilder.Core.3.5.4.1109\lib\net\ActiveQueryBuilder.Core.dll</HintPath>
189+
<HintPath>..\packages\ActiveQueryBuilder.Core.3.5.5.1110\lib\net\ActiveQueryBuilder.Core.dll</HintPath>
190190
</Reference>
191191
<Reference Include="ActiveQueryBuilder.Web.Server">
192-
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.3.3\lib\net\ActiveQueryBuilder.Web.Server.dll</HintPath>
192+
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.3.4\lib\net\ActiveQueryBuilder.Web.Server.dll</HintPath>
193193
</Reference>
194194
</ItemGroup>
195195
<PropertyGroup>

‎CrossDomain/FrontEnd/aqb.client.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CrossDomain/packages.config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ActiveQueryBuilder.Core" version="3.5.4.1109" targetFramework="net40" />
4-
<package id="ActiveQueryBuilder.SQLiteMetadataProvider" version="3.5.4.1109" targetFramework="net40" />
5-
<package id="ActiveQueryBuilder.OLEDBMetadataProvider" version="3.5.4.1109" targetFramework="net40" />
6-
<package id="ActiveQueryBuilder.MSSQLMetadataProvider" version="3.5.4.1109" targetFramework="net40" />
7-
<package id="ActiveQueryBuilder.Web.MVC" version="3.3.3" targetFramework="net40" />
3+
<package id="ActiveQueryBuilder.Core" version="3.5.5.1110" targetFramework="net40" />
4+
<package id="ActiveQueryBuilder.SQLiteMetadataProvider" version="3.5.5.1110" targetFramework="net40" />
5+
<package id="ActiveQueryBuilder.OLEDBMetadataProvider" version="3.5.5.1110" targetFramework="net40" />
6+
<package id="ActiveQueryBuilder.MSSQLMetadataProvider" version="3.5.5.1110" targetFramework="net40" />
7+
<package id="ActiveQueryBuilder.Web.MVC" version="3.3.4" targetFramework="net40" />
88
<package id="Antlr" version="3.4.1.9004" targetFramework="net45" />
99
<package id="bootstrap" version="3.0.0" targetFramework="net45" />
1010
<package id="jQuery" version="1.10.2" targetFramework="net45" />

‎CustomStorage/Controllers/HomeController.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Web.Mvc;
1+
using System;
2+
using System.Web.Mvc;
23
using ActiveQueryBuilder.Web.Server;
34

45
namespace CustomStorage.Controllers

‎CustomStorage/CustomStorage.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,19 +210,19 @@
210210
</ItemGroup>
211211
<ItemGroup>
212212
<Reference Include="ActiveQueryBuilder.SQLiteMetadataProvider">
213-
<HintPath>..\packages\ActiveQueryBuilder.SQLiteMetadataProvider.3.5.4.1109\lib\net\ActiveQueryBuilder.SQLiteMetadataProvider.dll</HintPath>
213+
<HintPath>..\packages\ActiveQueryBuilder.SQLiteMetadataProvider.3.5.5.1110\lib\net\ActiveQueryBuilder.SQLiteMetadataProvider.dll</HintPath>
214214
</Reference>
215215
<Reference Include="ActiveQueryBuilder.Core">
216-
<HintPath>..\packages\ActiveQueryBuilder.Core.3.5.4.1109\lib\net\ActiveQueryBuilder.Core.dll</HintPath>
216+
<HintPath>..\packages\ActiveQueryBuilder.Core.3.5.5.1110\lib\net\ActiveQueryBuilder.Core.dll</HintPath>
217217
</Reference>
218218
<Reference Include="ActiveQueryBuilder.View">
219-
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.3.3\lib\net\ActiveQueryBuilder.View.dll</HintPath>
219+
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.3.4\lib\net\ActiveQueryBuilder.View.dll</HintPath>
220220
</Reference>
221221
<Reference Include="ActiveQueryBuilder.Web.MVC">
222-
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.3.3\lib\net\ActiveQueryBuilder.Web.MVC.dll</HintPath>
222+
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.3.4\lib\net\ActiveQueryBuilder.Web.MVC.dll</HintPath>
223223
</Reference>
224224
<Reference Include="ActiveQueryBuilder.Web.Server">
225-
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.3.3\lib\net\ActiveQueryBuilder.Web.Server.dll</HintPath>
225+
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.3.4\lib\net\ActiveQueryBuilder.Web.Server.dll</HintPath>
226226
</Reference>
227227
</ItemGroup>
228228
<PropertyGroup>

‎CustomStorage/QueryBuilderProvider/SqlIteQueryBuilderProvider.cs‎

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Data;
1+
using System;
2+
using System.Data;
23
using ActiveQueryBuilder.Core;
34
using ActiveQueryBuilder.Core.QueryTransformer;
45
using ActiveQueryBuilder.View;
@@ -14,18 +15,11 @@ namespace CustomStorage.QueryBuilderProvider
1415
public class QueryBuilderSqLiteStoreProvider : IQueryBuilderProvider
1516
{
1617
public bool SaveState { get; private set; }
17-
18-
/// <summary>
19-
/// Connection to the Sqlite database
20-
/// </summary>
21-
private readonly IDbConnection _connection;
22-
18+
2319
public QueryBuilderSqLiteStoreProvider()
2420
{
2521
SaveState = true;
2622

27-
_connection = DataBaseHelper.CreateSqLiteConnection("SqLiteDataBase");
28-
2923
var sql = "create table if not exists QueryBuilders(id text primary key, layout TEXT)";
3024
ExecuteNonQuery(sql);
3125
}
@@ -41,18 +35,26 @@ public QueryBuilder Get(string id)
4135

4236
// Turn this property on to suppress parsing error messages when user types non-SELECT statements in the text editor.
4337
qb.BehaviorOptions.AllowSleepMode = false;
44-
38+
4539
// Bind Active Query Builder to a live database connection.
46-
qb.MetadataProvider = new SQLiteMetadataProvider
40+
qb.MetadataProvider = new SQLiteMetadataProvider
4741
{
4842
// Assign an instance of DBConnection object to the Connection property.
49-
Connection = _connection
43+
Connection = DataBaseHelper.CreateSqLiteConnection("SqLiteDataBase")
5044
};
5145

5246
var layout = GetLayout(id);
5347

54-
if (layout != null)
55-
qb.LayoutSQL = layout;
48+
try
49+
{
50+
if (layout != null)
51+
qb.LayoutSQL = layout;
52+
}
53+
catch (Exception e)
54+
{
55+
Console.WriteLine(e);
56+
throw;
57+
}
5658

5759
return qb;
5860
}
@@ -62,7 +64,7 @@ public QueryBuilder Get(string id)
6264
/// </summary>
6365
/// <param name="qb">The QueryBuilder object.</param>
6466
public void Put(QueryBuilder qb)
65-
{
67+
{
6668
if (GetLayout(qb.Tag) == null)
6769
Insert(qb);
6870
else
@@ -92,12 +94,14 @@ private void Update(QueryBuilder qb)
9294

9395
private void ExecuteNonQuery(string sql)
9496
{
97+
var _connection = DataBaseHelper.CreateSqLiteConnection("SqLiteDataBase");
98+
9599
try
96100
{
97101
if (_connection.State != ConnectionState.Open)
98102
_connection.Open();
99103

100-
using (var cmd = CreateCommand(sql))
104+
using (var cmd = CreateCommand(_connection, sql))
101105
cmd.ExecuteNonQuery();
102106
}
103107
finally
@@ -109,16 +113,17 @@ private void ExecuteNonQuery(string sql)
109113
private string GetLayout(string id)
110114
{
111115
var sql = string.Format("select layout from QueryBuilders where id = '{0}'", id);
116+
var _connection = DataBaseHelper.CreateSqLiteConnection("SqLiteDataBase");
112117

113118
try
114119
{
115120
if (_connection.State != ConnectionState.Open)
116121
_connection.Open();
117122

118-
using (var cmd = CreateCommand(sql))
119-
using (var reader = cmd.ExecuteReader())
120-
if (reader.Read())
121-
return reader["layout"].ToString();
123+
using (var cmd = CreateCommand(_connection, sql))
124+
using (var reader = cmd.ExecuteReader())
125+
if (reader.Read())
126+
return reader["layout"].ToString();
122127

123128
return null;
124129
}
@@ -128,9 +133,9 @@ private string GetLayout(string id)
128133
}
129134
}
130135

131-
private IDbCommand CreateCommand(string sql)
136+
private IDbCommand CreateCommand(IDbConnection conn, string sql)
132137
{
133-
var cmd = _connection.CreateCommand();
138+
var cmd = conn.CreateCommand();
134139
cmd.CommandText = sql;
135140
return cmd;
136141
}
@@ -150,7 +155,7 @@ public QueryTransformerSqliteStoreProvider()
150155
var sql = "create table if not exists QueryTransformers(id text primary key, state TEXT)";
151156
ExecuteNonQuery(sql);
152157
}
153-
158+
154159
public QueryTransformer Get(string id)
155160
{
156161
var qt = new QueryTransformer { Tag = id };
@@ -164,7 +169,7 @@ public QueryTransformer Get(string id)
164169

165170
return qt;
166171
}
167-
172+
168173
public void Put(QueryTransformer qt)
169174
{
170175
if (GetState(qt.Tag.ToString()) == null)

‎CustomStorage/aqb.client.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)