From 204eb8d5a84c249e307d0e973dc0a21c97d1ecf2 Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Sat, 5 Oct 2024 13:24:36 +0800 Subject: [PATCH] Update outdated references --- CMakeLists.txt | 2 +- CPackLists.txt | 1 - driver/platform/win/resource.rc | 4 ++-- packaging/License.rtf | 4 ++-- packaging/debian/changelog | 2 +- packaging/debian/control | 4 ++-- test/run_clickhouse_macos.sh | 4 ++-- test/test.sh | 4 ++-- 8 files changed, 12 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 70829e487..887741507 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -307,7 +307,7 @@ if (CH_ODBC_ENABLE_INSTALL) set (CPACK_PROJECT_CONFIG_FILE "${PROJECT_SOURCE_DIR}/CPackLists.txt") - set (CPACK_PACKAGE_VENDOR "Yandex LLC") + set (CPACK_PACKAGE_VENDOR "ClickHouse, Inc.") set (CPACK_PACKAGE_DESCRIPTION "The official ODBC driver implementation for accessing ClickHouse as a data source.") set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "ClickHouse ODBC Driver (${ARCH_BITS}-bit)") set (CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/packaging/Readme.rtf") diff --git a/CPackLists.txt b/CPackLists.txt index 82b58a66a..60320143c 100644 --- a/CPackLists.txt +++ b/CPackLists.txt @@ -1,4 +1,3 @@ - # This file will be included at CPack-time, once per generator after CPack has set CPACK_GENERATOR to the actual generator being used. if ( diff --git a/driver/platform/win/resource.rc b/driver/platform/win/resource.rc index 7b53d1b3b..c2b691903 100755 --- a/driver/platform/win/resource.rc +++ b/driver/platform/win/resource.rc @@ -134,11 +134,11 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "Comments", "" - VALUE "CompanyName", "Yandex" + VALUE "CompanyName", "ClickHouse, Inc." VALUE "FileDescription", "ClickHouse ODBC driver" VALUE "FileVersion", VERSION_STRING VALUE "InternalName", "clickhouse-odbc" - VALUE "LegalCopyright", "(c) 2017-2018" + VALUE "LegalCopyright", "(c) 2017-2024" VALUE "LegalTrademarks", "" VALUE "OriginalFilename", "" VALUE "PrivateBuild", VERSION_EXTRA diff --git a/packaging/License.rtf b/packaging/License.rtf index 933f7605a..4093bd0e2 100644 --- a/packaging/License.rtf +++ b/packaging/License.rtf @@ -15,9 +15,9 @@ \formshade{\*\pgdscno0}\paperh16838\paperw11906\margl1134\margr1134\margt1134\margb1134\sectd\sbknone\sectunlocked1\pgndec\pgwsxn11906\pghsxn16838\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc {\*\ftnsep\chftnsep}\pgndec\pard\plain \s20\ql\widctlpar\hyphpar0\sb0\sa0\ltrpar\cf1\kerning1\dbch\af6\langfe1049\dbch\af6\afs24\loch\f5\fs20\lang1049{\rtlch \ltrch\loch Copyright }{\rtlch \ltrch\loch\lang1033 -2017}{\rtlch \ltrch\loch +2024}{\rtlch \ltrch\loch }{\rtlch \ltrch\loch\lang1033 -Yandex LLC} +ClickHouse, Inc.} \par \pard\plain \s20\ql\widctlpar\hyphpar0\sb0\sa0\ltrpar\cf1\kerning1\dbch\af6\langfe1049\dbch\af6\afs24\loch\f5\fs20\lang1049\sb0\sa0\rtlch \ltrch\loch \par \pard\plain \s20\ql\widctlpar\hyphpar0\sb0\sa0\ltrpar\cf1\kerning1\dbch\af6\langfe1049\dbch\af6\afs24\loch\f5\fs20\lang1049{\rtlch \ltrch\loch diff --git a/packaging/debian/changelog b/packaging/debian/changelog index ace630a89..421063dad 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -2,4 +2,4 @@ clickhouse-odbc (1.0.0.20190611) unstable; urgency=low * Modified source code - -- proller Mon, 18 Dec 2017 16:14:46 +0300 + -- Alexey Milovidov Mon, 1 Oct 2024 00:00:00 +0000 diff --git a/packaging/debian/control b/packaging/debian/control index f54caa6ec..a77b5817f 100644 --- a/packaging/debian/control +++ b/packaging/debian/control @@ -1,9 +1,9 @@ Source: clickhouse-odbc Priority: optional -Maintainer: Alexey Milovidov +Maintainer: Alexey Milovidov Build-Depends: debhelper (>= 9), cmake3 | cmake, lsb-release, unixodbc-dev | libiodbc2-dev Standards-Version: 4.1.1 -Homepage: https://clickhouse.yandex +Homepage: https://clickhouse.com/ Package: clickhouse-odbc Section: database diff --git a/test/run_clickhouse_macos.sh b/test/run_clickhouse_macos.sh index a696f85be..9db3ade24 100755 --- a/test/run_clickhouse_macos.sh +++ b/test/run_clickhouse_macos.sh @@ -20,7 +20,7 @@ mkdir -p $CLICKHOUSE_LOGDIR mkdir -p $CLICKHOUSE_CONFDIR/conf.d echo " - + ${CLICKHOUSE_LOGDIR}/clickhouse-server.log ${CLICKHOUSE_LOGDIR}/clickhouse-server.err.log @@ -35,7 +35,7 @@ echo " ${CLICKHOUSE_DATADIR}/access/ - + " > $CLICKHOUSE_CONFDIR/conf.d/paths.xml if [ "$1" == "foreground" ]; then diff --git a/test/test.sh b/test/test.sh index d956adac7..575d2cdec 100755 --- a/test/test.sh +++ b/test/test.sh @@ -65,7 +65,7 @@ q 'SELECT CAST(CAST(`odbc1`.`date` AS DATE) AS DATE) AS `tdy_Calculation_6873619 q 'SELECT {fn CURDATE()}' -q $'SELECT `test`.`odbc1`.`ui64` AS `bannerid`, SUM((CASE WHEN `test`.`odbc1`.`ui64` = 0 THEN NULL ELSE `test`.`odbc1`.`ui64` / `test`.`odbc1`.`ui64` END)) AS `sum_Calculation_582934706662502402_ok`, SUM(`test`.`odbc1`.`ui64`) AS `sum_clicks_ok`, SUM(`test`.`odbc1`.`ui64`) AS `sum_shows_ok`, SUM(`test`.`odbc1`.`ui64`) AS `sum_true_installs_ok`, CAST(CAST(`test`.`odbc1`.`date` AS DATE) AS DATE) AS `tdy_Calculation_582934706642255872_ok` FROM `test`.`odbc1` WHERE (`test`.`odbc1`.`string` = \'YandexBrowser\') GROUP BY `test`.`odbc1`.`ui64`, CAST(CAST(`test`.`odbc1`.`date` AS DATE) AS DATE)' +q $'SELECT `test`.`odbc1`.`ui64` AS `bannerid`, SUM((CASE WHEN `test`.`odbc1`.`ui64` = 0 THEN NULL ELSE `test`.`odbc1`.`ui64` / `test`.`odbc1`.`ui64` END)) AS `sum_Calculation_582934706662502402_ok`, SUM(`test`.`odbc1`.`ui64`) AS `sum_clicks_ok`, SUM(`test`.`odbc1`.`ui64`) AS `sum_shows_ok`, SUM(`test`.`odbc1`.`ui64`) AS `sum_true_installs_ok`, CAST(CAST(`test`.`odbc1`.`date` AS DATE) AS DATE) AS `tdy_Calculation_582934706642255872_ok` FROM `test`.`odbc1` WHERE (`test`.`odbc1`.`string` = \'Firefox\') GROUP BY `test`.`odbc1`.`ui64`, CAST(CAST(`test`.`odbc1`.`date` AS DATE) AS DATE)' q $'SELECT test.odbc1.ui64 AS BannerID, SUM((CASE WHEN test.odbc1.ui64 = 0 THEN NULL ELSE test.odbc1.ui64 / test.odbc1.ui64 END)) AS sum_Calculation_500744014152380416_ok, SUM(test.odbc1.ui64) AS sum_ch_installs_ok, SUM(test.odbc1.ui64) AS sum_goodshows_ok FROM test.odbc1 GROUP BY test.odbc1.ui64' @@ -91,7 +91,7 @@ q 'SELECT `test`.`adv_watch`.`rocket_date` AS `rocket_date`, COUNT(DISTINCT `tes q 'SELECT CAST({fn TRUNCATE(EXTRACT(YEAR FROM `test`.`adv_watch`.`rocket_date`),0)} AS INTEGER) AS `yr_rocket_date_ok` FROM `test`.`adv_watch` GROUP BY CAST({fn TRUNCATE(EXTRACT(YEAR FROM `test`.`adv_watch`.`rocket_date`),0)} AS INTEGER)' q "DROP TABLE test.adv_watch;" -# https://github.com/yandex/clickhouse-odbc/issues/43 +# https://github.com/ClickHouse/clickhouse-odbc/issues/43 q 'DROP TABLE IF EXISTS test.gamoraparams;' q 'CREATE TABLE test.gamoraparams ( user_id Int64, date Date, dt DateTime, p1 Nullable(Int32), platforms Nullable(Int32), max_position Nullable(Int32), vv Nullable(Int32), city Nullable(String), third_party Nullable(Int8), mobile_tablet Nullable(Int8), mobile_phone Nullable(Int8), desktop Nullable(Int8), web_mobile Nullable(Int8), tv_attach Nullable(Int8), smart_tv Nullable(Int8), subsite_id Nullable(Int32), view_in_second Nullable(Int32), view_in_second_presto Nullable(Int32)) ENGINE = MergeTree(date, user_id, 8192)' q 'insert into test.gamoraparams values (1, {fn CURRENT_TIMESTAMP }, CAST({fn CURRENT_TIMESTAMP(0)} AS DATE), Null, Null,Null,Null,Null, Null,Null,Null,Null,Null,Null,Null,Null,Null,Null);'