fixed bug on graph read only validation, issue #7144

orientechnologies · Feb 13, 2017 · 48db6e5 · 48db6e5
1 parent 2d5bcdf
commit 48db6e5
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/...rc/main/java/com/orientechnologies/orient/core/db/document/ODatabaseDocumentAbstract.java b/...rc/main/java/com/orientechnologies/orient/core/db/document/ODatabaseDocumentAbstract.java
@@ -2410,9 +2410,8 @@ public <RET extends ORecord> RET save(ORecord iRecord, String iClusterName, fina
 
     ODocument doc = (ODocument) iRecord;
     ODocumentInternal.checkClass(doc, this);
-    if (!getTransaction().isActive() && !getStorage().isRemote())
-      // EXECUTE VALIDATION ONLY IF NOT IN TX
-      doc.validate();
+    //  IN TX THE VALIDATION MAY BE RUN TWICE BUT IS CORRECT BECAUSE OF DIFFERENT RECORD STATUS
+    doc.validate();
     ODocumentInternal.convertAllMultiValuesToTrackedVersions(doc);
 
     if (iForceCreate || !doc.getIdentity().isValid()) {

diff --git a/graphdb/src/test/java/com/orientechnologies/orient/graph/blueprints/GraphValidationTest.java b/graphdb/src/test/java/com/orientechnologies/orient/graph/blueprints/GraphValidationTest.java
@@ -18,6 +18,7 @@
 
 package com.orientechnologies.orient.graph.blueprints;
 
+import com.orientechnologies.orient.core.metadata.schema.OProperty;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -182,4 +183,29 @@ private void setupSchema() {
       graphNoTx.shutdown();
     }
   }
+
+  @Test(expected = OValidationException.class)
+  public void testPropertyReadOnly() {
+    OrientGraphNoTx graphNoTx = new OrientGraphNoTx(URL);
+    OrientVertexType testType = graphNoTx.createVertexType("Test");
+    OProperty prop;
+    prop = testType.createProperty("name", OType.STRING).setReadonly(true);
+    graphNoTx.shutdown();
+
+    Assert.assertTrue(prop.isReadonly()); //this one passes
+
+    OrientGraph graph = new OrientGraph(URL);
+    try {
+      OrientVertex vert1 = graph.addVertex("class:Test", "name", "Sam");
+      graph.commit();
+
+      vert1.setProperty("name", "Ben"); //should throw an exception
+      graph.commit();
+
+      Assert.assertEquals(vert1.getProperty("name"), "Sam");  //fails
+    } finally {
+      graph.drop();
+    }
+  }
+
 }
diff --git a/...test/java/com/orientechnologies/orient/test/database/auto/CRUDDocumentValidationTest.java b/...test/java/com/orientechnologies/orient/test/database/auto/CRUDDocumentValidationTest.java
@@ -197,13 +197,15 @@ public void validationDisabledAdDatabaseLevel() throws ParseException {
     }
 
     database.command(new OCommandSQL("ALTER DATABASE " + ODatabase.ATTRIBUTES.VALIDATION.name() + " FALSE")).execute();
+    database.setValidationEnabled(false);
     try {
 
       ODocument doc = new ODocument("MyTestClass");
       doc.save();
 
       doc.delete();
     } finally {
+      database.setValidationEnabled(true);
       database.command(new OCommandSQL("ALTER DATABASE " + ODatabase.ATTRIBUTES.VALIDATION.name() + " TRUE")).execute();
     }
   }