wip

Author: Yingjian Wu

metacat-common-server/src/main/java/com/netflix/metacat/common/server/usermetadata/MetadataSqlInterceptor.java

@@ -15,9 +15,10 @@ public interface MetadataSqlInterceptor {
      * Intercept the definition metadata sql update statement into the db.
      * @param sql base sql statement
      * @param name qualifiedName
+     * @param existingMetadata existingMetadata
      * @return the modified sql string
      */
-    String interceptSQL(String sql, QualifiedName name);
+    String interceptSQL(String sql, QualifiedName name, ObjectNode existingMetadata);
 
     /**
      * Intercept the newMetadata during write.

metacat-common-server/src/main/java/com/netflix/metacat/common/server/usermetadata/MetadataSqlInterceptorImpl.java

@@ -11,7 +11,7 @@
  */
 public class MetadataSqlInterceptorImpl implements MetadataSqlInterceptor {
     @Override
-    public String interceptSQL(final String sql, final QualifiedName name) {
+    public String interceptSQL(final String sql, final QualifiedName name, final ObjectNode existingMetadata) {
         return sql;
     }
 

metacat-metadata-mysql/src/main/java/com/netflix/metacat/metadata/mysql/MysqlUserMetadataService.java

@@ -607,7 +607,7 @@ public void saveDefinitionMetadata(
                 // add additional where clause into the sql query to make sure when we write
                 // the merged result, the existing metadata we use in metadataPreMergeInterceptor
                 // for validation has not changed
-                query = metadataSqlInterceptor.interceptSQL(SQL.UPDATE_DEFINITION_METADATA, name);
+                query = metadataSqlInterceptor.interceptSQL(SQL.UPDATE_DEFINITION_METADATA, name, existingData.get());
             }
             count = executeUpdateForKey(
                 query,