Skip to content

Commit b3b209d

Browse files
skraikovskraikov
committed
3.7.7.425
1 parent e4dd880 commit b3b209d

File tree

98 files changed

+639
-839
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+639
-839
lines changed

‎CookieStorage/CookieStorage.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,9 @@
133133
<Content Include="Scripts\jquery-1.10.2.min.map" />
134134
</ItemGroup>
135135
<ItemGroup>
136-
<Reference Include="ActiveQueryBuilder.Core, Version=3.7.6.1181, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
137-
<Reference Include="ActiveQueryBuilder.View, Version=3.7.6.1181, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
138-
<Reference Include="ActiveQueryBuilder.Web.Server, Version=3.7.6.424, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
136+
<Reference Include="ActiveQueryBuilder.Core, Version=3.7.7.1182, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
137+
<Reference Include="ActiveQueryBuilder.View, Version=3.7.7.1182, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
138+
<Reference Include="ActiveQueryBuilder.Web.Server, Version=3.7.7.425, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
139139
</ItemGroup>
140140
<PropertyGroup>
141141
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

‎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/project.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"dependencies": {
3-
"ActiveQueryBuilder.Core": "3.7.6.1181",
4-
"ActiveQueryBuilder.SQLiteMetadataProvider": "3.7.6.1181",
5-
"ActiveQueryBuilder.OLEDBMetadataProvider": "3.7.6.1181",
6-
"ActiveQueryBuilder.MSSQLMetadataProvider": "3.7.6.1181",
7-
"ActiveQueryBuilder.Web.MVC": "3.7.6.424",
3+
"ActiveQueryBuilder.Core": "3.7.7.1182",
4+
"ActiveQueryBuilder.SQLiteMetadataProvider": "3.7.7.1182",
5+
"ActiveQueryBuilder.OLEDBMetadataProvider": "3.7.7.1182",
6+
"ActiveQueryBuilder.MSSQLMetadataProvider": "3.7.7.1182",
7+
"ActiveQueryBuilder.Web.MVC": "3.7.7.425",
88
"Antlr": "3.4.1.9004",
99
"bootstrap": "3.0.0",
1010
"jQuery": "1.10.2",

‎CrossDomain/Controllers/QueryBuilderController.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,10 @@ public string CheckToken(string token)
2828

2929
public ActionResult CreateQueryBuilder(string name)
3030
{
31-
// Get an instance of the QueryBuilder object
32-
var qb = QueryBuilderStore.Get(name);
33-
34-
if (qb != null)
35-
return new HttpStatusCodeResult(200);
36-
3731
try
3832
{
3933
// Create an instance of the QueryBuilder object
40-
QueryBuilderStore.Create(name);
34+
QueryBuilderStore.GetOrCreate(name);
4135
return new HttpStatusCodeResult(200);
4236
}
4337
catch (QueryBuilderException e)

‎CrossDomain/CrossDomain.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@
144144
<Content Include="Scripts\jquery-1.10.2.min.map" />
145145
</ItemGroup>
146146
<ItemGroup>
147-
<Reference Include="ActiveQueryBuilder.Core, Version=3.7.6.1181, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
148-
<Reference Include="ActiveQueryBuilder.Web.Server, Version=3.7.6.424, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
147+
<Reference Include="ActiveQueryBuilder.Core, Version=3.7.7.1182, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
148+
<Reference Include="ActiveQueryBuilder.Web.Server, Version=3.7.7.425, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
149149
</ItemGroup>
150150
<PropertyGroup>
151151
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

‎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/project.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"dependencies": {
3-
"ActiveQueryBuilder.Core": "3.7.6.1181",
4-
"ActiveQueryBuilder.SQLiteMetadataProvider": "3.7.6.1181",
5-
"ActiveQueryBuilder.OLEDBMetadataProvider": "3.7.6.1181",
6-
"ActiveQueryBuilder.MSSQLMetadataProvider": "3.7.6.1181",
7-
"ActiveQueryBuilder.Web.MVC": "3.7.6.424",
3+
"ActiveQueryBuilder.Core": "3.7.7.1182",
4+
"ActiveQueryBuilder.SQLiteMetadataProvider": "3.7.7.1182",
5+
"ActiveQueryBuilder.OLEDBMetadataProvider": "3.7.7.1182",
6+
"ActiveQueryBuilder.MSSQLMetadataProvider": "3.7.7.1182",
7+
"ActiveQueryBuilder.Web.MVC": "3.7.7.425",
88
"Antlr": "3.4.1.9004",
99
"bootstrap": "3.0.0",
1010
"jQuery": "1.10.2",

‎CustomStorage/CustomStorage.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,11 @@
157157
<None Include="Project_Readme.html" />
158158
</ItemGroup>
159159
<ItemGroup>
160-
<Reference Include="ActiveQueryBuilder.SQLiteMetadataProvider, Version=3.7.6.1181, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
161-
<Reference Include="ActiveQueryBuilder.Core, Version=3.7.6.1181, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
162-
<Reference Include="ActiveQueryBuilder.View, Version=3.7.6.1181, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
163-
<Reference Include="ActiveQueryBuilder.Web.MVC, Version=3.7.6.424, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
164-
<Reference Include="ActiveQueryBuilder.Web.Server, Version=3.7.6.424, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
160+
<Reference Include="ActiveQueryBuilder.SQLiteMetadataProvider, Version=3.7.7.1182, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
161+
<Reference Include="ActiveQueryBuilder.Core, Version=3.7.7.1182, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
162+
<Reference Include="ActiveQueryBuilder.View, Version=3.7.7.1182, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
163+
<Reference Include="ActiveQueryBuilder.Web.MVC, Version=3.7.7.425, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
164+
<Reference Include="ActiveQueryBuilder.Web.Server, Version=3.7.7.425, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
165165
</ItemGroup>
166166
<PropertyGroup>
167167
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

‎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.

‎CustomStorage/project.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"dependencies": {
3-
"ActiveQueryBuilder.Core": "3.7.6.1181",
4-
"ActiveQueryBuilder.SQLiteMetadataProvider": "3.7.6.1181",
5-
"ActiveQueryBuilder.OLEDBMetadataProvider": "3.7.6.1181",
6-
"ActiveQueryBuilder.MSSQLMetadataProvider": "3.7.6.1181",
7-
"ActiveQueryBuilder.Web.MVC": "3.7.6.424",
3+
"ActiveQueryBuilder.Core": "3.7.7.1182",
4+
"ActiveQueryBuilder.SQLiteMetadataProvider": "3.7.7.1182",
5+
"ActiveQueryBuilder.OLEDBMetadataProvider": "3.7.7.1182",
6+
"ActiveQueryBuilder.MSSQLMetadataProvider": "3.7.7.1182",
7+
"ActiveQueryBuilder.Web.MVC": "3.7.7.425",
88
"Antlr": "3.4.1.9004",
99
"bootstrap": "3.0.0",
1010
"jQuery": "1.10.2",

‎IoCWebApiDemo/IoCWebApiDemo.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@
160160
<Service Include="{4A0DDDB5-7A95-4FBF-97CC-616D07737A77}" />
161161
</ItemGroup>
162162
<ItemGroup>
163-
<Reference Include="ActiveQueryBuilder.Core, Version=3.7.6.1181, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
164-
<Reference Include="ActiveQueryBuilder.Web.Server, Version=3.7.6.424, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
163+
<Reference Include="ActiveQueryBuilder.Core, Version=3.7.7.1182, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
164+
<Reference Include="ActiveQueryBuilder.Web.Server, Version=3.7.7.425, Culture=neutral, PublicKeyToken=49d051b90653c7f4, processorArchitecture=MSIL" />
165165
</ItemGroup>
166166
<PropertyGroup>
167167
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

‎IoCWebApiDemo/project.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"dependencies": {
3-
"ActiveQueryBuilder.Core": "3.7.6.1181",
4-
"ActiveQueryBuilder.SQLiteMetadataProvider": "3.7.6.1181",
5-
"ActiveQueryBuilder.OLEDBMetadataProvider": "3.7.6.1181",
6-
"ActiveQueryBuilder.MSSQLMetadataProvider": "3.7.6.1181",
7-
"ActiveQueryBuilder.Web.MVC": "3.7.6.424",
3+
"ActiveQueryBuilder.Core": "3.7.7.1182",
4+
"ActiveQueryBuilder.SQLiteMetadataProvider": "3.7.7.1182",
5+
"ActiveQueryBuilder.OLEDBMetadataProvider": "3.7.7.1182",
6+
"ActiveQueryBuilder.MSSQLMetadataProvider": "3.7.7.1182",
7+
"ActiveQueryBuilder.Web.MVC": "3.7.7.425",
88
"Antlr": "3.5.0.2",
99
"Autofac": "4.9.2",
1010
"Autofac.WebApi2": "4.2.1",

‎IoCWebApiDemo/src/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.

‎JavaScript/Controllers/AngularClientRenderingController.cs

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,22 @@ public ActionResult Index()
3232
private void CreateQueryBuilder()
3333
{
3434
// Get an instance of the QueryBuilder object
35-
var qb = QueryBuilderStore.Get(InstanceId);
36-
37-
if (qb != null)
38-
return;
35+
QueryBuilderStore.GetOrCreate(InstanceId, queryBuilder =>
36+
{
37+
queryBuilder.SyntaxProvider = new MSSQLSyntaxProvider();
3938

40-
// Create an instance of the QueryBuilder object
41-
var queryBuilder = QueryBuilderStore.Factory.MsSql(InstanceId);
42-
43-
// Denies metadata loading requests from the metadata provider
44-
queryBuilder.MetadataLoadingOptions.OfflineMode = true;
39+
// Denies metadata loading requests from the metadata provider
40+
queryBuilder.MetadataLoadingOptions.OfflineMode = true;
4541

46-
// Load MetaData from XML document. File name is stored in the "Web.config" file in [/configuration/appSettings/NorthwindXmlMetaData] key
47-
var path = ConfigurationManager.AppSettings["NorthwindXmlMetaData"];
48-
var xml = Path.Combine(Server.MapPath("~"), path);
42+
// Load MetaData from XML document. File name is stored in the "Web.config" file in [/configuration/appSettings/NorthwindXmlMetaData] key
43+
var path = ConfigurationManager.AppSettings["NorthwindXmlMetaData"];
44+
var xml = Path.Combine(Server.MapPath("~"), path);
4945

50-
queryBuilder.MetadataContainer.ImportFromXML(xml);
46+
queryBuilder.MetadataContainer.ImportFromXML(xml);
5147

52-
//Set default query
53-
queryBuilder.SQL = GetDefaultSql();
48+
//Set default query
49+
queryBuilder.SQL = GetDefaultSql();
50+
});
5451
}
5552

5653
private string GetDefaultSql()

‎JavaScript/Controllers/AngularJSClientRenderingController.cs

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,22 @@ public ActionResult Index()
2222
private void CreateQueryBuilder()
2323
{
2424
// Get an instance of the QueryBuilder object
25-
var qb = QueryBuilderStore.Get(InstanceId);
25+
QueryBuilderStore.GetOrCreate(InstanceId, queryBuilder =>
26+
{
27+
queryBuilder.SyntaxProvider = new MSSQLSyntaxProvider();
2628

27-
if (qb != null)
28-
return;
29+
// Denies metadata loading requests from the metadata provider
30+
queryBuilder.MetadataLoadingOptions.OfflineMode = true;
2931

30-
// Create an instance of the QueryBuilder object
31-
var queryBuilder = QueryBuilderStore.Factory.MsSql(InstanceId);
32-
33-
// Denies metadata loading requests from the metadata provider
34-
queryBuilder.MetadataLoadingOptions.OfflineMode = true;
32+
// Load MetaData from XML document. File name is stored in the "Web.config" file in [/configuration/appSettings/NorthwindXmlMetaData] key
33+
var path = ConfigurationManager.AppSettings["NorthwindXmlMetaData"];
34+
var xml = Path.Combine(Server.MapPath("~"), path);
3535

36-
// Load MetaData from XML document. File name is stored in the "Web.config" file in [/configuration/appSettings/NorthwindXmlMetaData] key
37-
var path = ConfigurationManager.AppSettings["NorthwindXmlMetaData"];
38-
var xml = Path.Combine(Server.MapPath("~"), path);
36+
queryBuilder.MetadataContainer.ImportFromXML(xml);
3937

40-
queryBuilder.MetadataContainer.ImportFromXML(xml);
41-
42-
//Set default query
43-
queryBuilder.SQL = GetDefaultSql();
38+
//Set default query
39+
queryBuilder.SQL = GetDefaultSql();
40+
});
4441
}
4542

4643
private string GetDefaultSql()

‎JavaScript/Controllers/ChangeConnectionController.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ public class ChangeConnectionController: Controller
1212

1313
public ChangeConnectionController()
1414
{
15-
if (QueryBuilderStore.Get(_instanceId) == null)
16-
QueryBuilderStore.Create(_instanceId);
15+
QueryBuilderStore.GetOrCreate(_instanceId);
1716
}
1817

1918
public ActionResult Index()

‎JavaScript/Controllers/CreateFromConfigController.cs

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,16 @@ public ActionResult Index()
1818
/// <returns></returns>
1919
public ActionResult Create(string name)
2020
{
21-
// Get an instance of the QueryBuilder object
22-
var qb = QueryBuilderStore.Get(name);
23-
24-
if (qb != null)
25-
return new EmptyResult();
26-
2721
try
2822
{
2923
// Create an instance of the QueryBuilder object
30-
qb = QueryBuilderStore.Create(name);
24+
QueryBuilderStore.GetOrCreate(name, qb => qb.SQL = GetDefaultSql());
3125

3226
// The necessary initialization procedures to setup SQL syntax and the source of metadata will be performed automatically
3327
// according to directives in the special configuration section of 'Web.config' file.
3428

3529
// This behavior is enabled by the QueryBuilderStore.WebConfig() method call in the Application_Start method in Global.asax.cs file.
3630
// See qb.ConfiguredBy to get information about actual default settings
37-
38-
// Set default query
39-
qb.SQL = GetDefaultSql();
4031
}
4132
catch (Exception e)
4233
{

‎JavaScript/Controllers/CreateQueryBuilderController.cs

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,22 @@ public ActionResult Index()
2121
public ActionResult CreateQueryBuilder(string name)
2222
{
2323
// Get an instance of the QueryBuilder object
24-
var qb = QueryBuilderStore.Get(name);
24+
QueryBuilderStore.GetOrCreate(name, queryBuilder =>
25+
{
26+
queryBuilder.SyntaxProvider = new MSSQLSyntaxProvider();
2527

26-
if (qb != null)
27-
return new EmptyResult();
28+
// Denies metadata loading requests from live database connection
29+
queryBuilder.MetadataLoadingOptions.OfflineMode = true;
2830

29-
// Create an instance of the QueryBuilder object
30-
var queryBuilder = QueryBuilderStore.Factory.MsSql(name);
31-
32-
// Denies metadata loading requests from live database connection
33-
queryBuilder.MetadataLoadingOptions.OfflineMode = true;
31+
// Load MetaData from XML document. File name is stored in the "Web.config" file in [/configuration/appSettings/NorthwindXmlMetaData] key
32+
var path = ConfigurationManager.AppSettings["NorthwindXmlMetaData"];
33+
var xml = Path.Combine(Server.MapPath("~"), path);
3434

35-
// Load MetaData from XML document. File name is stored in the "Web.config" file in [/configuration/appSettings/NorthwindXmlMetaData] key
36-
var path = ConfigurationManager.AppSettings["NorthwindXmlMetaData"];
37-
var xml = Path.Combine(Server.MapPath("~"), path);
35+
queryBuilder.MetadataContainer.ImportFromXML(xml);
3836

39-
queryBuilder.MetadataContainer.ImportFromXML(xml);
40-
41-
//Set default query
42-
queryBuilder.SQL = GetDefaultSql();
37+
//Set default query
38+
queryBuilder.SQL = GetDefaultSql();
39+
});
4340

4441
return new EmptyResult();
4542
}

‎JavaScript/Controllers/DoubleClientRenderingController.cs

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,19 @@ public ActionResult Index()
2222
private void CreateFirstQueryBuilder()
2323
{
2424
// Get an instance of the QueryBuilder object
25-
var queryBuilder = QueryBuilderStore.Get("FirstClient");
25+
QueryBuilderStore.GetOrCreate("FirstClient", queryBuilder =>
26+
{
27+
queryBuilder.SyntaxProvider = new MSSQLSyntaxProvider();
2628

27-
if (queryBuilder != null)
28-
return;
29+
// Denies metadata loading requests from the metadata provider
30+
queryBuilder.MetadataLoadingOptions.OfflineMode = true;
2931

30-
// Create an instance of the QueryBuilder object
31-
queryBuilder = QueryBuilderStore.Factory.MsSql("FirstClient");
32-
33-
// Denies metadata loading requests from the metadata provider
34-
queryBuilder.MetadataLoadingOptions.OfflineMode = true;
32+
// Load MetaData from XML document. File name is stored in the "Web.config" file in [/configuration/appSettings/NorthwindXmlMetaData] key
33+
var path = ConfigurationManager.AppSettings["NorthwindXmlMetaData"];
34+
var xml = Path.Combine(Server.MapPath("~"), path);
3535

36-
// Load MetaData from XML document. File name is stored in the "Web.config" file in [/configuration/appSettings/NorthwindXmlMetaData] key
37-
var path = ConfigurationManager.AppSettings["NorthwindXmlMetaData"];
38-
var xml = Path.Combine(Server.MapPath("~"), path);
39-
40-
queryBuilder.MetadataContainer.ImportFromXML(xml);
36+
queryBuilder.MetadataContainer.ImportFromXML(xml);
37+
});
4138
}
4239

4340
/// <summary>
@@ -46,22 +43,19 @@ private void CreateFirstQueryBuilder()
4643
private void CreateSecondQueryBuilder()
4744
{
4845
// Get an instance of the QueryBuilder object
49-
var queryBuilder = QueryBuilderStore.Get("SecondClient");
50-
51-
if (queryBuilder != null)
52-
return;
46+
QueryBuilderStore.GetOrCreate("SecondClient", queryBuilder =>
47+
{
48+
queryBuilder.SyntaxProvider = new DB2SyntaxProvider();
5349

54-
// Create an instance of the QueryBuilder object
55-
queryBuilder = QueryBuilderStore.Factory.DB2("SecondClient");
56-
57-
// Denies metadata loading requests from the metadata provider
58-
queryBuilder.MetadataLoadingOptions.OfflineMode = true;
50+
// Denies metadata loading requests from the metadata provider
51+
queryBuilder.MetadataLoadingOptions.OfflineMode = true;
5952

60-
// Load MetaData from XML document. File name is stored in the "Web.config" file in [/configuration/appSettings/db2_sample_with_alt_names] key
61-
var path = ConfigurationManager.AppSettings["Db2XmlMetaData"];
62-
var xml = Path.Combine(Server.MapPath("~"), path);
53+
// Load MetaData from XML document. File name is stored in the "Web.config" file in [/configuration/appSettings/NorthwindXmlMetaData] key
54+
var path = ConfigurationManager.AppSettings["Db2XmlMetaData"];
55+
var xml = Path.Combine(Server.MapPath("~"), path);
6356

64-
queryBuilder.MetadataContainer.ImportFromXML(xml);
57+
queryBuilder.MetadataContainer.ImportFromXML(xml);
58+
});
6559
}
6660
}
6761
}

0 commit comments

Comments
 (0)