admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2018-12-11 22:25:00 +00:00
parent bb492b6364
commit 1a773e6041
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/AyaNova/Startup.cs
View File

@@ -380,7 +380,7 @@ namespace AyaNova
// ******************** TESTING WIPE DB ***************************** // ******************** TESTING WIPE DB *****************************
// //
//Set this to true to wipe the db and reinstall a trial license and re-seed the data //Set this to true to wipe the db and reinstall a trial license and re-seed the data
var TESTING_REFRESH_DB = true;//############################################################################################# var TESTING_REFRESH_DB = false;//#############################################################################################
#if (DEBUG) #if (DEBUG)
//TESTING //TESTING
@@ -419,7 +419,7 @@ namespace AyaNova
if (TESTING_REFRESH_DB) if (TESTING_REFRESH_DB)
{ {
AyaNova.Core.License.Fetch(apiServerState, dbContext, _log); AyaNova.Core.License.Fetch(apiServerState, dbContext, _log);
Util.Seeder.SeedDatabase(Util.Seeder.SeedLevel.SmallOneManShopTrialDataSet, -8);//############################################################################################# Util.Seeder.SeedDatabase(Util.Seeder.SeedLevel.HugeForLoadTest, -8);//#############################################################################################
} }
//TESTING //TESTING
#endif #endif

6
server/AyaNova/biz/FilterSqlCriteriaBuilder.cs
View File

@@ -40,15 +40,15 @@ namespace AyaNova.Biz
} }
var dataType = filterOptions.Flds.Find(x => x.Fld == fld).Type; var dataType = filterOptions.Flds.Find(x => x.Fld == fld).Type;
sb.Append("(");
sb.Append(DataFilterToColumnCriteria(fld, dataType, opType, val, tagList, userId)); sb.Append(DataFilterToColumnCriteria(fld, dataType, opType, val, tagList, userId));
if (i < FilterArray.Count - 1) if (i < FilterArray.Count - 1)
{ {
sb.Append(" AND "); sb.Append(") AND ");
} }
} }
return " where " + sb.ToString(); return " where " + sb.ToString() + ")";
} }
/// <summary> /// <summary>

4
test/raven-integration/util.cs
View File

@@ -12,8 +12,8 @@ namespace raven_integration
{ {
private static HttpClient client { get; } = new HttpClient(); private static HttpClient client { get; } = new HttpClient();
// private static string API_BASE_URL = "http://localhost:7575/api/v8.0/"; private static string API_BASE_URL = "http://localhost:7575/api/v8.0/";
private static string API_BASE_URL = "https://test.helloayanova.com/api/v8.0/"; //private static string API_BASE_URL = "https://test.helloayanova.com/api/v8.0/";
public static string TEST_DATA_FOLDER = @"..\..\..\testdata\"; public static string TEST_DATA_FOLDER = @"..\..\..\testdata\";