|
16 | 16 | // under the License. |
17 | 17 |
|
18 | 18 | // platform.h includes windows.h, so it needs to be included first |
19 | | -#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/platform.h" |
| 19 | +#include "arrow/flight/sql/odbc/odbc_impl/platform.h" |
20 | 20 |
|
21 | 21 | #include <sql.h> |
22 | 22 | #include <sqlext.h> |
|
26 | 26 | #include "arrow/flight/sql/odbc/odbc_api_internal.h" |
27 | 27 | #include "arrow/flight/sql/odbc/visibility.h" |
28 | 28 |
|
29 | | -#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/odbc_impl/odbc_connection.h" |
30 | | -#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/odbc_impl/odbc_descriptor.h" |
31 | | -#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/odbc_impl/odbc_environment.h" |
32 | | -#include "arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/odbc_impl/odbc_statement.h" |
| 29 | +#include "arrow/flight/sql/odbc/odbc_impl/odbc_connection.h" |
| 30 | +#include "arrow/flight/sql/odbc/odbc_impl/odbc_descriptor.h" |
| 31 | +#include "arrow/flight/sql/odbc/odbc_impl/odbc_environment.h" |
| 32 | +#include "arrow/flight/sql/odbc/odbc_impl/odbc_statement.h" |
33 | 33 |
|
34 | 34 | #include "arrow/util/logging.h" |
35 | 35 |
|
@@ -191,8 +191,8 @@ SQLRETURN SQL_API SQLBindCol(SQLHSTMT stmt, SQLUSMALLINT record_number, |
191 | 191 | SQLRETURN SQL_API SQLCancel(SQLHSTMT stmt) { |
192 | 192 | ARROW_LOG(DEBUG) << "SQLCancel called with stmt: " << stmt; |
193 | 193 | return ODBC::ODBCStatement::ExecuteWithDiagnostics(stmt, SQL_ERROR, [=]() { |
194 | | - throw driver::odbcabstraction::DriverException("SQLCancel is not implemented", |
195 | | - "IM001"); |
| 194 | + throw arrow::flight::sql::odbc::DriverException("SQLCancel is not implemented", |
| 195 | + "IM001"); |
196 | 196 | return SQL_ERROR; |
197 | 197 | }); |
198 | 198 | } |
@@ -252,8 +252,8 @@ SQLRETURN SQL_API SQLForeignKeys( |
252 | 252 | << ", fk_table_name: " << static_cast<const void*>(fk_table_name) |
253 | 253 | << ", fk_table_name_length: " << fk_table_name_length; |
254 | 254 | return ODBC::ODBCStatement::ExecuteWithDiagnostics(stmt, SQL_ERROR, [=]() { |
255 | | - throw driver::odbcabstraction::DriverException("SQLForeignKeysW is not implemented", |
256 | | - "IM001"); |
| 255 | + throw arrow::flight::sql::odbc::DriverException("SQLForeignKeysW is not implemented", |
| 256 | + "IM001"); |
257 | 257 | return SQL_ERROR; |
258 | 258 | }); |
259 | 259 | } |
@@ -295,8 +295,8 @@ SQLRETURN SQL_API SQLPrimaryKeys(SQLHSTMT stmt, SQLWCHAR* catalog_name, |
295 | 295 | << ", table_name: " << static_cast<const void*>(table_name) |
296 | 296 | << ", table_name_length: " << table_name_length; |
297 | 297 | return ODBC::ODBCStatement::ExecuteWithDiagnostics(stmt, SQL_ERROR, [=]() { |
298 | | - throw driver::odbcabstraction::DriverException("SQLPrimaryKeysW is not implemented", |
299 | | - "IM001"); |
| 298 | + throw arrow::flight::sql::odbc::DriverException("SQLPrimaryKeysW is not implemented", |
| 299 | + "IM001"); |
300 | 300 | return SQL_ERROR; |
301 | 301 | }); |
302 | 302 | } |
|
0 commit comments