Skip to content
Snippets Groups Projects
Verified Commit cfbc140c authored by Timm Fitschen's avatar Timm Fitschen
Browse files

Update proto again

parent 37f6ba2d
No related branches found
No related tags found
3 merge requests!44Release 0.6,!43Merge f-GRPC-main to dev,!42DEPS: Update proto and fix breaking changes
caosdb-proto @ 9fa41dce
Subproject commit fe58edacdedd2fa9992c103e18d4ae4875798a2c Subproject commit 9fa41dce325d370eb8da60a77e921d4a0618f513
...@@ -52,6 +52,7 @@ public class Message extends Exception implements Comparable<Message>, ToElement ...@@ -52,6 +52,7 @@ public class Message extends Exception implements Comparable<Message>, ToElement
legacy_codes_mapping.put(ServerMessages.REFERENCED_ENTITY_DOES_NOT_EXIST.coreToString(), "235"); legacy_codes_mapping.put(ServerMessages.REFERENCED_ENTITY_DOES_NOT_EXIST.coreToString(), "235");
legacy_codes_mapping.put(ServerMessages.AUTHORIZATION_ERROR.coreToString(), "403"); legacy_codes_mapping.put(ServerMessages.AUTHORIZATION_ERROR.coreToString(), "403");
legacy_codes_mapping.put(ServerMessages.ROLE_DOES_NOT_EXIST.coreToString(), "1104"); legacy_codes_mapping.put(ServerMessages.ROLE_DOES_NOT_EXIST.coreToString(), "1104");
legacy_codes_mapping.put(ServerMessages.ENTITY_NAME_DUPLICATES.coreToString(), "0");
} }
private static final long serialVersionUID = 1837110172902899264L; private static final long serialVersionUID = 1837110172902899264L;
......
...@@ -22,8 +22,10 @@ ...@@ -22,8 +22,10 @@
*/ */
package org.caosdb.server.jobs.core; package org.caosdb.server.jobs.core;
import org.caosdb.api.entity.v1.MessageCode;
import org.caosdb.server.entity.EntityInterface; import org.caosdb.server.entity.EntityInterface;
import org.caosdb.server.entity.Message; import org.caosdb.server.entity.Message;
import org.caosdb.server.entity.Message.MessageType;
import org.caosdb.server.jobs.FlagJob; import org.caosdb.server.jobs.FlagJob;
import org.caosdb.server.jobs.JobAnnotation; import org.caosdb.server.jobs.JobAnnotation;
import org.caosdb.server.jobs.TransactionStage; import org.caosdb.server.jobs.TransactionStage;
...@@ -50,7 +52,7 @@ public class ExecuteQuery extends FlagJob { ...@@ -50,7 +52,7 @@ public class ExecuteQuery extends FlagJob {
} catch (final UnsupportedOperationException e) { } catch (final UnsupportedOperationException e) {
getContainer().addMessage(ServerMessages.QUERY_EXCEPTION); getContainer().addMessage(ServerMessages.QUERY_EXCEPTION);
getContainer().setStatus(EntityStatus.UNQUALIFIED); getContainer().setStatus(EntityStatus.UNQUALIFIED);
getContainer().addMessage(new Message(e.getMessage())); getContainer().addMessage(new Message(MessageType.Info, (MessageCode) null, e.getMessage()));
} }
getContainer().addMessage(queryInstance); getContainer().addMessage(queryInstance);
if (queryInstance.getQuery().getType() == Type.COUNT) { if (queryInstance.getQuery().getType() == Type.COUNT) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment