Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(ingest): fix mysql ingestion issue with non-lowercase database #6713

Merged
merged 1 commit into from
Dec 12, 2022
Merged

fix(ingest): fix mysql ingestion issue with non-lowercase database #6713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions metadata-ingestion/src/datahub/ingestion/source/sql/two_tier_sql_source.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,11 @@ def gen_schema_containers(
self, schema: str, db_name: str
) -> typing.Iterable[MetadataWorkUnit]:
return []

def get_db_name(self, inspector: Inspector) -> str:
engine = inspector.engine

if engine and hasattr(engine, "url") and hasattr(engine.url, "database"):
return str(engine.url.database).strip('"')
else:
raise Exception("Unable to get database name from Sqlalchemy inspector")
34 changes: 17 additions & 17 deletions metadata-ingestion/tests/integration/mysql/mysql_mces_no_db_golden.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[
{
"entityType": "container",
"entityUrn": "urn:li:container:9191fea5add3487ba6b8266d4c74a7d1",
"entityUrn": "urn:li:container:0f72a1bc79da282eb614cc089c0ba302",
"changeType": "UPSERT",
"aspectName": "containerProperties",
"aspect": {
"value": "{\"customProperties\": {\"platform\": \"mysql\", \"instance\": \"PROD\", \"database\": \"datacharmer\"}, \"name\": \"datacharmer\"}",
"value": "{\"customProperties\": {\"platform\": \"mysql\", \"instance\": \"PROD\", \"database\": \"dataCharmer\"}, \"name\": \"dataCharmer\"}",
"contentType": "application/json"
},
"systemMetadata": {
Expand All @@ -15,7 +15,7 @@
},
{
"entityType": "container",
"entityUrn": "urn:li:container:9191fea5add3487ba6b8266d4c74a7d1",
"entityUrn": "urn:li:container:0f72a1bc79da282eb614cc089c0ba302",
"changeType": "UPSERT",
"aspectName": "status",
"aspect": {
Expand All @@ -29,7 +29,7 @@
},
{
"entityType": "container",
"entityUrn": "urn:li:container:9191fea5add3487ba6b8266d4c74a7d1",
"entityUrn": "urn:li:container:0f72a1bc79da282eb614cc089c0ba302",
"changeType": "UPSERT",
"aspectName": "dataPlatformInstance",
"aspect": {
Expand All @@ -43,7 +43,7 @@
},
{
"entityType": "container",
"entityUrn": "urn:li:container:9191fea5add3487ba6b8266d4c74a7d1",
"entityUrn": "urn:li:container:0f72a1bc79da282eb614cc089c0ba302",
"changeType": "UPSERT",
"aspectName": "subTypes",
"aspect": {
Expand All @@ -57,11 +57,11 @@
},
{
"entityType": "dataset",
"entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mysql,datacharmer.employees,PROD)",
"entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mysql,dataCharmer.employees,PROD)",
"changeType": "UPSERT",
"aspectName": "container",
"aspect": {
"value": "{\"container\": \"urn:li:container:9191fea5add3487ba6b8266d4c74a7d1\"}",
"value": "{\"container\": \"urn:li:container:0f72a1bc79da282eb614cc089c0ba302\"}",
"contentType": "application/json"
},
"systemMetadata": {
Expand All @@ -72,7 +72,7 @@
{
"proposedSnapshot": {
"com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
"urn": "urn:li:dataset:(urn:li:dataPlatform:mysql,datacharmer.employees,PROD)",
"urn": "urn:li:dataset:(urn:li:dataPlatform:mysql,dataCharmer.employees,PROD)",
"aspects": [
{
"com.linkedin.pegasus2avro.common.Status": {
Expand All @@ -88,7 +88,7 @@
},
{
"com.linkedin.pegasus2avro.schema.SchemaMetadata": {
"schemaName": "datacharmer.employees",
"schemaName": "dataCharmer.employees",
"platform": "urn:li:dataPlatform:mysql",
"version": 0,
"created": {
Expand Down Expand Up @@ -191,7 +191,7 @@
},
{
"entityType": "dataset",
"entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mysql,datacharmer.employees,PROD)",
"entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mysql,dataCharmer.employees,PROD)",
"changeType": "UPSERT",
"aspectName": "subTypes",
"aspect": {
Expand All @@ -205,11 +205,11 @@
},
{
"entityType": "dataset",
"entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mysql,datacharmer.salaries,PROD)",
"entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mysql,dataCharmer.salaries,PROD)",
"changeType": "UPSERT",
"aspectName": "container",
"aspect": {
"value": "{\"container\": \"urn:li:container:9191fea5add3487ba6b8266d4c74a7d1\"}",
"value": "{\"container\": \"urn:li:container:0f72a1bc79da282eb614cc089c0ba302\"}",
"contentType": "application/json"
},
"systemMetadata": {
Expand All @@ -220,7 +220,7 @@
{
"proposedSnapshot": {
"com.linkedin.pegasus2avro.metadata.snapshot.DatasetSnapshot": {
"urn": "urn:li:dataset:(urn:li:dataPlatform:mysql,datacharmer.salaries,PROD)",
"urn": "urn:li:dataset:(urn:li:dataPlatform:mysql,dataCharmer.salaries,PROD)",
"aspects": [
{
"com.linkedin.pegasus2avro.common.Status": {
Expand All @@ -236,7 +236,7 @@
},
{
"com.linkedin.pegasus2avro.schema.SchemaMetadata": {
"schemaName": "datacharmer.salaries",
"schemaName": "dataCharmer.salaries",
"platform": "urn:li:dataPlatform:mysql",
"version": 0,
"created": {
Expand Down Expand Up @@ -315,7 +315,7 @@
},
{
"entityType": "dataset",
"entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mysql,datacharmer.salaries,PROD)",
"entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mysql,dataCharmer.salaries,PROD)",
mayurinehate marked this conversation as resolved.
Show resolved Hide resolved
"changeType": "UPSERT",
"aspectName": "subTypes",
"aspect": {
Expand All @@ -329,7 +329,7 @@
},
{
"entityType": "dataset",
"entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mysql,datacharmer.employees,PROD)",
"entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mysql,dataCharmer.employees,PROD)",
"changeType": "UPSERT",
"aspectName": "datasetProfile",
"aspect": {
Expand All @@ -343,7 +343,7 @@
},
{
"entityType": "dataset",
"entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mysql,datacharmer.salaries,PROD)",
"entityUrn": "urn:li:dataset:(urn:li:dataPlatform:mysql,dataCharmer.salaries,PROD)",
"changeType": "UPSERT",
"aspectName": "datasetProfile",
"aspect": {
Expand Down
10 changes: 5 additions & 5 deletions metadata-ingestion/tests/integration/mysql/setup/setup.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ CREATE TABLE metadata_index (
CREATE VIEW metadata_index_view AS SELECT id, urn, path, doubleVal FROM metadata_index;

-- -----------------------------------------------------
-- Some sample data, from https://github.com/datacharmer/test_db.
-- Some sample data, from https://github.com/dataCharmer/test_db.
-- -----------------------------------------------------

CREATE SCHEMA IF NOT EXISTS `datacharmer` ;
USE `datacharmer` ;
CREATE SCHEMA IF NOT EXISTS `dataCharmer` ;
USE `dataCharmer` ;

CREATE TABLE `datacharmer`.`employees` (
CREATE TABLE `dataCharmer`.`employees` (
emp_no INT NOT NULL,
birth_date DATE NOT NULL,
first_name VARCHAR(14) NOT NULL,
Expand All @@ -64,7 +64,7 @@ CREATE TABLE `datacharmer`.`employees` (
PRIMARY KEY (emp_no)
);

CREATE TABLE `datacharmer`.`salaries` (
CREATE TABLE `dataCharmer`.`salaries` (
emp_no INT NOT NULL,
salary INT NOT NULL,
from_date DATE NOT NULL,
Expand Down