ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bump guh version and add a more specific rule error

Browse Source
This commit is contained in:
Simon Stürz 2015-03-16 09:55:17 +01:00 committed by Michael Zanetti
parent 90622e5edb
commit f0d7fbd3f5
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
guh (0.3.0) utopic; urgency=medium
* update rule engine and many other small changes
-- Simon Stürz <simon.stuerz@guh.guru> Mon, 16 Mar 2015 09:52:40 +0100
guh (0.2.0) UNRELEASED; urgency=medium guh (0.2.0) UNRELEASED; urgency=medium
* split plugins into dynamic libs and packages * split plugins into dynamic libs and packages

2
server/jsonrpc/jsonrpcserver.cpp
View File

@ -44,7 +44,7 @@
#include <QJsonDocument> #include <QJsonDocument>
#include <QStringList> #include <QStringList>
#define JSON_PROTOCOL_VERSION 18 #define JSON_PROTOCOL_VERSION 19
JsonRPCServer::JsonRPCServer(QObject *parent): JsonRPCServer::JsonRPCServer(QObject *parent):
JsonHandler(parent), JsonHandler(parent),

2
server/jsonrpc/ruleshandler.cpp
View File

@ -203,7 +203,7 @@ JsonReply* RulesHandler::AddRule(const QVariantMap &params)
if (eventParamType != actionParamType) { if (eventParamType != actionParamType) {
QVariantMap returns; QVariantMap returns;
qWarning() << "RuleActionParam" << ruleActionParam.name() << " and given event param have not the same type."; qWarning() << "RuleActionParam" << ruleActionParam.name() << " and given event param have not the same type.";
returns.insert("ruleError", JsonTypes::ruleErrorToString(RuleEngine::RuleErrorInvalidRuleActionParameter)); returns.insert("ruleError", JsonTypes::ruleErrorToString(RuleEngine::RuleErrorTypesNotMatching));
return createReply(returns); return createReply(returns);
} }
} }

3
server/ruleengine.h
View File

@ -43,7 +43,8 @@ public:
RuleErrorInvalidParameter, RuleErrorInvalidParameter,
RuleErrorInvalidRuleFormat, RuleErrorInvalidRuleFormat,
RuleErrorMissingParameter, RuleErrorMissingParameter,
RuleErrorInvalidRuleActionParameter RuleErrorInvalidRuleActionParameter,
RuleErrorTypesNotMatching
}; };
enum RemovePolicy { enum RemovePolicy {

5
tests/auto/api.json
View File

@ -1,4 +1,4 @@
18 19
{ {
"methods": { "methods": {
"Actions.ExecuteAction": { "Actions.ExecuteAction": {
@ -608,7 +608,8 @@
"RuleErrorInvalidParameter", "RuleErrorInvalidParameter",
"RuleErrorInvalidRuleFormat", "RuleErrorInvalidRuleFormat",
"RuleErrorMissingParameter", "RuleErrorMissingParameter",
"RuleErrorInvalidRuleActionParameter" "RuleErrorInvalidRuleActionParameter",
"RuleErrorTypesNotMatching"
], ],
"SetupMethod": [ "SetupMethod": [
"SetupMethodJustAdd", "SetupMethodJustAdd",