Skip to content

Commit e71a6bb

Browse files
sachinprosachinpro
authored
chore: updated template ini files for the linux release package (#1347)
1 parent a78106d commit e71a6bb

6 files changed

Lines changed: 57 additions & 24 deletions

File tree

‎ci/cloudbuild/builds/bq-driver-release.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ io::run cp -v "/workspace/cmake-out/google/cloud/odbc/libgoogle_cloud_odbc_bq_dr
7878
# Copy ODBC config file templates
7979
io::run cp -v "/opt/odbc-driver/odbc_template.ini" "${RELEASE_DIR}/odbc.ini"
8080
io::run cp -v "/opt/odbc-driver/odbcinst_template.ini" "${RELEASE_DIR}/odbcinst.ini"
81+
io::run cp -v "/opt/odbc-driver/googlebigqueryodbc.ini" "${RELEASE_DIR}/googlebigqueryodbc.ini"
8182

8283
# Create ZIP file
8384
ZIP_NAME="odbc-driver.${VERSION}.zip"

‎ci/cloudbuild/dockerfiles/ubuntu-22.04-full.Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ COPY ./gha/builds/lib/lsan.supp /opt/odbc-driver/lsan.supp
264264
COPY ./gha/builds/lib/google.googlebigqueryodbc.ini /opt/odbc-driver/google.googlebigqueryodbc.ini
265265
COPY ./gha/builds/release/odbc.ini /opt/odbc-driver/odbc_template.ini
266266
COPY ./gha/builds/release/odbcinst.ini /opt/odbc-driver/odbcinst_template.ini
267+
COPY ./gha/builds/release/googlebigqueryodbc.ini /opt/odbc-driver/googlebigqueryodbc.ini
267268

268269
# glibc 2.17 or later
269270
RUN echo 'Installing glibc...'

‎ci/cloudbuild/dockerfiles/ubuntu-22.04-install.Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ COPY ./gha/builds/lib/lsan.supp /opt/odbc-driver/lsan.supp
150150
COPY ./gha/builds/lib/google.googlebigqueryodbc.ini /opt/odbc-driver/google.googlebigqueryodbc.ini
151151
COPY ./gha/builds/release/odbc.ini /opt/odbc-driver/odbc_template.ini
152152
COPY ./gha/builds/release/odbcinst.ini /opt/odbc-driver/odbcinst_template.ini
153+
COPY ./gha/builds/release/googlebigqueryodbc.ini /opt/odbc-driver/googlebigqueryodbc.ini
153154

154155
# glibc 2.17 or later
155156
RUN echo 'Installing glibc...'

‎ci/gha/builds/release/googlebigqueryodbc.ini‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# To use this INI file, set GOOGLEBIGQUERYODBCINI env to this path
2+
3+
[Driver]
4+
# LogLevel(Optional): Follows abseil logging(https://abseil.io/docs/cpp/guides/logging#severity)
5+
# 0 = (OFF) No messages should be logged.
6+
# 1 = (ERROR) Denotes serious failures or errors that impact application functionality.
7+
# 2 = (WARNING) Indicates potential problems or situations that might require attention.
8+
# 3 = (INFO) Informational messages about normal events and progress.
9+
LogLevel=0
10+
11+
# LogPath(Required): Folder where log files would be created. The folder must exist.
12+
# Note: This is optional if `LogLevel=0`
13+
LogPath=
14+
15+
# LogFileCount(Optional): Maximum number of log files created.
16+
# Driver will start deleting the older files after this limit is reached.
17+
LogFileCount=200
18+
19+
# LogFileSize(Optional): Maximum size of a log file in MB
20+
LogFileSize=1
21+
22+
# MaxThreads(Optional): Maximum threads the driver will spawn for catalog APIs
23+
MaxThreads=8

‎ci/gha/builds/release/odbc.ini‎

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,46 +9,53 @@ BigQueryDSN=ODBC Driver for BigQuery
99

1010
[BigQueryDSN]
1111

12-
# Description: DSN Description.
13-
# This key is not necessary and is only to give a description of the data source.
12+
# These values can be set here, or on the connection string.
13+
14+
# Description(Optional): DSN Description.
1415
Description=ODBC Driver for BigQuery
1516

16-
# Driver: The location where the ODBC driver is installed to.
17-
#Driver=<INSTALLDIR>/lib/libgoogle_cloud_odbc_bq_driver.so # Linux
17+
# Driver(Required): The location where the ODBC driver is installed to.
18+
# Driver=<INSTALLDIR>/lib/libgoogle_cloud_odbc_bq_driver.so # Linux
1819
# Driver=<INSTALLDIR>/lib/libgoogle_cloud_odbc_bq_driver.dylib # MacOS
1920

20-
# These values can be set here, or on the connection string.
21-
# Catalog: The catalog to connect to. This is a required setting.
22-
#Catalog=
21+
# Catalog(Required): The catalog to connect to. This is a required setting.
22+
Catalog=
2323

24-
# SQLDialect: The SQL Dialect to use. There are two SQL dialects:
24+
# SQLDialect(Optional): The SQL Dialect to use. There are two SQL dialects:
2525
# 0 = BigQuery Legacy SQL
2626
# 1 = BigQuery Standard SQL (SQL 11)
27-
SQLDialect=1
27+
# SQLDialect=1
2828

29-
# OAuth Mechanism: The OAuth mechanism to use. There are three choices:
30-
# 0 = Service Authentication
31-
# 1 = User Authentication
29+
# OAuth Mechanism(Required): The OAuth mechanism to use. There are three choices:
30+
# 0 = Service or User Authentication
3231
# 3 = Application Default Credentials
3332
# 4 = External account Authentication
3433
#
35-
# This is a required setting.
36-
OAuthMechanism=1
34+
OAuthMechanism=0
3735

38-
# KeyFile Path: For Service and External Authentication, this is a required setting. This is the path to the stored keyfile (.p12).
39-
# KeyFilePath=
36+
# KeyFilePath(Required): For Service and External Authentication, this is a required setting. This is the path to the stored keyfile (.p12).
37+
# Note: This is not required for Application Default Credentials
38+
KeyFilePath=
4039

41-
# Used to specify the full path of the PEM formatted file containing trusted SSL CA certificates.
40+
# TrustedCerts(Optional): Used to specify the full path of the PEM formatted file containing trusted SSL CA certificates.
4241
# If an empty string is passed in for the configuration, the driver expects the trusted SSL CA
4342
# certificates can be found in the file named cacerts.pem located in the same directory as the
4443
# driver's shared library.
4544
#TrustedCerts=
4645

47-
# AllowLargeResults: When set to 1, the driver allows for result sets in responses to be larger than 128 MB.
48-
AllowLargeResults=0
46+
# AllowLargeResults(Optional): When set to 1, the driver allows for result sets in responses to be larger than 128 MB.
47+
# AllowLargeResults=0
48+
49+
# UseDefaultLargeResultsDataset(Optional): The id of the dataset that you want to use to store temporary tables for large result sets.
50+
# UseDefaultLargeResultsDataset=1
51+
52+
# LargeResultsDataSetId(Optional): DatasetId to store temporary tables created.
53+
# This is a required setting if AllowLargeResults is set to 1.
54+
# LargeResultsDataSetId=_bqodbc_temp_tables
4955

50-
# LargeResultsDataSetId: DatasetId to store temporary tables created. This is a required setting if AllowLargeResults is set to 1.
51-
LargeResultsDataSetId=_bqodbc_temp_tables
56+
# LargeResultsTempTableExpirationTime(Optional): Time in milliseconds before the temporary tables created expire.
57+
# This is a required setting if AllowLargeResults is set to 1.
58+
# LargeResultsTempTableExpirationTime=3600000
5259

53-
# LargeResultsTempTableExpirationTime: Time in milliseconds before the temporary tables created expire. This is a required setting if AllowLargeResults is set to 1.
54-
LargeResultsTempTableExpirationTime=3600000
60+
# AllowHtapiForLargeResults(Optional): Storage read API is used to fetch results when this is enabled.
61+
# AllowHtapiForLargeResults=0

‎ci/gha/builds/release/odbcinst.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# To use this INI file, replace <INSTALLDIR> with the
2-
# directory the tarball was extracted to.
2+
# directory the zip was extracted to.
33

44
[ODBC Drivers]
55
ODBC Driver for BigQuery=Installed

0 commit comments

Comments
 (0)