From 3e63ea323c10c8634a1ef044c06154448033d065 Mon Sep 17 00:00:00 2001
From: Zhichun Wu <zhicwu@gmail.com>
Date: Sat, 9 Jan 2021 19:43:49 +0800
Subject: [PATCH] Correct readme along with minor changes

---
 README.md                                                     | 4 ++--
 .../yandex/clickhouse/jdbcbridge/impl/ConfigDataSource.java   | 2 --
 .../yandex/clickhouse/jdbcbridge/JdbcBridgeVerticleTest.java  | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index a388933..1f037bb 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ JDBC bridge for ClickHouse®. It acts as a stateless proxy passing queries from
     # build all-in-one docker image
     git clone https://github.com/ClickHouse/clickhouse-jdbc-bridge.git
     cd clickhouse-jdbc-bridge
-    docker build -t my/clickhouse-all-in-one .
+    docker build -t my/clickhouse-all-in-one -f all-in-one.Dockerfile .
 
     # start container in background
     docker run --rm -d --name ch-and-jdbc-bridge my/clickhouse-all-in-one
@@ -397,7 +397,7 @@ clickhouse_url(clickhouse) | `http://ch-server:8123/?query=select * from url('ht
 clickhouse_url(jdbc-bridge) | `http://ch-server:8123/?query=select * from url('http://jdbc-bridge:9019/ping', CSV, 'results String')`
 clickhouse_constant-query | `http://ch-server:8123/?query=select 1`
 clickhouse_constant-query(mysql) | `http://ch-server:8123/?query=select * from mysql('mariadb:3306', 'test', 'constant', 'root', 'root')`
-clickhouse_constant-query(remote) | `select * from remote('ch-server:9000', system.constant, 'default', '')`
+clickhouse_constant-query(remote) | `http://ch-server:8123/?query=select * from remote('ch-server:9000', system.constant, 'default', '')`
 clickhouse_constant-query(url) | `http://ch-server:8123/?query=select * from url('http://ch-server:8123/?query=select 1', CSV, 'results String')`
 clickhouse*_constant-query(jdbc*) | `http://ch-server:8123/?query=select * from jdbc('mariadb', 'constant')`
 clickhouse_10k-rows-query | `http://ch-server:8123/?query=select 1`
diff --git a/src/main/java/ru/yandex/clickhouse/jdbcbridge/impl/ConfigDataSource.java b/src/main/java/ru/yandex/clickhouse/jdbcbridge/impl/ConfigDataSource.java
index 2dc2e75..06f89de 100644
--- a/src/main/java/ru/yandex/clickhouse/jdbcbridge/impl/ConfigDataSource.java
+++ b/src/main/java/ru/yandex/clickhouse/jdbcbridge/impl/ConfigDataSource.java
@@ -156,8 +156,6 @@ public void read(int row, int column, ColumnDefinition metadata, ByteBuffer buff
     public static void initialize(ExtensionManager manager) {
         Repository<NamedDataSource> dsRepo = manager.getRepositoryManager().getRepository(NamedDataSource.class);
 
-        Extension<NamedDataSource> thisExtension = manager.getExtension(ConfigDataSource.class);
-        dsRepo.registerType(EXTENSION_NAME, thisExtension);
         dsRepo.put(Utils.EMPTY_STRING, new ConfigDataSource(dsRepo));
     }
 
diff --git a/src/test/java/ru/yandex/clickhouse/jdbcbridge/JdbcBridgeVerticleTest.java b/src/test/java/ru/yandex/clickhouse/jdbcbridge/JdbcBridgeVerticleTest.java
index fe874b3..bc23e40 100644
--- a/src/test/java/ru/yandex/clickhouse/jdbcbridge/JdbcBridgeVerticleTest.java
+++ b/src/test/java/ru/yandex/clickhouse/jdbcbridge/JdbcBridgeVerticleTest.java
@@ -72,7 +72,7 @@ public TestRepository(ExtensionManager manager, Class<T> clazz) {
     }
 
     @BeforeSuite(groups = { "sit" })
-    public void beforeSuite() {
+    public static void beforeSuite() {
         pgServer.start();
         mdServer.start();
         chServer.start();
@@ -80,7 +80,7 @@ public void beforeSuite() {
     }
 
     @AfterSuite(groups = { "sit" })
-    public void afterSuite() {
+    public static void afterSuite() {
         pgServer.stop();
         mdServer.stop();
         chServer.stop();