Revert "Connection equality added for relational database connections…

… - legend using equality key based checks (#2315)" (#2359) This reverts commit 1039d48.
finos · Oct 11, 2023 · cc17530 · cc17530
1 parent 17a30ac
commit cc17530
Show file tree

Hide file tree

Showing 26 changed files with 60 additions and 593 deletions.
diff --git a/...-xt-relationalStore-athena-pure/src/main/resources/core_relational_athena.definition.json b/...-xt-relationalStore-athena-pure/src/main/resources/core_relational_athena.definition.json
@@ -1,6 +1,6 @@
 {
   "name": "core_relational_athena",
-  "pattern": "(meta::relational::functions::sqlQueryToString::athena|meta::relational::tests::sqlQueryToString::athena|meta::relational::tests::connEquality|meta::pure::alloy::connections|meta::protocols::pure)(::.*)?",
+  "pattern": "(meta::relational::functions::sqlQueryToString::athena|meta::relational::tests::sqlQueryToString::athena|meta::pure::alloy::connections|meta::protocols::pure)(::.*)?",
   "dependencies": [
     "platform",
     "platform_functions",

diff --git a/...c/main/resources/core_relational_athena/relational/connection/connectionEqualityTest.pure b/...c/main/resources/core_relational_athena/relational/connection/connectionEqualityTest.pure
diff --git a/...thena-pure/src/main/resources/core_relational_athena/relational/connection/metamodel.pure b/...thena-pure/src/main/resources/core_relational_athena/relational/connection/metamodel.pure
@@ -14,7 +14,7 @@
 
 Class meta::pure::alloy::connections::alloy::specification::AthenaDatasourceSpecification extends meta::pure::alloy::connections::alloy::specification::DatasourceSpecification
 {
-   <<equality.Key>> awsRegion: String[1];
-   <<equality.Key>> s3OutputLocation: String[1];
-   <<equality.Key>> databaseName: String[1];
+   awsRegion: String[1];
+   s3OutputLocation: String[1];
+   databaseName: String[1];
 }
diff --git a/...rc/test/java/org/finos/legend/pure/code/core/Test_Pure_Relational_ConnectionEquality.java b/...rc/test/java/org/finos/legend/pure/code/core/Test_Pure_Relational_ConnectionEquality.java
diff --git a/...relationalStore-bigquery-pure/src/main/resources/core_relational_bigquery.definition.json b/...relationalStore-bigquery-pure/src/main/resources/core_relational_bigquery.definition.json
@@ -1,6 +1,6 @@
 {
   "name": "core_relational_bigquery",
-  "pattern": "(meta::relational::functions::sqlQueryToString::bigQuery|meta::relational::tests::connEquality|meta::relational::tests::sqlQueryToString::bigQuery|meta::relational::bigQuery::tests|meta::pure::alloy::connections|meta::protocols::pure)(::.*)?",
+  "pattern": "(meta::relational::functions::sqlQueryToString::bigQuery|meta::relational::tests::sqlQueryToString::bigQuery|meta::relational::bigQuery::tests|meta::pure::alloy::connections|meta::protocols::pure)(::.*)?",
   "dependencies": [
     "platform",
     "platform_functions",

diff --git a/...sources/core_relational_bigquery/relational/runtime/connection/bigQuerySpecification.pure b/...sources/core_relational_bigquery/relational/runtime/connection/bigQuerySpecification.pure
@@ -14,8 +14,8 @@
 
 Class meta::pure::alloy::connections::alloy::specification::BigQueryDatasourceSpecification extends meta::pure::alloy::connections::alloy::specification::DatasourceSpecification
 {
-    <<equality.Key>> projectId:String[1];
-    <<equality.Key>> defaultDataset:String[1];
-    <<equality.Key>> proxyHost: String[0..1];
-    <<equality.Key>> proxyPort: String[0..1];
+    projectId:String[1];
+    defaultDataset:String[1];
+    proxyHost: String[0..1];
+    proxyPort: String[0..1];
 }
diff --git a/...ources/core_relational_bigquery/relational/runtime/connection/connectionEqualityTest.pure b/...ources/core_relational_bigquery/relational/runtime/connection/connectionEqualityTest.pure
diff --git a/...rc/test/java/org/finos/legend/pure/code/core/Test_Pure_Relational_ConnectionEquality.java b/...rc/test/java/org/finos/legend/pure/code/core/Test_Pure_Relational_ConnectionEquality.java
diff --git a/...tionalStore-databricks-pure/src/main/resources/core_relational_databricks.definition.json b/...tionalStore-databricks-pure/src/main/resources/core_relational_databricks.definition.json
@@ -1,5 +1,5 @@
 {
   "name" : "core_relational_databricks",
-  "pattern" : "(meta::relational::functions::sqlQueryToString::databricks|meta::relational::tests::sqlQueryToString::databricks|meta::relational::tests::connEquality|meta::relational::databricks::tests|meta::relational::tests::functions::sqlstring::databricks|meta::pure::alloy::connections|meta::protocols::pure)(::.*)?",
+  "pattern" : "(meta::relational::functions::sqlQueryToString::databricks|meta::relational::tests::sqlQueryToString::databricks|meta::relational::databricks::tests|meta::relational::tests::functions::sqlstring::databricks|meta::pure::alloy::connections|meta::protocols::pure)(::.*)?",
   "dependencies" : ["platform", "platform_functions", "platform_store_relational", "platform_dsl_mapping", "core_functions", "core", "core_relational"]
 }
diff --git a/...in/resources/core_relational_databricks/relational/connection/connectionEqualityTest.pure b/...in/resources/core_relational_databricks/relational/connection/connectionEqualityTest.pure
diff --git a/...s-pure/src/main/resources/core_relational_databricks/relational/connection/metamodel.pure b/...s-pure/src/main/resources/core_relational_databricks/relational/connection/metamodel.pure
@@ -14,8 +14,8 @@
 
 Class meta::pure::alloy::connections::alloy::specification::DatabricksDatasourceSpecification extends meta::pure::alloy::connections::alloy::specification::DatasourceSpecification
 {
-    <<equality.Key>> hostname:String[1];
-    <<equality.Key>> port:String[1];
-    <<equality.Key>> protocol:String[1];
-    <<equality.Key>> httpPath:String[1];
+    hostname:String[1];
+    port:String[1];
+    protocol:String[1];
+    httpPath:String[1];
 }
diff --git a/...rc/test/java/org/finos/legend/pure/code/core/Test_Pure_Relational_ConnectionEquality.java b/...rc/test/java/org/finos/legend/pure/code/core/Test_Pure_Relational_ConnectionEquality.java
diff --git a/...tionalStore-__dbtype__-pure/src/main/resources/core_relational___dbtype__.definition.json b/...tionalStore-__dbtype__-pure/src/main/resources/core_relational___dbtype__.definition.json
@@ -1,5 +1,5 @@
 {
   "name" : "core_relational_${dbtype}",
-  "pattern" : "(meta::relational::functions::sqlQueryToString::${dbType}|meta::relational::tests::connEquality|meta::relational::tests::sqlQueryToString::${dbType}|meta::pure::alloy::connections|meta::protocols::pure)(::.*)?",
+  "pattern" : "(meta::relational::functions::sqlQueryToString::${dbType}|meta::relational::tests::sqlQueryToString::${dbType}|meta::pure::alloy::connections|meta::protocols::pure)(::.*)?",
   "dependencies" : ["platform", "platform_functions", "platform_store_relational", "core", "core_relational"]
 }
diff --git a/...in/resources/core_relational___dbtype__/relational/connection/connectionEqualityTest.pure b/...in/resources/core_relational___dbtype__/relational/connection/connectionEqualityTest.pure
diff --git a/...rc/test/java/org/finos/legend/pure/code/core/Test_Pure_Relational_ConnectionEquality.java b/...rc/test/java/org/finos/legend/pure/code/core/Test_Pure_Relational_ConnectionEquality.java