Skip to content

Commit a4e41cb

Browse files
authored
feat: Renamed OpenDistro to AWSElasticSearch. Added elasticsearch dialect (#577) Thanks to @chad-codeworkshop!
1 parent ca0f1f6 commit a4e41cb

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

packages/cubejs-schema-compiler/adapter/OpenDistroElasticSearchQuery.js renamed to packages/cubejs-schema-compiler/adapter/AWSElasticSearchQuery.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ const GRANULARITY_TO_INTERVAL = {
1515
year: (date) => `DATE_FORMAT(${date}, 'yyyy-01-01 00:00:00.000')`
1616
};
1717

18-
class OpenDistroElasticSearchQueryFilter extends BaseFilter {
18+
class AWSElasticSearchQueryFilter extends BaseFilter {
1919
likeIgnoreCase(column, not) {
2020
return `${column}${not ? ' NOT' : ''} LIKE CONCAT('%', ?, '%')`;
2121
}
2222
}
2323

24-
class OpenDistroElasticSearchQuery extends BaseQuery {
24+
class AWSElasticSearchQuery extends BaseQuery {
2525
newFilter(filter) {
26-
return new OpenDistroElasticSearchQueryFilter(this, filter);
26+
return new AWSElasticSearchQueryFilter(this, filter);
2727
}
2828

2929
convertTz(field) {
@@ -99,4 +99,4 @@ class OpenDistroElasticSearchQuery extends BaseQuery {
9999
}
100100
}
101101

102-
module.exports = OpenDistroElasticSearchQuery;
102+
module.exports = AWSElasticSearchQuery;

packages/cubejs-schema-compiler/adapter/QueryBuilder.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const clickhouse = require('./ClickHouseQuery');
1111
const hive = require('./HiveQuery');
1212
const oracle = require('./OracleQuery');
1313
const sqlite = require('./SqliteQuery');
14-
const odelasticsearch = require('./OpenDistroElasticSearchQuery');
14+
const awselasticsearch = require('./AWSElasticSearchQuery');
1515
const elasticsearch = require('./ElasticSearchQuery');
1616

1717
const ADAPTERS = {
@@ -30,7 +30,7 @@ const ADAPTERS = {
3030
hive,
3131
oracle,
3232
sqlite,
33-
odelasticsearch,
33+
awselasticsearch,
3434
elasticsearch
3535
};
3636
exports.query = (compilers, dbType, queryOptions) => {

packages/cubejs-server-core/core/index.d.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ declare module "@cubejs-backend/server-core" {
9191
| "mongobi"
9292
| "mssql"
9393
| "mysql"
94-
| "odelasticsearch"
94+
| "elasticsearch"
95+
| "awselasticsearch"
9596
| "oracle"
9697
| "postgres"
9798
| "prestodb"

packages/cubejs-server-core/core/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const DriverDependencies = {
2929
prestodb: '@cubejs-backend/prestodb-driver',
3030
oracle: '@cubejs-backend/oracle-driver',
3131
sqlite: '@cubejs-backend/sqlite-driver',
32-
odelasticsearch: '@cubejs-backend/elasticsearch-driver',
32+
awselasticsearch: '@cubejs-backend/elasticsearch-driver',
3333
elasticsearch: '@cubejs-backend/elasticsearch-driver',
3434
};
3535

0 commit comments

Comments
 (0)