You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by kb...@apache.org on 2019/02/21 10:15:26 UTC

[atlas] branch master updated: ATLAS-2949 : Remove duplicate attribute from the rdbms entity

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

kbhatt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/atlas.git


The following commit(s) were added to refs/heads/master by this push:
     new 74b32a1  ATLAS-2949 : Remove duplicate attribute from the rdbms entity
74b32a1 is described below

commit 74b32a17f1b2449c841da3eaf482b6272ffcc6d7
Author: Binit <bi...@gmail.com>
AuthorDate: Mon Jan 14 12:00:15 2019 +0530

    ATLAS-2949 : Remove duplicate attribute from the rdbms entity
    
    Signed-off-by: kevalbhatt <kb...@apache.org>
---
 addons/models/2000-RDBMS/2010-rdbms_model.json     | 24 +++++++++++-----------
 .../001-rdbms_column_table_add_options.json        |  8 ++++----
 .../patches/002-rdbms_model_add_service_type.json  | 24 +++++++++++-----------
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/addons/models/2000-RDBMS/2010-rdbms_model.json b/addons/models/2000-RDBMS/2010-rdbms_model.json
index 8fe185d..386446c 100644
--- a/addons/models/2000-RDBMS/2010-rdbms_model.json
+++ b/addons/models/2000-RDBMS/2010-rdbms_model.json
@@ -6,9 +6,9 @@
         {
             "name": "rdbms_instance",
             "description": "Instance that the rdbms server is running on",
-            "superTypes": ["DataSet", "Asset"],
+            "superTypes": ["DataSet"],
             "serviceType": "rdbms",
-            "typeVersion": "1.0",
+            "typeVersion": "1.1",
             "attributeDefs": [
                 {
                     "name": "rdbms_type",
@@ -92,9 +92,9 @@
         {
             "name": "rdbms_db",
             "description": "a database (schema) in an rdbms",
-            "superTypes": ["DataSet", "Asset"],
+            "superTypes": ["DataSet"],
             "serviceType": "rdbms",
-            "typeVersion": "1.0",
+            "typeVersion": "1.1",
             "attributeDefs": [
                 {
                     "name": "prodOrOther",
@@ -146,9 +146,9 @@
         {
             "name": "rdbms_table",
             "description": "a table in an rdbms database (schema)",
-            "superTypes": ["DataSet", "Asset"],
+            "superTypes": ["DataSet"],
             "serviceType": "rdbms",
-            "typeVersion": "1.0",
+            "typeVersion": "1.1",
             "attributeDefs": [
                 {
                     "name": "db",
@@ -252,9 +252,9 @@
         {
             "name": "rdbms_column",
             "description": "a column in an rdbms table",
-            "superTypes": ["DataSet", "Asset"],
+            "superTypes": ["DataSet"],
             "serviceType": "rdbms",
-            "typeVersion": "1.0",
+            "typeVersion": "1.1",
             "attributeDefs": [
                 {
                     "name": "data_type",
@@ -325,9 +325,9 @@
         {
             "name": "rdbms_index",
             "description": "An index on an RDBMS table",
-            "superTypes": ["DataSet", "Asset"],
+            "superTypes": ["DataSet"],
             "serviceType": "rdbms",
-            "typeVersion": "1.0",
+            "typeVersion": "1.1",
             "attributeDefs": [
                 {
                     "name": "table",
@@ -382,9 +382,9 @@
         {
             "name": "rdbms_foreign_key",
             "description": null,
-            "superTypes": ["DataSet", "Asset"],
+            "superTypes": ["DataSet"],
             "serviceType": "rdbms",
-            "typeVersion": "1.0",
+            "typeVersion": "1.1",
             "attributeDefs": [
                 {
                     "name": "table",
diff --git a/addons/models/2000-RDBMS/patches/001-rdbms_column_table_add_options.json b/addons/models/2000-RDBMS/patches/001-rdbms_column_table_add_options.json
index 202fade..675b0fd 100644
--- a/addons/models/2000-RDBMS/patches/001-rdbms_column_table_add_options.json
+++ b/addons/models/2000-RDBMS/patches/001-rdbms_column_table_add_options.json
@@ -3,8 +3,8 @@
     {
       "action": "UPDATE_TYPEDEF_OPTIONS",
       "typeName": "rdbms_column",
-      "applyToVersion": "1.0",
-      "updateToVersion": "1.1",
+      "applyToVersion": "1.1",
+      "updateToVersion": "1.2",
       "typeDefOptions": {
         "schemaAttributes": "[\"name\", \"description\", \"owner\", \"data_type\", \"comment\", \" isPrimaryKey\", \" isNullable\"]"
       }
@@ -12,8 +12,8 @@
     {
       "action": "UPDATE_TYPEDEF_OPTIONS",
       "typeName": "rdbms_table",
-      "applyToVersion": "1.0",
-      "updateToVersion": "1.1",
+      "applyToVersion": "1.1",
+      "updateToVersion": "1.2",
       "typeDefOptions": {
         "schemaElementsAttribute": "columns"
       }
diff --git a/addons/models/2000-RDBMS/patches/002-rdbms_model_add_service_type.json b/addons/models/2000-RDBMS/patches/002-rdbms_model_add_service_type.json
index 6a153e4..c0ce143 100644
--- a/addons/models/2000-RDBMS/patches/002-rdbms_model_add_service_type.json
+++ b/addons/models/2000-RDBMS/patches/002-rdbms_model_add_service_type.json
@@ -3,43 +3,43 @@
     {
       "action":          "SET_SERVICE_TYPE",
       "typeName":        "rdbms_instance",
-      "applyToVersion":  "1.0",
-      "updateToVersion": "1.1",
+      "applyToVersion":  "1.1",
+      "updateToVersion": "1.2",
       "serviceType":     "rdbms"
     },
     {
       "action":          "SET_SERVICE_TYPE",
       "typeName":        "rdbms_db",
-      "applyToVersion":  "1.0",
-      "updateToVersion": "1.1",
+      "applyToVersion":  "1.1",
+      "updateToVersion": "1.2",
       "serviceType":     "rdbms"
     },
     {
       "action":          "SET_SERVICE_TYPE",
       "typeName":        "rdbms_table",
-      "applyToVersion":  "1.1",
-      "updateToVersion": "1.2",
+      "applyToVersion":  "1.2",
+      "updateToVersion": "1.3",
       "serviceType":     "rdbms"
     },
     {
       "action":          "SET_SERVICE_TYPE",
       "typeName":        "rdbms_column",
-      "applyToVersion":  "1.1",
-      "updateToVersion": "1.2",
+      "applyToVersion":  "1.2",
+      "updateToVersion": "1.3",
       "serviceType":     "rdbms"
     },
     {
       "action":          "SET_SERVICE_TYPE",
       "typeName":        "rdbms_index",
-      "applyToVersion":  "1.0",
-      "updateToVersion": "1.1",
+      "applyToVersion":  "1.1",
+      "updateToVersion": "1.2",
       "serviceType":     "rdbms"
     },
     {
       "action":          "SET_SERVICE_TYPE",
       "typeName":        "rdbms_foreign_key",
-      "applyToVersion":  "1.0",
-      "updateToVersion": "1.1",
+      "applyToVersion":  "1.1",
+      "updateToVersion": "1.2",
       "serviceType":     "rdbms"
     },
     {