You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ma...@apache.org on 2019/03/11 19:36:01 UTC

[atlas] branch branch-1.0 updated: ATLAS-3065: fix incorrect name (rename typeDefOptions to options) in merged models for Hive and RDBMS

This is an automated email from the ASF dual-hosted git repository.

madhan pushed a commit to branch branch-1.0
in repository https://gitbox.apache.org/repos/asf/atlas.git


The following commit(s) were added to refs/heads/branch-1.0 by this push:
     new 7e0b577  ATLAS-3065: fix incorrect name (rename typeDefOptions to options) in merged models for Hive and RDBMS
7e0b577 is described below

commit 7e0b5776362edb61ee1b05b08876cb9ede318ab1
Author: Madhan Neethiraj <ma...@apache.org>
AuthorDate: Mon Mar 11 12:35:10 2019 -0700

    ATLAS-3065: fix incorrect name (rename typeDefOptions to options) in merged models for Hive and RDBMS
    
    (cherry picked from commit 0f79c344adc6d56e509c486e384dd380180e6cf0)
---
 addons/models/1000-Hadoop/1030-hive_model.json | 4 ++--
 addons/models/2000-RDBMS/2010-rdbms_model.json | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/models/1000-Hadoop/1030-hive_model.json b/addons/models/1000-Hadoop/1030-hive_model.json
index 872abc3..324d716 100644
--- a/addons/models/1000-Hadoop/1030-hive_model.json
+++ b/addons/models/1000-Hadoop/1030-hive_model.json
@@ -176,7 +176,7 @@
             ],
             "serviceType": "hive",
             "typeVersion": "1.1",
-            "typeDefOptions": {
+            "options": {
               "schemaElementsAttribute": "columns"
             },
             "attributeDefs": [
@@ -402,7 +402,7 @@
             ],
             "serviceType": "hive",
             "typeVersion": "1.3",
-            "typeDefOptions": {
+            "options": {
               "schemaAttributes": "[\"name\", \"description\", \"owner\", \"type\", \"comment\", \"position\"]"
             },
             "attributeDefs": [
diff --git a/addons/models/2000-RDBMS/2010-rdbms_model.json b/addons/models/2000-RDBMS/2010-rdbms_model.json
index fb2aa44..81f0545 100644
--- a/addons/models/2000-RDBMS/2010-rdbms_model.json
+++ b/addons/models/2000-RDBMS/2010-rdbms_model.json
@@ -149,7 +149,7 @@
             "superTypes": ["DataSet"],
             "serviceType": "rdbms",
             "typeVersion": "1.2",
-            "typeDefOptions": {
+            "options": {
               "schemaElementsAttribute": "columns"
             },
             "attributeDefs": [
@@ -258,7 +258,7 @@
             "superTypes": ["DataSet"],
             "serviceType": "rdbms",
             "typeVersion": "1.2",
-            "typeDefOptions": {
+            "options": {
               "schemaAttributes": "[\"name\", \"description\", \"owner\", \"data_type\", \"comment\", \" isPrimaryKey\", \" isNullable\"]"
             },
             "attributeDefs": [