Skip to content

Commit 3112eeb

Browse files
alinaliBQalinaliBQ
committed
Adjust searchable return value
based on GH-46920 fix
1 parent 6bc6b1a commit 3112eeb

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

‎cpp/src/arrow/flight/sql/odbc/tests/columns_test.cc‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1587,7 +1587,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLColAttributeAllTypes) {
15871587
SQL_NULLABLE, // expectedColumnNullability
15881588
10, // expectedNumPrecRadix
15891589
4, // expectedOctetLength
1590-
SQL_PRED_NONE, // expectedSearchable
1590+
SQL_SEARCHABLE, // expectedSearchable
15911591
SQL_FALSE); // expectedUnsignedColumn
15921592

15931593
checkSQLColAttribute(this->stmt, 2,
@@ -1604,7 +1604,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLColAttributeAllTypes) {
16041604
SQL_NULLABLE, // expectedColumnNullability
16051605
10, // expectedNumPrecRadix
16061606
8, // expectedOctetLength
1607-
SQL_PRED_NONE, // expectedSearchable
1607+
SQL_SEARCHABLE, // expectedSearchable
16081608
SQL_FALSE); // expectedUnsignedColumn
16091609

16101610
checkSQLColAttribute(this->stmt, 3,
@@ -1621,7 +1621,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLColAttributeAllTypes) {
16211621
SQL_NULLABLE, // expectedColumnNullability
16221622
10, // expectedNumPrecRadix
16231623
40, // expectedOctetLength
1624-
SQL_PRED_NONE, // expectedSearchable
1624+
SQL_SEARCHABLE, // expectedSearchable
16251625
SQL_FALSE); // expectedUnsignedColumn
16261626

16271627
checkSQLColAttribute(this->stmt, 4,
@@ -1638,7 +1638,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLColAttributeAllTypes) {
16381638
SQL_NULLABLE, // expectedColumnNullability
16391639
2, // expectedNumPrecRadix
16401640
8, // expectedOctetLength
1641-
SQL_PRED_NONE, // expectedSearchable
1641+
SQL_SEARCHABLE, // expectedSearchable
16421642
SQL_FALSE); // expectedUnsignedColumn
16431643

16441644
checkSQLColAttribute(this->stmt, 5,
@@ -1655,7 +1655,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLColAttributeAllTypes) {
16551655
SQL_NULLABLE, // expectedColumnNullability
16561656
2, // expectedNumPrecRadix
16571657
8, // expectedOctetLength
1658-
SQL_PRED_NONE, // expectedSearchable
1658+
SQL_SEARCHABLE, // expectedSearchable
16591659
SQL_FALSE); // expectedUnsignedColumn
16601660

16611661
checkSQLColAttribute(this->stmt, 6,
@@ -1672,7 +1672,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLColAttributeAllTypes) {
16721672
SQL_NULLABLE, // expectedColumnNullability
16731673
0, // expectedNumPrecRadix
16741674
1, // expectedOctetLength
1675-
SQL_PRED_NONE, // expectedSearchable
1675+
SQL_SEARCHABLE, // expectedSearchable
16761676
SQL_TRUE); // expectedUnsignedColumn
16771677

16781678
checkSQLColAttribute(this->stmt, 7,
@@ -1689,7 +1689,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLColAttributeAllTypes) {
16891689
SQL_NULLABLE, // expectedColumnNullability
16901690
0, // expectedNumPrecRadix
16911691
6, // expectedOctetLength
1692-
SQL_PRED_NONE, // expectedSearchable
1692+
SQL_SEARCHABLE, // expectedSearchable
16931693
SQL_TRUE); // expectedUnsignedColumn
16941694

16951695
checkSQLColAttribute(this->stmt, 8,
@@ -1706,7 +1706,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLColAttributeAllTypes) {
17061706
SQL_NULLABLE, // expectedColumnNullability
17071707
0, // expectedNumPrecRadix
17081708
6, // expectedOctetLength
1709-
SQL_PRED_NONE, // expectedSearchable
1709+
SQL_SEARCHABLE, // expectedSearchable
17101710
SQL_TRUE); // expectedUnsignedColumn
17111711

17121712
checkSQLColAttribute(this->stmt, 9,
@@ -1723,7 +1723,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLColAttributeAllTypes) {
17231723
SQL_NULLABLE, // expectedColumnNullability
17241724
0, // expectedNumPrecRadix
17251725
16, // expectedOctetLength
1726-
SQL_PRED_NONE, // expectedSearchable
1726+
SQL_SEARCHABLE, // expectedSearchable
17271727
SQL_TRUE); // expectedUnsignedColumn
17281728

17291729
this->disconnect();
@@ -1757,7 +1757,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLColAttributeAllTypesODBCVer2) {
17571757
SQL_NULLABLE, // expectedColumnNullability
17581758
10, // expectedNumPrecRadix
17591759
4, // expectedOctetLength
1760-
SQL_PRED_NONE, // expectedSearchable
1760+
SQL_SEARCHABLE, // expectedSearchable
17611761
SQL_FALSE); // expectedUnsignedColumn
17621762

17631763
checkSQLColAttribute(this->stmt, 2,
@@ -1774,7 +1774,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLColAttributeAllTypesODBCVer2) {
17741774
SQL_NULLABLE, // expectedColumnNullability
17751775
10, // expectedNumPrecRadix
17761776
8, // expectedOctetLength
1777-
SQL_PRED_NONE, // expectedSearchable
1777+
SQL_SEARCHABLE, // expectedSearchable
17781778
SQL_FALSE); // expectedUnsignedColumn
17791779

17801780
checkSQLColAttribute(this->stmt, 3,
@@ -1791,7 +1791,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLColAttributeAllTypesODBCVer2) {
17911791
SQL_NULLABLE, // expectedColumnNullability
17921792
10, // expectedNumPrecRadix
17931793
40, // expectedOctetLength
1794-
SQL_PRED_NONE, // expectedSearchable
1794+
SQL_SEARCHABLE, // expectedSearchable
17951795
SQL_FALSE); // expectedUnsignedColumn
17961796

17971797
checkSQLColAttribute(this->stmt, 4,
@@ -1808,7 +1808,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLColAttributeAllTypesODBCVer2) {
18081808
SQL_NULLABLE, // expectedColumnNullability
18091809
2, // expectedNumPrecRadix
18101810
8, // expectedOctetLength
1811-
SQL_PRED_NONE, // expectedSearchable
1811+
SQL_SEARCHABLE, // expectedSearchable
18121812
SQL_FALSE); // expectedUnsignedColumn
18131813

18141814
checkSQLColAttribute(this->stmt, 5,
@@ -1825,7 +1825,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLColAttributeAllTypesODBCVer2) {
18251825
SQL_NULLABLE, // expectedColumnNullability
18261826
2, // expectedNumPrecRadix
18271827
8, // expectedOctetLength
1828-
SQL_PRED_NONE, // expectedSearchable
1828+
SQL_SEARCHABLE, // expectedSearchable
18291829
SQL_FALSE); // expectedUnsignedColumn
18301830

18311831
checkSQLColAttribute(this->stmt, 6,
@@ -1842,7 +1842,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLColAttributeAllTypesODBCVer2) {
18421842
SQL_NULLABLE, // expectedColumnNullability
18431843
0, // expectedNumPrecRadix
18441844
1, // expectedOctetLength
1845-
SQL_PRED_NONE, // expectedSearchable
1845+
SQL_SEARCHABLE, // expectedSearchable
18461846
SQL_TRUE); // expectedUnsignedColumn
18471847

18481848
checkSQLColAttribute(this->stmt, 7,
@@ -1859,7 +1859,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLColAttributeAllTypesODBCVer2) {
18591859
SQL_NULLABLE, // expectedColumnNullability
18601860
0, // expectedNumPrecRadix
18611861
6, // expectedOctetLength
1862-
SQL_PRED_NONE, // expectedSearchable
1862+
SQL_SEARCHABLE, // expectedSearchable
18631863
SQL_TRUE); // expectedUnsignedColumn
18641864

18651865
checkSQLColAttribute(this->stmt, 8,
@@ -1876,7 +1876,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLColAttributeAllTypesODBCVer2) {
18761876
SQL_NULLABLE, // expectedColumnNullability
18771877
0, // expectedNumPrecRadix
18781878
6, // expectedOctetLength
1879-
SQL_PRED_NONE, // expectedSearchable
1879+
SQL_SEARCHABLE, // expectedSearchable
18801880
SQL_TRUE); // expectedUnsignedColumn
18811881

18821882
checkSQLColAttribute(this->stmt, 9,
@@ -1893,7 +1893,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLColAttributeAllTypesODBCVer2) {
18931893
SQL_NULLABLE, // expectedColumnNullability
18941894
0, // expectedNumPrecRadix
18951895
16, // expectedOctetLength
1896-
SQL_PRED_NONE, // expectedSearchable
1896+
SQL_SEARCHABLE, // expectedSearchable
18971897
SQL_TRUE); // expectedUnsignedColumn
18981898

18991899
this->disconnect();
@@ -1923,7 +1923,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLColAttributesAllTypesODBCVer2) {
19231923
4, // expectedColumnSize
19241924
0, // expectedColumnScale
19251925
SQL_NULLABLE, // expectedColumnNullability
1926-
SQL_PRED_NONE, // expectedSearchable
1926+
SQL_SEARCHABLE, // expectedSearchable
19271927
SQL_FALSE); // expectedUnsignedColumn
19281928

19291929
checkSQLColAttributes(this->stmt, 2,
@@ -1935,7 +1935,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLColAttributesAllTypesODBCVer2) {
19351935
8, // expectedColumnSize
19361936
0, // expectedColumnScale
19371937
SQL_NULLABLE, // expectedColumnNullability
1938-
SQL_PRED_NONE, // expectedSearchable
1938+
SQL_SEARCHABLE, // expectedSearchable
19391939
SQL_FALSE); // expectedUnsignedColumn
19401940

19411941
checkSQLColAttributes(this->stmt, 3,
@@ -1947,7 +1947,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLColAttributesAllTypesODBCVer2) {
19471947
19, // expectedColumnSize
19481948
0, // expectedColumnScale
19491949
SQL_NULLABLE, // expectedColumnNullability
1950-
SQL_PRED_NONE, // expectedSearchable
1950+
SQL_SEARCHABLE, // expectedSearchable
19511951
SQL_FALSE); // expectedUnsignedColumn
19521952

19531953
checkSQLColAttributes(this->stmt, 4,
@@ -1959,7 +1959,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLColAttributesAllTypesODBCVer2) {
19591959
8, // expectedColumnSize
19601960
0, // expectedColumnScale
19611961
SQL_NULLABLE, // expectedColumnNullability
1962-
SQL_PRED_NONE, // expectedSearchable
1962+
SQL_SEARCHABLE, // expectedSearchable
19631963
SQL_FALSE); // expectedUnsignedColumn
19641964

19651965
checkSQLColAttributes(this->stmt, 5,
@@ -1971,7 +1971,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLColAttributesAllTypesODBCVer2) {
19711971
8, // expectedColumnSize
19721972
0, // expectedColumnScale
19731973
SQL_NULLABLE, // expectedColumnNullability
1974-
SQL_PRED_NONE, // expectedSearchable
1974+
SQL_SEARCHABLE, // expectedSearchable
19751975
SQL_FALSE); // expectedUnsignedColumn
19761976

19771977
checkSQLColAttributes(this->stmt, 6,
@@ -1983,7 +1983,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLColAttributesAllTypesODBCVer2) {
19831983
1, // expectedColumnSize
19841984
0, // expectedColumnScale
19851985
SQL_NULLABLE, // expectedColumnNullability
1986-
SQL_PRED_NONE, // expectedSearchable
1986+
SQL_SEARCHABLE, // expectedSearchable
19871987
SQL_TRUE); // expectedUnsignedColumn
19881988

19891989
checkSQLColAttributes(this->stmt, 7,
@@ -1995,7 +1995,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLColAttributesAllTypesODBCVer2) {
19951995
10, // expectedColumnSize
19961996
0, // expectedColumnScale
19971997
SQL_NULLABLE, // expectedColumnNullability
1998-
SQL_PRED_NONE, // expectedSearchable
1998+
SQL_SEARCHABLE, // expectedSearchable
19991999
SQL_TRUE); // expectedUnsignedColumn
20002000

20012001
checkSQLColAttributes(this->stmt, 8,
@@ -2007,7 +2007,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLColAttributesAllTypesODBCVer2) {
20072007
12, // expectedColumnSize
20082008
3, // expectedColumnScale
20092009
SQL_NULLABLE, // expectedColumnNullability
2010-
SQL_PRED_NONE, // expectedSearchable
2010+
SQL_SEARCHABLE, // expectedSearchable
20112011
SQL_TRUE); // expectedUnsignedColumn
20122012

20132013
checkSQLColAttributes(this->stmt, 9,
@@ -2019,7 +2019,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLColAttributesAllTypesODBCVer2) {
20192019
23, // expectedColumnSize
20202020
3, // expectedColumnScale
20212021
SQL_NULLABLE, // expectedColumnNullability
2022-
SQL_PRED_NONE, // expectedSearchable
2022+
SQL_SEARCHABLE, // expectedSearchable
20232023
SQL_TRUE); // expectedUnsignedColumn
20242024

20252025
this->disconnect();

0 commit comments

Comments
 (0)