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.

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

fix(@cubejs-backend/athena-driver): Show views in Playground for Athena #1090

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
66 changes: 65 additions & 1 deletion packages/cubejs-athena-driver/driver/AthenaDriver.js
Expand Up @@ -74,7 +74,9 @@ class AthenaDriver extends BaseDriver {
const [header, ...tableRows] = results.ResultSet.Rows;
allRows.push(...(allRows.length ? results.ResultSet.Rows : tableRows));
if (!columnInfo) {
columnInfo = results.ResultSet.ResultSetMetadata.ColumnInfo;
columnInfo = /SHOW COLUMNS/.test(query) // Fix for getColumns method
? [{ Name: 'column' }]
: results.ResultSet.ResultSetMetadata.ColumnInfo;
}
}

Expand All @@ -85,6 +87,68 @@ class AthenaDriver extends BaseDriver {
await this.sleep(500);
}
}

async tablesSchema() {
const tablesSchema = await super.tablesSchema();
const viewsSchema = await this.viewsSchema(tablesSchema);

return this.mergeSchemas([tablesSchema, viewsSchema]);
}

async viewsSchema(tablesSchema) {
// eslint-disable-next-line camelcase
const isView = ({ table_schema, table_name }) => !tablesSchema[table_schema]
|| !tablesSchema[table_schema][table_name];

const allTables = await this.getAllTables();
const arrViewsSchema = await Promise.all(
allTables
.filter(isView)
.map(table => this.getColumns(table))
);

return this.mergeSchemas(arrViewsSchema);
}

async getAllTables() {
const data = await this.query(`
SELECT table_schema, table_name
FROM information_schema.tables
WHERE tables.table_schema NOT IN ('information_schema', 'mysql', 'performance_schema', 'sys')
`);

return data;
}

// eslint-disable-next-line camelcase
async getColumns({ table_schema, table_name } = {}) {
// eslint-disable-next-line camelcase
const data = await this.query(`SHOW COLUMNS IN "${table_schema}"."${table_name}"`);

return {
[table_schema]: {
[table_name]: data.map(({ column }) => {
const [name, type] = column.split('\t');
return { name, type, attributes: [] };
})
}
};
}

mergeSchemas(arrSchemas) {
const result = {};

arrSchemas.forEach(schemas => {
Object.keys(schemas).forEach(schema => {
Object.keys(schemas[schema]).forEach((name) => {
if (!result[schema]) result[schema] = {};
if (!result[schema][name]) result[schema][name] = schemas[schema][name];
});
});
});

return result;
}
}

module.exports = AthenaDriver;
9 changes: 9 additions & 0 deletions packages/cubejs-athena-driver/package.json
Expand Up @@ -11,11 +11,20 @@
"engines": {
"node": ">=8.11.1"
},
"scripts": {
"lint": "eslint **/*.js"
},
"main": "driver/AthenaDriver.js",
"dependencies": {
"@cubejs-backend/query-orchestrator": "^0.20.0",
"aws-sdk": "^2.403.0",
"sqlstring": "^2.3.1"
},
"devDependencies": {
"eslint": "^6.8.0",
"eslint-config-airbnb-base": "^13.1.0",
"eslint-plugin-import": "^2.16.0",
"eslint-plugin-node": "^5.2.1"
},
"license": "Apache-2.0"
}