Merge branch 'master' into cus2192-report-lineage-issue

datahub-project · Jul 24, 2024 · 8c8941d · 8c8941d
2 parents 4130d5b + 959d351
commit 8c8941d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/metadata-ingestion/tests/integration/sql_server/test_sql_server.py b/metadata-ingestion/tests/integration/sql_server/test_sql_server.py
@@ -22,7 +22,7 @@ def mssql_runner(docker_compose_runner, pytestconfig):
  time.sleep(5)
 
  # Run the setup.sql file to populate the database.
- command = "docker exec testsqlserver /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'test!Password' -d master -i /setup/setup.sql"
+ command = "docker exec testsqlserver /opt/mssql-tools18/bin/sqlcmd -C -S localhost -U sa -P 'test!Password' -d master -i /setup/setup.sql"
  ret = subprocess.run(command, shell=True, capture_output=True)
  assert ret.returncode == 0
  yield docker_services

diff --git a/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java b/metadata-io/src/main/java/com/linkedin/metadata/entity/EntityServiceImpl.java
@@ -2176,7 +2176,8 @@ public Set<Urn> exists(
  urn ->
  // key aspect is always returned, make sure to only consider the status aspect
  statusResult.getOrDefault(urn, List.of()).stream()
- .filter(aspect -> STATUS_ASPECT_NAME.equals(aspect.schema().getName()))
+ .filter(
+ aspect -> STATUS_ASPECT_NAME.equalsIgnoreCase(aspect.schema().getName()))
  .noneMatch(aspect -> ((Status) aspect).isRemoved()))
  .collect(Collectors.toSet());
  }

diff --git a/.../com/linkedin/metadata/structuredproperties/validation/StructuredPropertiesValidator.java b/.../com/linkedin/metadata/structuredproperties/validation/StructuredPropertiesValidator.java
@@ -356,7 +356,7 @@ private static Optional<AspectValidationException> validateType(
  throw new RuntimeException(e);
  }
  String allowedEntityName = getValueTypeId(typeUrn);
- if (typeValue.getEntityType().equals(allowedEntityName)) {
+ if (typeValue.getEntityType().equalsIgnoreCase(allowedEntityName)) {
  matchedAny = true;
  }
  }