Skip to content

Commit

Permalink
Merge pull request #5 from bpintea/feature/column_data_type
Browse files Browse the repository at this point in the history
Column data type handling
  • Loading branch information
bpintea authored May 3, 2018
2 parents 928c116 + 2c6b678 commit d6a3fc7
Show file tree
Hide file tree
Showing 14 changed files with 1,289 additions and 483 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ them in driver's libs directory, where the build script expects them by
default:
```
somedirectory\
|_x-pack-odbc
|_elasticsearch-sql-odbc
|_README.md
|_CMakeLists.txt
|_build.bat
Expand Down
15 changes: 13 additions & 2 deletions build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ if /i not _%ARG:setup=% == _%ARG% (
echo.
)
)
REM


REM presence of 'fetch': invoke FETCH "function"
if /i not _%ARG:fetch=% == _%ARG% (
Expand Down Expand Up @@ -140,7 +142,9 @@ REM if TEMP var not set, set it.
if exist %TEMP% goto:eof
set TEMP="%USERPROFILE%\Local Settings\Temp\"
if exist %TEMP% goto:eof
echo WARN: no temporary directory available; using root
echo.
echo WARNING: no temporary directory available; using root
echo.
set TEMP=\

goto:eof
Expand Down Expand Up @@ -211,16 +215,23 @@ REM CLEAN function: clean up the build dir before building
REM SETUP function: set-up the build environment
:SETUP
set RELEASE=2017
set EDITION=Professional
for %%e in (Enterprise, Professional, Community) do (
if exist "C:\Program Files (x86)\Microsoft Visual Studio\%RELEASE%\%%e\Common7\Tools\VsDevCmd.bat" (
if /i "%%e" == "Community" (
echo.
echo WARNING: Community edition is not licensed to build commerical projects.
echo.
)
call "C:\Program Files (x86)\Microsoft Visual Studio\%RELEASE%\%%e\Common7\Tools\VsDevCmd.bat" -arch=!TARCH!
set EDITION=%%e
break
)
)
if "%EDITION%" == "" (
echo.
echo WARNING: no MSVC edition found, environment not set.
echo.
)

goto:eof

Expand Down
Loading

0 comments on commit d6a3fc7

Please sign in to comment.