Skip to content

Commit 245a897

Browse files
committed
Advertise TIME as supported literal. Fix typos (#210)
This commit enables advertising the TIME literals support. It also fixes a typo and rephrases the text of a couple of tooltips. The commit also reverts an integration test app incorrect change that alters the destination variable of a couple of options. (cherry picked from commit 2c56a2f)
1 parent 6ba9306 commit 245a897

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

driver/defs.h

+5-4
Original file line numberDiff line numberDiff line change
@@ -368,14 +368,15 @@
368368
SQL_SDF_CURRENT_TIMESTAMP | SQL_SDF_CURRENT_DATE | SQL_SDF_CURRENT_TIME)
369369
/*
370370
* SQL92 datetime literals support:
371-
* - supported: TIMESTAMP, INTERVAL: YEAR/MONTH/DAY/HOUR/MINUTE/SECOND/
372-
* YEAR_TO_MONTH/DAY_TO_HOUR/DAY_TO_MINUTE/DAY_TO_SECOND/HOUR_TO_MINUTE/
373-
* HOUR_TO_SECOND/MINUTE_TO_SECOND.
374-
* - not supported: TIME.
371+
* - supported: TIMESTAMP, DATE, TIME, INTERVAL: YEAR/MONTH/DAY/HOUR/MINUTE/
372+
* SECOND/YEAR_TO_MONTH/DAY_TO_HOUR/DAY_TO_MINUTE/DAY_TO_SECOND/
373+
* HOUR_TO_MINUTE/HOUR_TO_SECOND/MINUTE_TO_SECOND.
374+
* - not supported: none.
375375
*/
376376
#define ESODBC_DATETIME_LITERALS (0LU | \
377377
SQL_DL_SQL92_TIMESTAMP | \
378378
SQL_DL_SQL92_DATE | \
379+
SQL_DL_SQL92_TIME | \
379380
SQL_DL_SQL92_INTERVAL_YEAR | \
380381
SQL_DL_SQL92_INTERVAL_MONTH | \
381382
SQL_DL_SQL92_INTERVAL_DAY | \

dsneditor/EsOdbcDsnEditor/DSNEditorForm.Designer.cs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dsneditor/EsOdbcDsnEditor/DSNEditorForm.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ public DsnEditorForm(
167167
checkBoxMultiFieldLenient.Checked = !noes.Contains(Builder.ContainsKey("MultiFieldLenient") ? Builder["MultiFieldLenient"].ToString().StripBraces() : "yes");
168168
checkBoxIndexIncludeFrozen.Checked = !noes.Contains(Builder.ContainsKey("IndexIncludeFrozen") ? Builder["IndexIncludeFrozen"].ToString().StripBraces() : "no");
169169

170-
toolTipTimeout.SetToolTip(numericUpDownTimeout, "The maximum number of seconds a request to the server can take. The value 0 disables disables the timeout.");
171-
toolTipFetchSize.SetToolTip(numericUpDownFetchSize, "The maximum number of rows that Elasticsearch SQL server should send the driver for one page.");
170+
toolTipTimeout.SetToolTip(numericUpDownTimeout, "The maximum number of seconds for a request to the server. The value 0 disables the timeout.");
171+
toolTipFetchSize.SetToolTip(numericUpDownFetchSize, "The maximum number of rows that Elasticsearch SQL server should send back to the driver for one page.");
172172
toolTipBodySize.SetToolTip(numericUpDownBodySize, "The maximum number of megabytes that the driver will accept for one page.");
173173
toolTipFloatsFormat.SetToolTip(comboBoxFloatsFormat, "How should the floating point numbers be printed, when these are converted to string by the driver.");
174174
toolTipDataEncoding.SetToolTip(comboBoxDataEncoding, "How should the data between the server and the driver be encoded as.");

0 commit comments

Comments
 (0)