Merge branch 'master' into develop

Author: d4nt

Dockerfile

@@ -7,7 +7,7 @@ RUN dotnet publish --no-restore -c Release ./Web/QueryTree.csproj -o /dist
 FROM microsoft/dotnet:2.2-aspnetcore-runtime as runtime
 WORKDIR /app
 COPY --from=builder /dist .
-COPY ./Web/EmailTemplates ./EmailTemplates
+COPY --from=builder /build/Web/EmailTemplates ./EmailTemplates
 VOLUME /var/lib/querytree
 ENV ConnectionStrings__DefaultConnection="Filename=/var/lib/querytree/querytree.db;"
 ENV Passwords__Keyfile="/var/lib/querytree/querytree.key"

Engine/NodeBase.cs

@@ -91,7 +91,7 @@ protected bool IsNumberType(string colType)
 
         protected bool IsTextType(string colType)
         {
-            var quotedTypes = new List<string>() { "VARCHAR", "NVARCHAR", "CHAR", "NCHAR", "ENUM", "XML", "CHARACTER VARYING", "CHARACTER", "TEXT", "USER-DEFINED" };
+            var quotedTypes = new List<string>() { "VARCHAR", "NVARCHAR", "CHAR", "NCHAR", "ENUM", "XML", "CHARACTER VARYING", "CHARACTER", "TEXT", "USER-DEFINED", "LONGTEXT" };
 
             switch (DatabaseType)
             {

Web/Managers/DbManager.cs

@@ -12,6 +12,7 @@
 using Microsoft.Extensions.Caching.Memory;
 using QueryTree.Enums;
 using QueryTree.ViewModels;
+using System.Text.RegularExpressions;
 
 
 namespace QueryTree.Managers
@@ -648,6 +649,14 @@ public static DbCommand CreateCommand(DatabaseType type, DbConnection conn, stri
             return cmd;
         }
 
+        // Sometimes DbDataReader.GetDataTypeName returns a length specifier, which isn't useful
+        // to QueryTree, is different to the GetDbModel data and breaks things. This removes it
+        private string RemoveLengthSpecifier(string databaseType)
+        {
+            var re = new Regex("\\([0-9]*\\)$");
+            return re.Replace(databaseType, "");
+        }
+
         public QueryResponse GetData(DatabaseConnection connection, string nodes, string nodeId, int? startRow, int? rowCount)
         {
             var data = new QueryResponse() { Status = "ok" };
@@ -671,7 +680,7 @@ public QueryResponse GetData(DatabaseConnection connection, string nodes, string
                         for (int i = 0; i < reader.FieldCount; i++)
                         {
                             data.Columns.Add(reader.GetName(i));
-                            data.ColumnTypes.Add(reader.GetDataTypeName(i));
+                            data.ColumnTypes.Add(RemoveLengthSpecifier(reader.GetDataTypeName(i)));
                         }
 
                         while (reader.Read())

Web/Scripts/tools.js

@@ -367,6 +367,7 @@ tools.IsTextType = function (theType) {
         case "CHARACTER VARYING":
         case "CHARACTER":
         case "TEXT":
+        case "LONGTEXT":
         case "USER-DEFINED": // Treat any user defined columns as text
             return true;
         default:

docs/customizing.md

@@ -11,6 +11,7 @@ The [appsettings.json](/Web/appsettings.json) file contains a section titled “
    "ExtraCSS": "",
    "AllowAdvancedQuery": false,
    "DataStore": "Sqlite",
+   "BaseUri": "",
    "AuthenticationMode": "Forms"
  }
 ```
@@ -22,4 +23,5 @@ The following section details what each of the settings do:
 * *ExtraCSS*: points to a .css file that will be referenced by all the QueryTree pages, after it’s own CSS. This file does not necessarily need to be located inside QueryTree’s wwwroot folder. It could potentially be hosted at a different domain.
 * *AllowAdvancedQuery*: indicated whether users will be given the option to use the advanced query builder. See [here](/docs/advanced.md) for more information.
 * *DataStore*: Controls what kind of database QueryTree will store it's configuration data in. Valid options are 'MSSqlServer' or 'Sqlite'. The contents of the ConnectionString setting in the [appsettings.json](/Web/appsettings.json) should be set to an appropriate connection string for this database type.
+* *BaseUri*: If you want to run QueryTree from a subfolder on your webserver, e.g. http://my.app.com/reports/, the BaseUri setting should be used to tell QueryTree what location it is running from, e.g. "/reports".
 * *AuthenticationMode*: Valid options are "Forms" or "Windows". The default value is "Forms". "Forms" means that users will see "sign up", "sign in" and "sign out" pages. If "Windows" is enabled, those pages will be hidden and users will be automatically signed in using their Windows accounts. This option will only work for Windows clients, and when QueryTree is hosted using IIS, with "Windows Authentication" enabled and "Anonymous Authentication" disabled. See [https://docs.microsoft.com/en-us/iis/configuration/system.webserver/security/authentication/windowsauthentication/]() for more information on configuring IIS.