Update outdated references

ClickHouse · Oct 5, 2024 · 204eb8d · 204eb8d
1 parent 785957e
commit 204eb8d
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -2,4 +2,4 @@ clickhouse-odbc (1.0.0.20190611) unstable; urgency=low
 
   * Modified source code
 
- -- proller <[email protected]>  Mon, 18 Dec 2017 16:14:46 +0300
+ -- Alexey Milovidov <[email protected]>  Mon, 1 Oct 2024 00:00:00 +0000
diff --git a/packaging/debian/control b/packaging/debian/control
@@ -1,9 +1,9 @@
 Source: clickhouse-odbc
 Priority: optional
-Maintainer: Alexey Milovidov <milovidov@yandex-team.ru>
+Maintainer: Alexey Milovidov <milovidov@clickhouse.com>
 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
@@ -20,7 +20,7 @@ mkdir -p $CLICKHOUSE_LOGDIR
 mkdir -p $CLICKHOUSE_CONFDIR/conf.d
 
 echo "<?xml version=\"1.0\"?>
-<yandex>
+<clickhouse>
     <logger>
         <log replace=\"replace\">${CLICKHOUSE_LOGDIR}/clickhouse-server.log</log>
         <errorlog replace=\"replace\">${CLICKHOUSE_LOGDIR}/clickhouse-server.err.log</errorlog>
@@ -35,7 +35,7 @@ echo "<?xml version=\"1.0\"?>
             <path>${CLICKHOUSE_DATADIR}/access/</path>
         </local_directory>
     </user_directories>
-</yandex>
+</clickhouse>
 " > $CLICKHOUSE_CONFDIR/conf.d/paths.xml
 
 if [ "$1" == "foreground" ]; then

diff --git 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);'