Skip to content

Commit c2ab19d

Browse files
authored
fix(databricks-jdbc-driver): Return NULL decimal as NULL instead of 0 (#6768)
* fix(databricks-jdbc-driver): Return NULL decimal as NULL instead of 0 * Release node-jdbc * Removing failing unload as it tested by other tests * Fix reference to node-jdbc * Bump oracle start timeout * Bump oracle start timeout * Fix broken YAML indexes * Bump startPeriod for Oracle * Try out log wait strategy for oracle * Show oracle container logs * Fix rust-cache working directory * Try to run oracle first just in case * Try to run oracle first just in case * Try to run oracle first just in case * Fix working-directory for rust-cache * Fix working-directory for rust-cache
1 parent f9cfd77 commit c2ab19d

File tree

18 files changed

+131
-47
lines changed

18 files changed

+131
-47
lines changed

.github/actions/smoke.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ set -eo pipefail
44
# Debug log for test containers
55
export DEBUG=testcontainers
66

7+
echo "::group::Oracle"
8+
yarn lerna run --concurrency 1 --stream --no-prefix smoke:oracle
9+
echo "::endgroup::"
10+
711
echo "::group::DuckDB"
812
# Should we create a separate job integration-duckdb? I believe not, because it works fast.
913
yarn lerna run --concurrency 1 --stream --no-prefix integration:duckdb
1014
yarn lerna run --concurrency 1 --stream --no-prefix smoke:duckdb
1115
echo "::endgroup::"
1216

13-
echo "::group::Oracle"
14-
yarn lerna run --concurrency 1 --stream --no-prefix smoke:oracle
15-
echo "::endgroup::"
16-
1717
echo "::group::Postgres"
1818
yarn lerna run --concurrency 1 --stream --no-prefix smoke:postgres
1919
echo "::endgroup::"

.github/workflows/push.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,7 @@ jobs:
342342
- uses: Swatinem/rust-cache@v1
343343
with:
344344
working-directory: ./rust/cubestore
345+
shared-key: cubestore
345346
key: ubuntu-20.04
346347
- name: Build cubestore
347348
uses: actions-rs/cargo@v1
@@ -468,6 +469,7 @@ jobs:
468469
- uses: Swatinem/rust-cache@v1
469470
with:
470471
working-directory: ./rust/cubestore
472+
shared-key: cubestore
471473
key: ubuntu-20.04
472474
- name: Build cubestore
473475
uses: actions-rs/cargo@v1

packages/cubejs-athena-driver/test/AthenaDriver.test.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ describe('AthenaDriver', () => {
4444
await tests.testStream();
4545
});
4646

47-
test('unload', async () => {
48-
await tests.testUnload();
49-
});
50-
5147
test('unload CSV escape symbol', async () => {
5248
await tests.testUnloadEscapeSymbolOp1(AthenaDriver);
5349
await tests.testUnloadEscapeSymbolOp2(AthenaDriver);

packages/cubejs-jdbc-driver/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
},
3333
"optionalDependencies": {
3434
"java": "^0.12.1",
35-
"jdbc": "^0.7.4"
35+
"@cubejs-backend/jdbc": "^0.7.6"
3636
},
3737
"license": "Apache-2.0",
3838
"eslintConfig": {

packages/cubejs-jdbc-driver/src/JDBCDriver.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import { DriverOptionsInterface, SupportedDrivers } from './supported-drivers';
2121
import { JDBCDriverConfiguration } from './types';
2222
import { QueryStream, nextFn, Row } from './QueryStream';
2323

24-
const DriverManager = require('jdbc/lib/drivermanager');
25-
const Connection = require('jdbc/lib/connection');
26-
const DatabaseMetaData = require('jdbc/lib/databasemetadata');
27-
const jinst = require('jdbc/lib/jinst');
24+
const DriverManager = require('@cubejs-backend/jdbc/lib/drivermanager');
25+
const Connection = require('@cubejs-backend/jdbc/lib/connection');
26+
const DatabaseMetaData = require('@cubejs-backend/jdbc/lib/databasemetadata');
27+
const jinst = require('@cubejs-backend/jdbc/lib/jinst');
2828
const mvn = require('node-java-maven');
2929

3030
let mvnPromise: Promise<void> | null = null;

packages/cubejs-schema-compiler/src/compiler/YamlCompiler.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,8 @@ export class YamlCompiler {
250250
if (!name) {
251251
errorsReport.error(`name isn't defined for ${memberType}: ${YAML.stringify(rest)}`);
252252
return {};
253+
} else if (indexes) {
254+
return { [name]: { indexes, ...rest } };
253255
} else {
254256
return { [name]: rest };
255257
}

packages/cubejs-testing-drivers/fixtures/athena.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@
9898
"querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- rounding in athena",
9999
"querying ECommerce: total sales, total profit by month + order (date) + total -- doesn't work with the BigQuery",
100100
"querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- noisy test",
101-
"querying BigECommerce: partitioned pre-agg"
101+
"querying BigECommerce: partitioned pre-agg",
102+
"querying BigECommerce: null sum"
102103
]
103104
}

packages/cubejs-testing-drivers/fixtures/bigquery.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@
114114
"querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- noisy test",
115115
"querying ECommerce: partitioned pre-agg",
116116
"querying ECommerce: partitioned pre-agg higher granularity",
117-
"querying BigECommerce: partitioned pre-agg"
117+
"querying BigECommerce: partitioned pre-agg",
118+
"querying BigECommerce: null sum"
118119
]
119120
}

packages/cubejs-testing-drivers/fixtures/clickhouse.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@
117117
"querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- noisy test",
118118
"querying ECommerce: partitioned pre-agg",
119119
"querying ECommerce: partitioned pre-agg higher granularity",
120-
"querying BigECommerce: partitioned pre-agg"
120+
"querying BigECommerce: partitioned pre-agg",
121+
"querying BigECommerce: null sum"
121122
]
122123
}

packages/cubejs-testing-drivers/fixtures/mssql.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@
106106
"querying Products: dimensions -- doesn't work wo ordering",
107107
"querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- rounding in athena",
108108
"querying ECommerce: total sales, total profit by month + order (date) + total -- doesn't work with the BigQuery",
109-
"querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- noisy test"
109+
"querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- noisy test",
110+
"querying BigECommerce: null sum"
110111
]
111112
}

0 commit comments

Comments
 (0)