Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,14 @@ jobs:
- name: Build and install
run: |
find . -type f -name "simplelogger.*" -exec rm -fv '{}' \;
mvn -q --batch-mode -DclickhouseVersion=$PREFERRED_LTS_VERSION \
mvn -q --no-transfer-progress --batch-mode -DclickhouseVersion=$PREFERRED_LTS_VERSION \
-DskipTests install
- name: Analyze
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: |
mvn --batch-mode -DclickhouseVersion=$PREFERRED_LTS_VERSION \
mvn -fn --no-transfer-progress --batch-mode -DclickhouseVersion=$PREFERRED_LTS_VERSION \
-Panalysis verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=ClickHouse_clickhouse-java
continue-on-error: true
- name: Generate and post coverage report
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ java.prof
jmh-result.*
profile.html
jdbc-v2/gen
jdbc-v2/src/main/antlr4/com/clickhouse/jdbc/internal/gen
jdbc-v2/src/main/antlr4/com/clickhouse/jdbc/internal/ClickHouseLexer.tokens

# Shell scripts
*.sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,9 @@ public static Map<String, Object> parseConfigMap(Map<String, String> configMap)
}
}

LOG.warn("Unknown and unmapped config properties: {}", tmpMap);
if (!tmpMap.isEmpty()) {
LOG.warn("Unknown and unmapped config properties: {}", tmpMap);
}

return parsedConfig;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ MONTH : M O N T H;
MOVE : M O V E;
MUTATION : M U T A T I O N;
NAN_SQL : N A N; // conflicts with macro NAN
NAME : N A M E;
NAME : N A M E;
NO : N O;
NO_PASSWORD : N O '_' P A S S W O R D;
NONE : N O N E;
Expand Down Expand Up @@ -228,6 +228,37 @@ WHERE : W H E R E;
WINDOW : W I N D O W;
WITH : W I T H;
YEAR : Y E A R | Y Y Y Y;
QUOTA : Q U O T A;
ACCESS : A C C E S S;
GRANT : G R A N T;
WAIT : W A I T;
CLEANUP : C L E A N U P;
DEFINER : D E F I N E R;
RESTART : R E S T A R T;
SOURCES : S O U R C E S;
AZURE : A Z U R E;
FILE : F I L E;
HDFS : H D F S;
HIVE : H I V E;
JDBC : J D B C;
KAFKA : K A F K A;
MONGO : M O N G O;
MYSQL : M Y S Q L;
NATS : N A T S;
ODBC : O D B C;
POSTGRES : P O S T G R E S;
RABBITMQ : R A B B I T M Q;
REDIS : R E D I S;
REMOTE : R E M O T E;
S3 : S '3';
SQLITE : S Q L I T E;
URL : U R L;
LOADING : L O A D I N G;
VIRTUAL : V I R T U A L;
VIEWS : V I E W S;
POLICY : P O L I C Y;
PERMISSIVE : P E R M I S S I V E;
RESTRICTIVE : R E S T R I C T I V E;

JSON_FALSE : 'false';
JSON_TRUE : 'true';
Expand Down
Loading
Loading