Skip to content

Commit d4127f1

Browse files
authored
Merge pull request #5 from bpintea/feature/column_data_type
Column data type handling
2 parents 881f900 + dead3da commit d4127f1

14 files changed

+1289
-483
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ them in driver's libs directory, where the build script expects them by
8989
default:
9090
```
9191
somedirectory\
92-
|_x-pack-odbc
92+
|_elasticsearch-sql-odbc
9393
|_README.md
9494
|_CMakeLists.txt
9595
|_build.bat

build.bat

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ if /i not _%ARG:setup=% == _%ARG% (
7878
echo.
7979
)
8080
)
81+
REM
82+
8183

8284
REM presence of 'fetch': invoke FETCH "function"
8385
if /i not _%ARG:fetch=% == _%ARG% (
@@ -140,7 +142,9 @@ REM if TEMP var not set, set it.
140142
if exist %TEMP% goto:eof
141143
set TEMP="%USERPROFILE%\Local Settings\Temp\"
142144
if exist %TEMP% goto:eof
143-
echo WARN: no temporary directory available; using root
145+
echo.
146+
echo WARNING: no temporary directory available; using root
147+
echo.
144148
set TEMP=\
145149

146150
goto:eof
@@ -211,16 +215,23 @@ REM CLEAN function: clean up the build dir before building
211215
REM SETUP function: set-up the build environment
212216
:SETUP
213217
set RELEASE=2017
214-
set EDITION=Professional
215218
for %%e in (Enterprise, Professional, Community) do (
216219
if exist "C:\Program Files (x86)\Microsoft Visual Studio\%RELEASE%\%%e\Common7\Tools\VsDevCmd.bat" (
217220
if /i "%%e" == "Community" (
221+
echo.
218222
echo WARNING: Community edition is not licensed to build commerical projects.
223+
echo.
219224
)
220225
call "C:\Program Files (x86)\Microsoft Visual Studio\%RELEASE%\%%e\Common7\Tools\VsDevCmd.bat" -arch=!TARCH!
226+
set EDITION=%%e
221227
break
222228
)
223229
)
230+
if "%EDITION%" == "" (
231+
echo.
232+
echo WARNING: no MSVC edition found, environment not set.
233+
echo.
234+
)
224235

225236
goto:eof
226237

0 commit comments

Comments
 (0)