Merge pull request #76 from d4software/develop

Merging Develop

.circleci/config.yml

@@ -2,17 +2,15 @@ version: 2
 jobs:
   build:
     docker:
-      - image: microsoft/aspnetcore-build:2.0-stretch
+      - image: microsoft/dotnet:2.2-sdk-stretch
     steps:
       - checkout
-      - run: npm install less -g
       - run: dotnet build ./Web/QueryTree.csproj -v n
   test:
     docker:
-      - image: microsoft/aspnetcore-build:2.0-stretch
+      - image: microsoft/dotnet:2.2-sdk-stretch
     steps:
       - checkout
-      - run: npm install less -g
       - run: dotnet test ./Tests/Tests.csproj -v n
   docker-publish:
    machine: true
@@ -44,4 +42,4 @@ workflows:
         - docker-publish:
             requires:
               - test
-              - build
+              - build

Dockerfile

@@ -1,12 +1,10 @@
-FROM microsoft/aspnetcore-build:2.0-stretch as builder
+FROM microsoft/dotnet:2.2-sdk-stretch as builder
 WORKDIR /build
 COPY . .
-RUN npm install less -g
 RUN dotnet restore
-RUN dotnet publish -c Release ./Web/QueryTree.csproj -o /dist
+RUN dotnet publish --no-restore -c Release ./Web/QueryTree.csproj -o /dist
 
-
-FROM microsoft/aspnetcore:2.0-stretch as runtime
+FROM microsoft/dotnet:2.2-aspnetcore-runtime as runtime
 WORKDIR /app
 COPY --from=builder /dist .
 COPY ./Web/EmailTemplates ./EmailTemplates

Engine/Engine.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

Engine/NodeBase.cs

@@ -217,13 +217,6 @@ public string GetFetchDataQuery(int? startRow = null, int? rowCount = null)
         {
             var query = new StringBuilder();
 
-            if (DatabaseType == DatabaseType.SQLServer || DatabaseType == DatabaseType.PostgreSQL)
-            {
-                IList<NodeBase> nodes = new List<NodeBase>();
-                FetchOrderedDependencies(nodes);
-                query.Append(BuildWithSql(nodes));
-            }
-
             if (DatabaseType == DatabaseType.MySQL)
             {
                 query.AppendFormat("SELECT {0} FROM ({1} ORDER BY {2}) AS results",
@@ -238,6 +231,10 @@ public string GetFetchDataQuery(int? startRow = null, int? rowCount = null)
             }
             else if (DatabaseType == DatabaseType.SQLServer || DatabaseType == DatabaseType.PostgreSQL)
             {
+                IList<NodeBase> nodes = new List<NodeBase>();
+                FetchOrderedDependencies(nodes);
+                query.Append(BuildWithSql(nodes));
+
                 if (startRow.HasValue && rowCount.HasValue)
                 {
                     // In order for this to work, we will need a ROW_NUMBER column in the CTE, which we

README.md

@@ -19,7 +19,7 @@ Supports customization of the logo image, system name and CSS used
 within the app.
 
 Can use either Sqlite or Microsoft SQL Server database for it's own user
-and reports data storage. 
+and reports data storage.
 
 Database and SSH passwords are stored in its database in encryped form, 
 using AES encryption. Users may provide their own key file, or let the
@@ -42,67 +42,56 @@ for more information.
 - [Running the Tests](#running-the-tests)
 - [Running with Docker](/docs/docker.md)
 
-### Running from Source
-
-To run QueryTree from it's source code, you need the [.NET Core SDK](https://www.microsoft.com/net/download) and [NPM](https://nodejs.org/) installed. 
+### Prerequisites
 
-You will need to install the Less.js compiler using NPM:
+To build binaries or run from source you need the [.NET Core SDK v2.2](https://www.microsoft.com/net/download) installed.
 
-```
-npm install less -g
-```
+### Running from Source
 
-Then follow these steps:
+Check you have the prerequisites installed, then follow these steps:
 
 1. Clone this repo into a folder
 
 2. At the command prompt, cd into the folder, then into the "Web" folder.
 
 3. Type:
- 
+
 ```sh
 dotnet run
 ```
-
-4. Visit [http://localhost:5000/](http://localhost:5000/) in your browser. You should see the QueryTree application. *Dotnet may decide to run it on a different port if 5000 is not available, check your terminal output.
 
-If you would like to run QueryTree with your own local development settings, you can add a Web/usersettings.json file containing a modified copy of appsettings.json. Settings in this file will override appsettings.json. However, this file will be ignored by git.
+4. Dotnet should report that the applicaiton is running, e.g.
 
-### Building Binaries
+```sh
+Now listening on: http://localhost:54182
+Application started. Press Ctrl+C to shut down.
+```
 
-You may need to build a release binary to be run with the [.NET Core 2.0.x runtime](https://www.microsoft.com/net/download/core#/runtime). These binaries can be used on systems without the full .NET Core SDK. To build the initial binaries you need the [.NET Core SDK](https://www.microsoft.com/net/download) and [NPM](https://nodejs.org/) installed.
+Visit the URL shown in your browser. You should see the QueryTree application.
 
-You will need to install the Less.js compiler using NPM:
+If you would like to run QueryTree with your own local development settings, you can add a Web/usersettings.json file containing a modified copy of appsettings.json. Settings in this file will override appsettings.json. However, this file will be ignored by git.
 
-```
-npm install less -g
-```
+### Building Binaries
 
 To build a release binary from the project root execute:
 
-```
+```sh
 dotnet publish -c Release ./Web/QueryTree.csproj -o ./dist
 ```
 
 This will create a release folder in `dist` of all the unpacked QueryTree binaries and its dependencies.
 
-
 ### Running from Binaries
 
-QueryTree is built using .NET Core. To run QueryTree on your server
-you will need to install the .NET Core 2.0.x runtime. You can download
-the installer [here](https://www.microsoft.com/net/download/core#/run).
+To run QueryTree on your server you will need to install the .NET Core 2.2.x runtime. (It is not necessary to install the full .NET SDK, just the runtime.) You can download the installer [here](https://www.microsoft.com/net/download/core#/runtime).
 
-To verify that you have the .NET runtime installed, open a terminal/cmd
-window and type
+To verify that you have the .NET runtime installed, open a terminal/cmd window and type
 
-```
+```sh
 dotnet --version
 ```
 
 If the command returns a version number, you're ready to run QueryTree.
-If not, please visit [https://www.microsoft.com/net/download/core#/runtime](https://www.microsoft.com/net/download/core#/runtime)
-and follow the instructions for your platform.
 
 Once the dotnet runtime is installed, follow these steps:
 
@@ -112,11 +101,18 @@ Once the dotnet runtime is installed, follow these steps:
 
 3. At the command prompt, type:
 
-```
+```sh
 dotnet QueryTree.dll
 ```
 
-4. Visit [http://localhost:5000/](http://localhost:5000/) in your browser. You should see the QueryTree application.
+4. Dotnet should report that the applicaiton is running, e.g.
+
+```sh
+Now listening on: http://localhost:5000
+Application started. Press Ctrl+C to shut down.
+```
+
+Visit the URL shown in your browser. You should see the QueryTree application. 
 
 5. For use in production environments, QueryTree should be run behind a reverse proxy such as nginx. For more information on hosting QueryTree using nginx see: https://docs.microsoft.com/en-us/aspnet/core/publishing/linuxproduction
 
@@ -125,9 +121,10 @@ in IIS see: https://docs.microsoft.com/en-us/aspnet/core/publishing/iis
 
 ### Running the Tests
 
-To run the automated tests in this project, cd into the "Tests" folder, then type:
+To run the automated tests in this project, from the project root folder, type the following:
 
-```
+```sh
+cd Tests
 dotnet test
 ```
 
@@ -137,82 +134,63 @@ See the full Docker guide: [docs/docker.md](/docs/docker.md)
 
 ## Getting Started
 
-1. When first run, QueryTree will have no users and no database connections. Visiting
-app, you will be presented with a login page:
+1. When first run, QueryTree will have no users and no database connections. Visiting app, you will be presented with a login page:
 
 ![The QueryTree login page](http://querytreeapp.com/img/screenshots/querytree-login.png "The QueryTree login page")
 
 2. Click the "Sign up as a new user" button, and enter your details to create a new account.
 
 ![The QueryTree signup page](http://querytreeapp.com/img/screenshots/querytree-signup.png "The QueryTree signup page")
 
-3. Having signed in, you won't have any database connections configured. The system
-will ask you whether you want to set up a connection yourself, or invite another user
-who might be able to do it for you.
+3. Having signed in, you won't have any database connections configured. The system will ask you whether you want to set up a connection yourself, or invite another user who might be able to do it for you.
 
 ![The QueryTree onboard page](http://querytreeapp.com/img/screenshots/querytree-onboarding.png "The QueryTree onboarding page")
 
-4. Assuming you have a database that you can connect to, select the "+ Connect Database" 
-option. You will see the Create Connection page:
+4. Assuming you have a database that you can connect to, select the "+ Connect Database" option. You will see the Create Connection page:
 
 ![The QueryTree create connection page](http://querytreeapp.com/img/screenshots/querytree-create-connection.png "The QueryTree create connection page")
 
-Once all the information is entered, you can check the connection by pressing the
-"Test Connection" button. If the system reports that the conneciton is working,
-press "Save".
+Once all the information is entered, you can check the connection by pressing the "Test Connection" button. If the system reports that the conneciton is working, press "Save".
 
 ![The QueryTree test connection feature](http://querytreeapp.com/img/screenshots/querytree-test-connection.png "The QueryTree test connection feature")
 
-5. You will be taken to the reports list for this connection, but there won't be
-any reports yet.
+5. You will be taken to the reports list for this connection, but there won't be any reports yet.
 
 ![The QueryTree reports page](http://querytreeapp.com/img/screenshots/querytree-reports-empty.png "The QueryTree reports page")
 
 6. Click on "+ Create Report". You will be taken to the defualt report builder
 
-7. All reports start by picking a datbase table to start from. From there
-the report builder will prompt you to select any related tables that it can
-join to. For example, in this screenshot, I have selected the "orders" table
-and QueryTree is prompting me to join the "users" table. QueryTree can see
-that "orders" has a link to "users" so it offers to join the tables.
+7. All reports start by picking a datbase table to start from. From there the report builder will prompt you to select any related tables that it can join to. For example, in this screenshot, I have selected the "orders" table and QueryTree is prompting me to join the "users" table. QueryTree can see that "orders" has a link to "users" so it offers to join the tables.
 
 ![The QueryTree create report page](http://querytreeapp.com/img/screenshots/querytree-create-report-orders.png "The QueryTree create report page")
 
-For more information on how to help QueryTree automatically join between tables
-in your database see [QueryTree's Auto Join feature](/docs/autojoin.md)
+For more information on how to help QueryTree automatically join between tables in your database see [QueryTree's Auto Join feature](/docs/autojoin.md)
 
-8. Having selected a starting table, and any relevant related tables, click Next.
-The filter panel will open and you will be prompted to add one or more Filters.
+8. Having selected a starting table, and any relevant related tables, click Next. The filter panel will open and you will be prompted to add one or more Filters.
 
 ![The QueryTree report filter panel](http://querytreeapp.com/img/screenshots/querytree-report-filter.png "The QueryTree report filter panel")
 
-9. Once you are happy with the filters, you have the option to summarize the data
-that is being shown in the results panel. Summerizing the data can mean totaling, 
-averaging, counting or finding the minimum/maximum values, for one or more columns.
-You can do this for all the data, or for different groups of values. For example, 
-you could find the average value of the orders, for each country.
+9. Once you are happy with the filters, you have the option to summarize the data that is being shown in the results panel. summerizing the data can mean totaling, averaging, counting or finding the minimum/maximum values, for one or more columns. You can do this for all the data, or for different groups of values. For example, you could find the average value of the orders, for each country.
 
 ![The QueryTree report summerize panel](http://querytreeapp.com/img/screenshots/querytree-report-summerize.png "The QueryTree report summerize panel")
 
-10. Finally, you have the option of generating a chart from the data in the results
-panel.
+10. Finally, you have the option of generating a chart from the data in the results panel.
 
 ![The QueryTree report chart panel](http://querytreeapp.com/img/screenshots/querytree-report-chart.png "The QueryTree report chart panel")
 
-11. Once you are happy with your report, save it by clicking the Save button. You
-will be returned to the list of reports for this connection.
+11. Once you are happy with your report, save it by clicking the Save button. You will be returned to the list of reports for this connection.
 
 ## Other Guides
 
-  * [Scheduling Reports](/docs/scheduling.md)
- * [Sharing Individual Reports](/docs/sharing.md)
- * [Team Management](/docs/teams.md)
- * [The Advanced Query Builder](/docs/advanced.md)
- * [Auto Join](/docs/autojoin.md)
- * [Customizing QueryTree](/docs/customizing.md)
- * [Building a password manager](/docs/password-manager.md)
- * [Using with Docker](/docs/docker.md)
- * [Configuring Email](/docs/mail.md)
+- [Scheduling Reports](/docs/scheduling.md)
+- [Sharing Individual Reports](/docs/sharing.md)
+- [Team Management](/docs/teams.md)
+- [The Advanced Query Builder](/docs/advanced.md)
+- [Auto Join](/docs/autojoin.md)
+- [Customizing QueryTree](/docs/customizing.md)
+- [Building a password manager](/docs/password-manager.md)
+- [Using with Docker](/docs/docker.md)
+- [Configuring Email](/docs/mail.md)
 
 ## License
 

Tests/Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>