Skip to content

Commit 5d9a766

Browse files
skraikovskraikov
committed
3.4.4
1 parent 6fac76e commit 5d9a766

34 files changed

+3819
-3818
lines changed

‎CookieStorage/CookieStorage.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
1414
<RootNamespace>CookieStorage</RootNamespace>
1515
<AssemblyName>CookieStorage</AssemblyName>
16-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1717
<MvcBuildViews>false</MvcBuildViews>
1818
<UseIISExpress>true</UseIISExpress>
1919
<Use64BitIISExpress />
@@ -25,6 +25,7 @@
2525
<WebGreaseLibPath>..\packages\WebGrease.1.5.2\lib</WebGreaseLibPath>
2626
<NuGetPackageImportStamp>
2727
</NuGetPackageImportStamp>
28+
<TargetFrameworkProfile />
2829
</PropertyGroup>
2930
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3031
<DebugSymbols>true</DebugSymbols>
@@ -133,13 +134,13 @@
133134
</ItemGroup>
134135
<ItemGroup>
135136
<Reference Include="ActiveQueryBuilder.Core">
136-
<HintPath>..\packages\ActiveQueryBuilder.Core.3.5.14.1126\lib\net\ActiveQueryBuilder.Core.dll</HintPath>
137+
<HintPath>..\packages\ActiveQueryBuilder.Core.3.5.15.1127\lib\net\ActiveQueryBuilder.Core.dll</HintPath>
137138
</Reference>
138139
<Reference Include="ActiveQueryBuilder.View">
139-
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.4.3\lib\net\ActiveQueryBuilder.View.dll</HintPath>
140+
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.4.4\lib\net\ActiveQueryBuilder.View.dll</HintPath>
140141
</Reference>
141142
<Reference Include="ActiveQueryBuilder.Web.Server">
142-
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.4.3\lib\net\ActiveQueryBuilder.Web.Server.dll</HintPath>
143+
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.4.4\lib\net\ActiveQueryBuilder.Web.Server.dll</HintPath>
143144
</Reference>
144145
</ItemGroup>
145146
<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/project.json‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
{
1+
{
22
"dependencies": {
3-
"ActiveQueryBuilder.Core": "3.5.14.1126",
4-
"ActiveQueryBuilder.SQLiteMetadataProvider": "3.5.14.1126",
5-
"ActiveQueryBuilder.OLEDBMetadataProvider": "3.5.14.1126",
6-
"ActiveQueryBuilder.MSSQLMetadataProvider": "3.5.14.1126",
7-
"ActiveQueryBuilder.Web.MVC": "3.4.3",
8-
"Antlr": "3.4.1.9004",
9-
"bootstrap": "3.0.0",
10-
"jQuery": "1.10.2",
11-
"jQuery.Validation": "1.11.1",
12-
"log4net": "2.0.8",
13-
"Microsoft.AspNet.Mvc": "5.2.3",
14-
"Microsoft.AspNet.Razor": "3.2.3",
15-
"Microsoft.AspNet.Web.Optimization": "1.1.3",
16-
"Microsoft.AspNet.WebPages": "3.2.3",
17-
"Microsoft.jQuery.Unobtrusive.Validation": "3.2.3",
18-
"Microsoft.Web.Infrastructure": "1.0.0.0",
19-
"Modernizr": "2.6.2",
20-
"Newtonsoft.Json": "6.0.4",
21-
"Respond": "1.2.0",
22-
"WebGrease": "1.5.2"
23-
},
24-
"frameworks": {
25-
"net461": {}
26-
},
27-
"runtimes": {
28-
"win": {}
29-
}
3+
"ActiveQueryBuilder.Core": "3.5.15.1127",
4+
"ActiveQueryBuilder.SQLiteMetadataProvider": "3.5.15.1127",
5+
"ActiveQueryBuilder.OLEDBMetadataProvider": "3.5.15.1127",
6+
"ActiveQueryBuilder.MSSQLMetadataProvider": "3.5.15.1127",
7+
"ActiveQueryBuilder.Web.MVC": "3.4.4",
8+
"Antlr": "3.4.1.9004",
9+
"bootstrap": "3.0.0",
10+
"jQuery": "1.10.2",
11+
"jQuery.Validation": "1.11.1",
12+
"log4net": "2.0.8",
13+
"Microsoft.AspNet.Mvc": "5.2.3",
14+
"Microsoft.AspNet.Razor": "3.2.3",
15+
"Microsoft.AspNet.Web.Optimization": "1.1.3",
16+
"Microsoft.AspNet.WebPages": "3.2.3",
17+
"Microsoft.jQuery.Unobtrusive.Validation": "3.2.3",
18+
"Microsoft.Web.Infrastructure": "1.0.0.0",
19+
"Modernizr": "2.6.2",
20+
"Newtonsoft.Json": "6.0.4",
21+
"Respond": "1.2.0",
22+
"WebGrease": "1.5.2"
23+
},
24+
"frameworks": {
25+
"net45": {}
26+
},
27+
"runtimes": {
28+
"win": {}
29+
}
3030
}

‎CrossDomain/CrossDomain.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,10 @@
145145
</ItemGroup>
146146
<ItemGroup>
147147
<Reference Include="ActiveQueryBuilder.Core">
148-
<HintPath>..\packages\ActiveQueryBuilder.Core.3.5.14.1126\lib\net\ActiveQueryBuilder.Core.dll</HintPath>
148+
<HintPath>..\packages\ActiveQueryBuilder.Core.3.5.15.1127\lib\net\ActiveQueryBuilder.Core.dll</HintPath>
149149
</Reference>
150150
<Reference Include="ActiveQueryBuilder.Web.Server">
151-
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.4.3\lib\net\ActiveQueryBuilder.Web.Server.dll</HintPath>
151+
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.4.4\lib\net\ActiveQueryBuilder.Web.Server.dll</HintPath>
152152
</Reference>
153153
</ItemGroup>
154154
<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/project.json‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
{
1+
{
22
"dependencies": {
3-
"ActiveQueryBuilder.Core": "3.5.14.1126",
4-
"ActiveQueryBuilder.SQLiteMetadataProvider": "3.5.14.1126",
5-
"ActiveQueryBuilder.OLEDBMetadataProvider": "3.5.14.1126",
6-
"ActiveQueryBuilder.MSSQLMetadataProvider": "3.5.14.1126",
7-
"ActiveQueryBuilder.Web.MVC": "3.4.3",
8-
"Antlr": "3.4.1.9004",
9-
"bootstrap": "3.0.0",
10-
"jQuery": "1.10.2",
11-
"jQuery.Validation": "1.11.1",
12-
"log4net": "2.0.8",
13-
"Microsoft.AspNet.Mvc": "5.2.2",
14-
"Microsoft.AspNet.Razor": "3.2.2",
15-
"Microsoft.AspNet.Web.Optimization": "1.1.3",
16-
"Microsoft.AspNet.WebPages": "3.2.2",
17-
"Microsoft.jQuery.Unobtrusive.Validation": "3.2.2",
18-
"Microsoft.Web.Infrastructure": "1.0.0.0",
19-
"Modernizr": "2.6.2",
20-
"Newtonsoft.Json": "6.0.4",
21-
"Respond": "1.2.0",
22-
"WebGrease": "1.5.2"
23-
},
24-
"frameworks": {
25-
"net45": {}
26-
},
27-
"runtimes": {
28-
"win": {}
29-
}
3+
"ActiveQueryBuilder.Core": "3.5.15.1127",
4+
"ActiveQueryBuilder.SQLiteMetadataProvider": "3.5.15.1127",
5+
"ActiveQueryBuilder.OLEDBMetadataProvider": "3.5.15.1127",
6+
"ActiveQueryBuilder.MSSQLMetadataProvider": "3.5.15.1127",
7+
"ActiveQueryBuilder.Web.MVC": "3.4.4",
8+
"Antlr": "3.4.1.9004",
9+
"bootstrap": "3.0.0",
10+
"jQuery": "1.10.2",
11+
"jQuery.Validation": "1.11.1",
12+
"log4net": "2.0.8",
13+
"Microsoft.AspNet.Mvc": "5.2.2",
14+
"Microsoft.AspNet.Razor": "3.2.2",
15+
"Microsoft.AspNet.Web.Optimization": "1.1.3",
16+
"Microsoft.AspNet.WebPages": "3.2.2",
17+
"Microsoft.jQuery.Unobtrusive.Validation": "3.2.2",
18+
"Microsoft.Web.Infrastructure": "1.0.0.0",
19+
"Modernizr": "2.6.2",
20+
"Newtonsoft.Json": "6.0.4",
21+
"Respond": "1.2.0",
22+
"WebGrease": "1.5.2"
23+
},
24+
"frameworks": {
25+
"net45": {}
26+
},
27+
"runtimes": {
28+
"win": {}
29+
}
3030
}

‎CustomStorage/CustomStorage.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,19 +158,19 @@
158158
</ItemGroup>
159159
<ItemGroup>
160160
<Reference Include="ActiveQueryBuilder.SQLiteMetadataProvider">
161-
<HintPath>..\packages\ActiveQueryBuilder.SQLiteMetadataProvider.3.5.14.1126\lib\net\ActiveQueryBuilder.SQLiteMetadataProvider.dll</HintPath>
161+
<HintPath>..\packages\ActiveQueryBuilder.SQLiteMetadataProvider.3.5.15.1127\lib\net\ActiveQueryBuilder.SQLiteMetadataProvider.dll</HintPath>
162162
</Reference>
163163
<Reference Include="ActiveQueryBuilder.Core">
164-
<HintPath>..\packages\ActiveQueryBuilder.Core.3.5.14.1126\lib\net\ActiveQueryBuilder.Core.dll</HintPath>
164+
<HintPath>..\packages\ActiveQueryBuilder.Core.3.5.15.1127\lib\net\ActiveQueryBuilder.Core.dll</HintPath>
165165
</Reference>
166166
<Reference Include="ActiveQueryBuilder.View">
167-
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.4.3\lib\net\ActiveQueryBuilder.View.dll</HintPath>
167+
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.4.4\lib\net\ActiveQueryBuilder.View.dll</HintPath>
168168
</Reference>
169169
<Reference Include="ActiveQueryBuilder.Web.MVC">
170-
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.4.3\lib\net\ActiveQueryBuilder.Web.MVC.dll</HintPath>
170+
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.4.4\lib\net\ActiveQueryBuilder.Web.MVC.dll</HintPath>
171171
</Reference>
172172
<Reference Include="ActiveQueryBuilder.Web.Server">
173-
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.4.3\lib\net\ActiveQueryBuilder.Web.Server.dll</HintPath>
173+
<HintPath>..\packages\ActiveQueryBuilder.Web.MVC.3.4.4\lib\net\ActiveQueryBuilder.Web.Server.dll</HintPath>
174174
</Reference>
175175
</ItemGroup>
176176
<PropertyGroup>

‎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: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
{
1+
{
22
"dependencies": {
3-
"ActiveQueryBuilder.Core": "3.5.14.1126",
4-
"ActiveQueryBuilder.SQLiteMetadataProvider": "3.5.14.1126",
5-
"ActiveQueryBuilder.OLEDBMetadataProvider": "3.5.14.1126",
6-
"ActiveQueryBuilder.MSSQLMetadataProvider": "3.5.14.1126",
7-
"ActiveQueryBuilder.Web.MVC": "3.4.3",
8-
"Antlr": "3.4.1.9004",
9-
"bootstrap": "3.0.0",
10-
"jQuery": "1.10.2",
11-
"jQuery.Validation": "1.11.1",
12-
"log4net": "2.0.8",
13-
"Microsoft.AspNet.Mvc": "5.2.2",
14-
"Microsoft.AspNet.Razor": "3.2.2",
15-
"Microsoft.AspNet.Web.Optimization": "1.1.3",
16-
"Microsoft.AspNet.WebPages": "3.2.2",
17-
"Microsoft.jQuery.Unobtrusive.Validation": "3.2.2",
18-
"Microsoft.Web.Infrastructure": "1.0.0.0",
19-
"Modernizr": "2.6.2",
20-
"Newtonsoft.Json": "6.0.4",
21-
"Respond": "1.2.0",
22-
"System.Data.SQLite.Core": "1.0.109.0",
23-
"WebGrease": "1.5.2"
24-
},
25-
"frameworks": {
26-
"net45": {}
27-
},
28-
"runtimes": {
29-
"win": {}
30-
}
3+
"ActiveQueryBuilder.Core": "3.5.15.1127",
4+
"ActiveQueryBuilder.SQLiteMetadataProvider": "3.5.15.1127",
5+
"ActiveQueryBuilder.OLEDBMetadataProvider": "3.5.15.1127",
6+
"ActiveQueryBuilder.MSSQLMetadataProvider": "3.5.15.1127",
7+
"ActiveQueryBuilder.Web.MVC": "3.4.4",
8+
"Antlr": "3.4.1.9004",
9+
"bootstrap": "3.0.0",
10+
"jQuery": "1.10.2",
11+
"jQuery.Validation": "1.11.1",
12+
"log4net": "2.0.8",
13+
"Microsoft.AspNet.Mvc": "5.2.2",
14+
"Microsoft.AspNet.Razor": "3.2.2",
15+
"Microsoft.AspNet.Web.Optimization": "1.1.3",
16+
"Microsoft.AspNet.WebPages": "3.2.2",
17+
"Microsoft.jQuery.Unobtrusive.Validation": "3.2.2",
18+
"Microsoft.Web.Infrastructure": "1.0.0.0",
19+
"Modernizr": "2.6.2",
20+
"Newtonsoft.Json": "6.0.4",
21+
"Respond": "1.2.0",
22+
"System.Data.SQLite.Core": "1.0.109.0",
23+
"WebGrease": "1.5.2"
24+
},
25+
"frameworks": {
26+
"net45": {}
27+
},
28+
"runtimes": {
29+
"win": {}
30+
}
3131
}

‎JavaScript/Controllers/ChangeConnectionController.cs‎

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,63 @@
1-
using System.Configuration;
2-
using System.IO;
3-
using System.Web.Mvc;
4-
using ActiveQueryBuilder.Core;
5-
using ActiveQueryBuilder.Web.Server;
6-
7-
namespace JavaScript.Controllers
8-
{
9-
public class ChangeConnectionController: Controller
10-
{
11-
private readonly string _instanceId = "ChangeConnection";
12-
13-
public ChangeConnectionController()
14-
{
15-
if (QueryBuilderStore.Get(_instanceId) == null)
16-
QueryBuilderStore.Create(_instanceId);
17-
}
18-
19-
public ActionResult Index()
20-
{
21-
return View();
22-
}
23-
24-
public void Change(string name)
25-
{
26-
var queryBuilder = QueryBuilderStore.Get(_instanceId);
27-
28-
queryBuilder.SQLQuery.Clear();
29-
queryBuilder.MetadataContainer.Clear();
30-
31-
if (name == "NorthwindXmlMetaData")
32-
SetNorthwindXml(queryBuilder);
33-
else
34-
SetDb2Xml(queryBuilder);
35-
}
36-
37-
private void SetNorthwindXml(QueryBuilder qb)
38-
{
39-
qb.MetadataLoadingOptions.OfflineMode = true;
40-
qb.SyntaxProvider = new MSSQLSyntaxProvider();
41-
42-
// Load MetaData from XML document. File name stored in WEB.CONFIG file in [/configuration/appSettings/Db2XmlMetaData] key
43-
var path = ConfigurationManager.AppSettings["NorthwindXmlMetaData"];
44-
var xml = Path.Combine(Server.MapPath("~"), path);
45-
46-
qb.MetadataContainer.ImportFromXML(xml);
47-
qb.MetadataStructure.Refresh();
48-
}
49-
50-
private void SetDb2Xml(QueryBuilder qb)
51-
{
52-
qb.MetadataLoadingOptions.OfflineMode = true;
53-
qb.SyntaxProvider = new DB2SyntaxProvider();
54-
55-
// Load MetaData from XML document. File name stored in WEB.CONFIG file in [/configuration/appSettings/Db2XmlMetaData] key
56-
var path = ConfigurationManager.AppSettings["Db2XmlMetaData"];
57-
var xml = Path.Combine(Server.MapPath("~"), path);
58-
59-
qb.MetadataContainer.ImportFromXML(xml);
60-
qb.MetadataStructure.Refresh();
61-
}
62-
}
1+
using System.Configuration;
2+
using System.IO;
3+
using System.Web.Mvc;
4+
using ActiveQueryBuilder.Core;
5+
using ActiveQueryBuilder.Web.Server;
6+
7+
namespace JavaScript.Controllers
8+
{
9+
public class ChangeConnectionController: Controller
10+
{
11+
private readonly string _instanceId = "ChangeConnection";
12+
13+
public ChangeConnectionController()
14+
{
15+
if (QueryBuilderStore.Get(_instanceId) == null)
16+
QueryBuilderStore.Create(_instanceId);
17+
}
18+
19+
public ActionResult Index()
20+
{
21+
return View();
22+
}
23+
24+
public void Change(string name)
25+
{
26+
var queryBuilder = QueryBuilderStore.Get(_instanceId);
27+
28+
queryBuilder.SQLQuery.Clear();
29+
queryBuilder.MetadataContainer.Clear();
30+
31+
if (name == "NorthwindXmlMetaData")
32+
SetNorthwindXml(queryBuilder);
33+
else
34+
SetDb2Xml(queryBuilder);
35+
}
36+
37+
private void SetNorthwindXml(QueryBuilder qb)
38+
{
39+
qb.MetadataLoadingOptions.OfflineMode = true;
40+
qb.SyntaxProvider = new MSSQLSyntaxProvider();
41+
42+
// Load MetaData from XML document. File name stored in WEB.CONFIG file in [/configuration/appSettings/Db2XmlMetaData] key
43+
var path = ConfigurationManager.AppSettings["NorthwindXmlMetaData"];
44+
var xml = Path.Combine(Server.MapPath("~"), path);
45+
46+
qb.MetadataContainer.ImportFromXML(xml);
47+
qb.MetadataStructure.Refresh();
48+
}
49+
50+
private void SetDb2Xml(QueryBuilder qb)
51+
{
52+
qb.MetadataLoadingOptions.OfflineMode = true;
53+
qb.SyntaxProvider = new DB2SyntaxProvider();
54+
55+
// Load MetaData from XML document. File name stored in WEB.CONFIG file in [/configuration/appSettings/Db2XmlMetaData] key
56+
var path = ConfigurationManager.AppSettings["Db2XmlMetaData"];
57+
var xml = Path.Combine(Server.MapPath("~"), path);
58+
59+
qb.MetadataContainer.ImportFromXML(xml);
60+
qb.MetadataStructure.Refresh();
61+
}
62+
}
6363
}

0 commit comments

Comments
 (0)