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

rename default branch from master to main #1205

Merged
merged 1 commit into from
Jan 27, 2023
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
2 changes: 0 additions & 2 deletions .github/workflows/analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ on:
push:
branches:
- main
- master
pull_request:
branches:
- main
- master
types:
- opened
- synchronize
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
push:
branches:
- main
- master
paths-ignore:
- "**.md"
- "**/docs/**"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
required: false

env:
CHC_BRANCH: "master"
CHC_BRANCH: "main"
CHC_VERSION: "0.4.1"

jobs:
Expand Down
2 changes: 1 addition & 1 deletion clickhouse-benchmark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<name>ClickHouse Client Benchmarks</name>
<description>Benchmarks for ClickHouse clients</description>
<url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/clickhouse-benchmark</url>
<url>https://github.com/ClickHouse/clickhouse-jdbc/tree/main/clickhouse-benchmark</url>

<properties>
<legacy-driver.version>0.3.1-patch</legacy-driver.version>
Expand Down
2 changes: 1 addition & 1 deletion clickhouse-cli-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<name>ClickHouse Native Command-line Wrapper</name>
<description>Wrapper of ClickHouse native command-line client</description>
<url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/clickhouse-cli-client</url>
<url>https://github.com/ClickHouse/clickhouse-jdbc/tree/main/clickhouse-cli-client</url>

<dependencies>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions clickhouse-client/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Async Java client for ClickHouse. `clickhouse-client` is an abstract module, so

## Configuration

You can pass any client option([common](https://github.com/ClickHouse/clickhouse-jdbc/blob/master/clickhouse-client/src/main/java/com/clickhouse/client/config/ClickHouseClientOption.java), [http](https://github.com/ClickHouse/clickhouse-jdbc/blob/master/clickhouse-http-client/src/main/java/com/clickhouse/client/http/config/ClickHouseHttpOption.java), [grpc](https://github.com/ClickHouse/clickhouse-jdbc/blob/master/clickhouse-grpc-client/src/main/java/com/clickhouse/client/grpc/config/ClickHouseGrpcOption.java), and [cli](https://github.com/ClickHouse/clickhouse-jdbc/blob/master/clickhouse-cli-client/src/main/java/com/clickhouse/client/cli/config/ClickHouseCommandLineOption.java)) to `ClickHouseRequest.option()` and [server setting](https://clickhouse.com/docs/en/operations/settings/) to `ClickHouseRequest.set()` before execution, for instance:
You can pass any client option([common](https://github.com/ClickHouse/clickhouse-jdbc/blob/main/clickhouse-client/src/main/java/com/clickhouse/client/config/ClickHouseClientOption.java), [http](https://github.com/ClickHouse/clickhouse-jdbc/blob/main/clickhouse-http-client/src/main/java/com/clickhouse/client/http/config/ClickHouseHttpOption.java), [grpc](https://github.com/ClickHouse/clickhouse-jdbc/blob/main/clickhouse-grpc-client/src/main/java/com/clickhouse/client/grpc/config/ClickHouseGrpcOption.java), and [cli](https://github.com/ClickHouse/clickhouse-jdbc/blob/main/clickhouse-cli-client/src/main/java/com/clickhouse/client/cli/config/ClickHouseCommandLineOption.java)) to `ClickHouseRequest.option()` and [server setting](https://clickhouse.com/docs/en/operations/settings/) to `ClickHouseRequest.set()` before execution, for instance:

```java
client.connect("http://localhost/system")
Expand All @@ -30,7 +30,7 @@ client.connect("http://localhost/system")
});
```

[Default value](https://github.com/ClickHouse/clickhouse-jdbc/blob/master/clickhouse-client/src/main/java/com/clickhouse/client/config/ClickHouseDefaults.java) can be either configured via system property or environment variable.
[Default value](https://github.com/ClickHouse/clickhouse-jdbc/blob/main/clickhouse-client/src/main/java/com/clickhouse/client/config/ClickHouseDefaults.java) can be either configured via system property or environment variable.

## Quick Start

Expand Down
2 changes: 1 addition & 1 deletion clickhouse-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<name>ClickHouse Java Client</name>
<description>Unified Java client for ClickHouse</description>
<url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/clickhouse-client</url>
<url>https://github.com/ClickHouse/clickhouse-jdbc/tree/main/clickhouse-client</url>

<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion clickhouse-data/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<name>ClickHouse Data Processing Utilities</name>
<description>Data processing utilities for ClickHouse</description>
<url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/clickhouse-data</url>
<url>https://github.com/ClickHouse/clickhouse-jdbc/tree/main/clickhouse-data</url>

<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion clickhouse-grpc-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<name>ClickHouse gRPC Client</name>
<description>gRPC client for ClickHouse</description>
<url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/clickhouse-grpc-client</url>
<url>https://github.com/ClickHouse/clickhouse-jdbc/tree/main/clickhouse-grpc-client</url>

<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion clickhouse-http-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<name>ClickHouse HTTP Client</name>
<description>HTTP client for ClickHouse</description>
<url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/clickhouse-http-client</url>
<url>https://github.com/ClickHouse/clickhouse-jdbc/tree/main/clickhouse-http-client</url>

<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion clickhouse-jdbc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Keep in mind that `clickhouse-jdbc` is synchronous, and in general it has more o
| typeMappings | | Customize mapping between ClickHouse data type and Java class, which will affect result of both [getColumnType()](https://docs.oracle.com/javase/8/docs/api/java/sql/ResultSetMetaData.html#getColumnType-int-) and [getObject(Class<?>)](https://docs.oracle.com/javase/8/docs/api/java/sql/ResultSet.html#getObject-java.lang.String-java.lang.Class-). For example: `UInt128=java.lang.String,UInt256=java.lang.String` |
| wrapperObject | `false` | Whether [getObject()](https://docs.oracle.com/javase/8/docs/api/java/sql/ResultSet.html#getObject-int-) should return java.sql.Array / java.sql.Struct for Array / Tuple. |

Note: please refer to [JDBC specific configuration](https://github.com/ClickHouse/clickhouse-jdbc/blob/master/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/JdbcConfig.java) and client options([common](https://github.com/ClickHouse/clickhouse-jdbc/blob/master/clickhouse-client/src/main/java/com/clickhouse/client/config/ClickHouseClientOption.java), [http](https://github.com/ClickHouse/clickhouse-jdbc/blob/master/clickhouse-http-client/src/main/java/com/clickhouse/client/http/config/ClickHouseHttpOption.java), [grpc](https://github.com/ClickHouse/clickhouse-jdbc/blob/master/clickhouse-grpc-client/src/main/java/com/clickhouse/client/grpc/config/ClickHouseGrpcOption.java), and [cli](https://github.com/ClickHouse/clickhouse-jdbc/blob/master/clickhouse-cli-client/src/main/java/com/clickhouse/client/cli/config/ClickHouseCommandLineOption.java)) for more.
Note: please refer to [JDBC specific configuration](https://github.com/ClickHouse/clickhouse-jdbc/blob/main/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/JdbcConfig.java) and client options([common](https://github.com/ClickHouse/clickhouse-jdbc/blob/main/clickhouse-client/src/main/java/com/clickhouse/client/config/ClickHouseClientOption.java), [http](https://github.com/ClickHouse/clickhouse-jdbc/blob/main/clickhouse-http-client/src/main/java/com/clickhouse/client/http/config/ClickHouseHttpOption.java), [grpc](https://github.com/ClickHouse/clickhouse-jdbc/blob/main/clickhouse-grpc-client/src/main/java/com/clickhouse/client/grpc/config/ClickHouseGrpcOption.java), and [cli](https://github.com/ClickHouse/clickhouse-jdbc/blob/main/clickhouse-cli-client/src/main/java/com/clickhouse/client/cli/config/ClickHouseCommandLineOption.java)) for more.

## Examples

Expand Down
2 changes: 1 addition & 1 deletion clickhouse-jdbc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<name>ClickHouse JDBC Driver</name>
<description>JDBC driver for ClickHouse</description>
<url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/clickhouse-jdbc</url>
<url>https://github.com/ClickHouse/clickhouse-jdbc/tree/main/clickhouse-jdbc</url>

<properties>
<httpclient.version>4.5.13</httpclient.version>
Expand Down
2 changes: 1 addition & 1 deletion clickhouse-r2dbc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<name>ClickHouse R2DBC Driver</name>
<description>R2DBC driver for ClickHouse</description>
<url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/clickhouse-r2dbc</url>
<url>https://github.com/ClickHouse/clickhouse-jdbc/tree/main/clickhouse-r2dbc</url>

<properties>
<hikari-cp.version>4.0.3</hikari-cp.version>
Expand Down
2 changes: 1 addition & 1 deletion third-party-libraries/com.javacc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<name>${project.artifactId}</name>
<description>Repackaged JavaCC for generating SQL parser</description>
<url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/third-party-libraries/com.javacc</url>
<url>https://github.com/ClickHouse/clickhouse-jdbc/tree/main/third-party-libraries/com.javacc</url>

<properties>
<javacc.dir>javacc21-master</javacc.dir>
Expand Down
2 changes: 1 addition & 1 deletion third-party-libraries/io.grpc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<name>${project.artifactId}</name>
<description>Repackaged grpc-java for JPMS support</description>
<url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/third-party-libraries/io.grpc</url>
<url>https://github.com/ClickHouse/clickhouse-jdbc/tree/main/third-party-libraries/io.grpc</url>

<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion third-party-libraries/org.roaringbitmap/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<name>${project.artifactId}</name>
<description>Repackaged RoaringBitmap for JPMS support</description>
<url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/third-party-libraries/org.roaringbitmap</url>
<url>https://github.com/ClickHouse/clickhouse-jdbc/tree/main/third-party-libraries/org.roaringbitmap</url>

<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion third-party-libraries/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<name>${project.artifactId}</name>
<description>Repackaged third party libraries for JPMS compatibility</description>
<url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/third-party-libraries</url>
<url>https://github.com/ClickHouse/clickhouse-jdbc/tree/main/third-party-libraries</url>
<inceptionYear>2022</inceptionYear>

<organization>
Expand Down