Skip to content

Commit b010fc9

Browse files
alexpotapchenkoalexpotapchenko
committed
Firebird ODBC driver 2.1 version
1 parent 7314854 commit b010fc9

22 files changed

+194
-67
lines changed

Diff for: ‎Builds/MsVc90.win/build.bat

+2-16
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,8 @@ goto :MAIN & goto :EOF
2222
:MAIN
2323
::===========
2424

25-
if "%PROCESSOR_ARCHITECTURE%" == "AMD64" (
26-
@set PLATFORM=x64
27-
) else (
28-
if "%PROCESSOR_ARCHITEW6432%" == "AMD64" (
29-
@set PLATFORM=x64
30-
) else (
31-
@set PLATFORM=win32
32-
)
33-
)
34-
35-
if "%PLATFORM%" == "x64" (
36-
call build_platform.bat x86 %1
37-
call build_platform.bat AMD64 %1
38-
) else (
39-
call build_platform.bat x86 %1
40-
)
25+
call build_platform.bat x86 %1
26+
call build_platform.bat AMD64 %1
4127

4228
@title Build complete
4329
goto :EOF

Diff for: ‎Builds/MsVc90.win/setenvvar.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
:SET_FB_TARGET_PLATFORM
1818

1919
@if not defined FIREBIRD (
20-
set FIREBIRD=C:\Program Files\Firebird\Firebird_2_1
20+
set FIREBIRD=C:\Program Files\Firebird\Firebird_2_5
2121
)
2222

2323
:: can be x86 or x64

Diff for: ‎Builds/makefile.sources

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
ISCDBCSRC = \
22
Attachment.cpp \
33
BinaryBlob.cpp \
4+
Blob.cpp \
45
DateTime.cpp \
56
EnvShare.cpp \
67
extodbc.cpp \
@@ -51,6 +52,7 @@ ISCDBCSRC = \
5152
Values.cpp
5253

5354
ODBCJDBCSRC = \
55+
ConnectDialog.cpp \
5456
DescRecord.cpp \
5557
Main.cpp \
5658
MainUnicode.cpp \
@@ -63,10 +65,9 @@ ODBCJDBCSRC = \
6365
OdbcError.cpp \
6466
OdbcObject.cpp \
6567
OdbcStatement.cpp \
68+
ResourceManagerSink.cpp \
6669
SafeEnvThread.cpp \
67-
ConnectDialog.cpp \
68-
TransactionResourceAsync.cpp \
69-
ResourceManagerSink.cpp
70+
TransactionResourceAsync.cpp
7071

7172
ODBCJDBCSETUPSRC_LINUX = \
7273
OdbcInstGetProp.cpp

Diff for: ‎Install/HtmlHelp.es/html/ConnectionExamples.htm

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@
3838

3939
<P>3. Open("<B>DSN</B>=mcsAddress; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=172.17.2.10:/usr/local/efldata/mcsAddress.fdb;&quot;)</P>
4040

41-
<P>4. Open("<B>DRIVER</B>=Firebird/InterBase(r) driver; <B>DBNAME</B>=172.17.2.10:/usr/local/efldata/mcsAddress.fdb;&quot;)</P>
41+
<P>4. Open("<B>DRIVER</B>=Firebird ODBC driver; <B>DBNAME</B>=172.17.2.10:/usr/local/efldata/mcsAddress.fdb;&quot;)</P>
4242

43-
<P>5. Open("<B>DRIVER</B>=Firebird/InterBase(r) driver; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=172.17.2.10:/usr/local/efldata/mcsAddress.fdb;&quot;)</P>
43+
<P>5. Open("<B>DRIVER</B>=Firebird ODBC driver; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=172.17.2.10:/usr/local/efldata/mcsAddress.fdb;&quot;)</P>
4444

4545
<P>también </P>
4646

47-
<P>6. Open("<B>DRIVER</B>=Firebird/InterBase(r) driver; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=dummy;")</P>
47+
<P>6. Open("<B>DRIVER</B>=Firebird ODBC driver; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=dummy;")</P>
4848

4949
<P>dummy – es un alias derivado del archivo <B>aliases.conf</B> de Firebird.
5050
Si las variables de entorno <B>ISC_PASSWORD</B> e <B>ISC_USER</B> han sido

Diff for: ‎Install/HtmlHelp.pt/html/ConnectionExamples.htm

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@
4040

4141
<P>3. Open("<B>DSN</B>=myDb; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=172.17.2.10:/usr/local/db/myDb.fdb;")</P>
4242

43-
<P>4. Open("<B>DRIVER</B>=Firebird/InterBase(r) driver; <B>DBNAME</B>=172.17.2.10:/usr/local/db/myDb.fdb;")</P>
43+
<P>4. Open("<B>DRIVER</B>=Firebird ODBC driver; <B>DBNAME</B>=172.17.2.10:/usr/local/db/myDb.fdb;")</P>
4444

45-
<P>5. Open("<B>DRIVER</B>=Firebird/InterBase(r) driver; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=172.17.2.10:/usr/local/db/myDb.fdb;")</P>
45+
<P>5. Open("<B>DRIVER</B>=Firebird ODBC driver; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=172.17.2.10:/usr/local/db/myDb.fdb;")</P>
4646

4747
<P>também</P>
4848

49-
<P>6. Open("<B>DRIVER</B>=Firebird/InterBase(r) driver; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=dummy;")</P>
49+
<P>6. Open("<B>DRIVER</B>=Firebird ODBC driver; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=dummy;")</P>
5050

5151
<P>dummy &ndash; &eacute; um alias derivado do arquivo do Firebird
5252
<B>aliases.conf</B> . Se as vari&aacute;veis de ambiente (environment variables) <B>ISC_PASSWORD</B> e

Diff for: ‎Install/HtmlHelp.ru/html/ConnectionExamples.htm

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@
3838

3939
<P>3. Open("<B>DSN</B>=myDb; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=172.17.2.10:/usr/local/db/myDb.fdb;")</P>
4040

41-
<P>4. Open("<B>DRIVER</B>=Firebird/InterBase(r) driver; <B>DBNAME</B>=172.17.2.10:/usr/local/db/myDb.fdb;")</P>
41+
<P>4. Open("<B>DRIVER</B>=Firebird ODBC driver; <B>DBNAME</B>=172.17.2.10:/usr/local/db/myDb.fdb;")</P>
4242

43-
<P>5. Open("<B>DRIVER</B>=Firebird/InterBase(r) driver; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=172.17.2.10:/usr/local/db/myDb.fdb;")</P>
43+
<P>5. Open("<B>DRIVER</B>=Firebird ODBC driver; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=172.17.2.10:/usr/local/db/myDb.fdb;")</P>
4444

4545
<P>также </P>
4646

47-
<P>6. Open("<B>DRIVER</B>=Firebird/InterBase(r) driver; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=dummy;")</P>
47+
<P>6. Open("<B>DRIVER</B>=Firebird ODBC driver; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=dummy;")</P>
4848

4949
<P>dummy – является псевдонимом, полученным из Firebird <B>aliases.conf</B> файла.
5050
Если переменные среды <B>ISC_PASSWORD</B> и <B>ISC_USER</B> установлены, то их

Diff for: ‎Install/HtmlHelp.ru/html/CreateDatabase.htm

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
<PRE> SQLConfigDataSource( NULL,
3737
ODBC_ADD_DSN,
38-
"Firebird/InterBase(r) driver",
38+
"Firebird ODBC driver",
3939
"ODBC\0"
4040
"CREATE_DB = D:\\TestService\\test.fdb\0"
4141
"DESCRIPTION = My Firebird database\0"
@@ -62,7 +62,7 @@
6262
SWORD bufferLength;
6363

6464
SQLDriverConnect( connection, hWnd,
65-
(UCHAR*)"DRIVER=Firebird/InterBase(r) driver;"
65+
(UCHAR*)"DRIVER=Firebird ODBC driver;"
6666
"UID=SYSDBA;"
6767
"PWD=masterkey;"
6868
"PAGESIZE=8192;"
@@ -73,7 +73,7 @@
7373
<P>3) Создание базы данных с использованием ODBC API функции
7474
<B>SQLExecDirect</B>. Этот случай интересен тем, что база
7575
создается на основе уже существующего соединения(клиента).
76-
Òî åñòü íàì íå íóæíî óêàçûâàòü "DRIVER=Firebird/InterBase(r) driver;",
76+
То есть нам не нужно указывать "DRIVER=Firebird ODBC driver;",
7777
это будет взято из текущего соединения. И опять же мы не получаем
7878
доступа управления к базе. Для этого мы должны использовать
7979
<B>SQLDriverConnect</B>.

Diff for: ‎Install/HtmlHelp.ru/html/ServicesExamples.htm

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<P>Ñîçäàíèå áàçû äàííûõ
3232
<PRE> SQLConfigDataSource( NULL,
3333
ODBC_ADD_DSN,
34-
"Firebird/InterBase(r) driver",
34+
"Firebird ODBC driver",
3535
"ODBC\0"
3636
"CREATE_DB = D:\\TestService\\test.fdb\0"
3737
"DESCRIPTION = My Firebird database\0"
@@ -44,7 +44,7 @@
4444
<P>Ðåçåðâèðîâàíèå(êîïèÿ) áàçû äàííûõ
4545
<PRE> SQLConfigDataSource( NULL,
4646
ODBC_ADD_DSN,
47-
"Firebird/InterBase(r) driver",
47+
"Firebird ODBC driver",
4848
"ODBC\0"
4949
"BACKUP_DB = D:\\TestService\\test.fdb\0"
5050
"BACKUPFILE = D:\\TestService\\test.fbk\0"
@@ -54,7 +54,7 @@
5454
<P>Âîññòàíîâëåíèå áàçû äàííûõ
5555
<PRE> SQLConfigDataSource( NULL,
5656
ODBC_ADD_DSN,
57-
"Firebird/InterBase(r) driver",
57+
"Firebird ODBC driver",
5858
"ODBC\0"
5959
"RESTORE_DB = D:\\TestService\\testNew.fdb\0"
6060
"BACKUPFILE = D:\\TestService\\test.fbk\0"
@@ -65,7 +65,7 @@
6565
<P>Ðåìîíò áàçû äàííûõ
6666
<PRE> SQLConfigDataSource( NULL,
6767
ODBC_ADD_DSN,
68-
"Firebird/InterBase(r) driver",
68+
"Firebird ODBC driver",
6969
"ODBC\0"
7070
"REPAIR_DB = D:\\TestService\\test.fdb\0"
7171
"UID = SYSDBA\0"

Diff for: ‎Install/HtmlHelp.ua/html/ConnectionExamples.htm

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@
3838

3939
<P>3. Open("<B>DSN</B>=myDb; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=172.17.2.10:/usr/local/db/myDb.fdb;")</P>
4040

41-
<P>4. Open("<B>DRIVER</B>=Firebird/InterBase(r) driver; <B>DBNAME</B>=172.17.2.10:/usr/local/db/myDb.fdb;")</P>
41+
<P>4. Open("<B>DRIVER</B>=Firebird ODBC driver; <B>DBNAME</B>=172.17.2.10:/usr/local/db/myDb.fdb;")</P>
4242

43-
<P>5. Open("<B>DRIVER</B>=Firebird/InterBase(r) driver; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=172.17.2.10:/usr/local/db/myDb.fdb;")</P>
43+
<P>5. Open("<B>DRIVER</B>=Firebird ODBC driver; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=172.17.2.10:/usr/local/db/myDb.fdb;")</P>
4444

4545
<P>òàêîæ </P>
4646

47-
<P>6. Open("<B>DRIVER</B>=Firebird/InterBase(r) driver; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=dummy;")</P>
47+
<P>6. Open("<B>DRIVER</B>=Firebird ODBC driver; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=dummy;")</P>
4848

4949
<P>dummy – º ïñåâäîí³ìîì, îòðèìàíèì ç Firebird <B>aliases.conf</B> ôàéëà.
5050
ßêùî çì³íí³ ñåðåäîâèùà <B>ISC_PASSWORD</B> ³ <B>ISC_USER</B> âñòàíîâëåí³, òî ¿õ

Diff for: ‎Install/HtmlHelp.ua/html/CreateDatabase.htm

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
<PRE> SQLConfigDataSource( NULL,
3636
ODBC_ADD_DSN,
37-
"Firebird/InterBase(r) driver",
37+
"Firebird ODBC driver",
3838
"ODBC\0"
3939
"CREATE_DB = D:\\TestService\\test.fdb\0"
4040
"DESCRIPTION = My Firebird database\0"
@@ -61,7 +61,7 @@
6161
SWORD bufferLength;
6262

6363
SQLDriverConnect( connection, hWnd,
64-
(UCHAR*)"DRIVER=Firebird/InterBase(r) driver;"
64+
(UCHAR*)"DRIVER=Firebird ODBC driver;"
6565
"UID=SYSDBA;"
6666
"PWD=masterkey;"
6767
"PAGESIZE=8192;"
@@ -72,7 +72,7 @@
7272
<P>3) Ñòâîðåííÿ áàçè äàíèõ ç âèêîðèñòàííÿ ODBC API ôóíêö³¿
7373
<B>SQLExecDirect</B>. Öåé âèïàäîê ö³êàâèé òèì, ùî áàçà
7474
ñòâîðþºòüñÿ íà áàç³ âæå ³ñíóþ÷îãî ç'ºäíàííÿ. Òîáòî íàì íå ïîòð³áíî
75-
âêàçóâàòè "DRIVER=Firebird/InterBase(r) driver;", öå ³ ³íø³ íåîáõ³äí³
75+
âêàçóâàòè "DRIVER=Firebird ODBC driver;", öå ³ ³íø³ íåîáõ³äí³
7676
çíà÷åííÿ áóäóòü âçÿò³ ç àêòèâíîãî ç'ºäíàííÿ. ² çíîâó æ òàêè, ï³ñëÿ
7777
âèêîíàííÿ êîìàíäè ìè íå îòðèìàºìî äîñòóïó äî áàçè, äëÿ öüîãî
7878
ïîòð³áíî âèêîðèñòàòè <B>SQLDriverConnect</B> àáî <B>SQLConnect</B>.

Diff for: ‎Install/HtmlHelp.ua/html/ServicesExamples.htm

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<P>Ñòâîðåííÿ áàçè äàíèõ
3434
<PRE> SQLConfigDataSource( NULL,
3535
ODBC_ADD_DSN,
36-
"Firebird/InterBase(r) driver",
36+
"Firebird ODBC driver",
3737
"ODBC\0"
3838
"CREATE_DB = D:\\TestService\\test.fdb\0"
3939
"DESCRIPTION = My Firebird database\0"
@@ -46,7 +46,7 @@
4646
<P>Ðåçåðâóâàííÿ(êîï³þâàííÿ) áàçè äàíèõ
4747
<PRE> SQLConfigDataSource( NULL,
4848
ODBC_ADD_DSN,
49-
"Firebird/InterBase(r) driver",
49+
"Firebird ODBC driver",
5050
"ODBC\0"
5151
"BACKUP_DB = D:\\TestService\\test.fdb\0"
5252
"BACKUPFILE = D:\\TestService\\test.fbk\0"
@@ -56,7 +56,7 @@
5656
<P>³äíîâëåííÿ áàçè äàíèõ
5757
<PRE> SQLConfigDataSource( NULL,
5858
ODBC_ADD_DSN,
59-
"Firebird/InterBase(r) driver",
59+
"Firebird ODBC driver",
6060
"ODBC\0"
6161
"RESTORE_DB = D:\\TestService\\testNew.fdb\0"
6262
"BACKUPFILE = D:\\TestService\\test.fbk\0"
@@ -67,7 +67,7 @@
6767
<P>Ðåìîíò áàçè äàíèõ
6868
<PRE> SQLConfigDataSource( NULL,
6969
ODBC_ADD_DSN,
70-
"Firebird/InterBase(r) driver",
70+
"Firebird ODBC driver",
7171
"ODBC\0"
7272
"REPAIR_DB = D:\\TestService\\test.fdb\0"
7373
"UID = SYSDBA\0"

Diff for: ‎Install/HtmlHelp/html/ConnectionExamples.htm

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@
3838

3939
<P>3. Open("<B>DSN</B>=myDb; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=172.17.2.10:/usr/local/db/myDb.fdb;")</P>
4040

41-
<P>4. Open("<B>DRIVER</B>=Firebird/InterBase(r) driver; <B>DBNAME</B>=172.17.2.10:/usr/local/db/myDb.fdb;")</P>
41+
<P>4. Open("<B>DRIVER</B>=Firebird ODBC driver; <B>DBNAME</B>=172.17.2.10:/usr/local/db/myDb.fdb;")</P>
4242

43-
<P>5. Open("<B>DRIVER</B>=Firebird/InterBase(r) driver; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=172.17.2.10:/usr/local/db/myDb.fdb;")</P>
43+
<P>5. Open("<B>DRIVER</B>=Firebird ODBC driver; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=172.17.2.10:/usr/local/db/myDb.fdb;")</P>
4444

4545
<P>also </P>
4646

47-
<P>6. Open("<B>DRIVER</B>=Firebird/InterBase(r) driver; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=dummy;")</P>
47+
<P>6. Open("<B>DRIVER</B>=Firebird ODBC driver; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=dummy;")</P>
4848

4949
<P>dummy – is an alias derived from the Firebird <B>aliases.conf</B> file.
5050
If the environment variables <B>ISC_PASSWORD</B> and <B>ISC_USER</B> are set then the driver will use these. </P>

Diff for: ‎Install/Linux/DriverTemplate.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[Firebird]
2-
Description = Firebird/InterBase(r) driver
2+
Description = Firebird ODBC driver
33
Driver = /usr/lib/libOdbcFb.so

Diff for: ‎Install/Linux/FirebirdDSNTemplate.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[TestFirebirdConnection]
2-
Description = Firebird/InterBase(r) driver
2+
Description = Firebird ODBC driver
33
Driver = Firebird
44
Dbname = localhost:/opt/firebird/examples/employee.fdb
55
Client =

Diff for: ‎Install/Linux/InterBaseDSNTemplate.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[TestInterBaseConnection]
2-
Description = Firebird/InterBase(r) driver
2+
Description = Firebird ODBC driver
33
Driver = Firebird
44
Dbname = localhost:/opt/interbase/examples/employee.gdb
55
Client =

Diff for: ‎Install/Win32/OdbcJdbcSetup.iss

+7-7
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,10 @@ Source: {#SOURCE_LIBS}OdbcFb.dll; DestDir: {sys}; Components: DeveloperComponent
136136
Source: {#SOURCE_LIBS}\OdbcFb.lib; DestDir: {sys}; Components: DeveloperComponent DeploymentComponent
137137
Source: {#SOURCE_LIBS}\OdbcFb.pdb; DestDir: {sys}; Components: DeveloperComponent DeploymentComponent
138138
#ifdef HtmlHelp
139-
Source: {#SOURCE_DOCS}\HtmlHelp\OdbcFb.chm; DestDir: {app}; Components: DeveloperComponent DeploymentComponent; Flags: ignoreversion
140-
Source: {#SOURCE_DOCS}\HtmlHelp\OdbcFb.chm; DestDir: {sys}; Components: DeveloperComponent DeploymentComponent; Flags: ignoreversion
141-
Source: {#SOURCE_DOCS}\HtmlHelp\OdbcFb.chm; DestDir: {app}; Components: DocumentationComponent; Flags: ignoreversion
142-
Source: {#SOURCE_DOCS}\HtmlHelp\OdbcFb.chm; DestDir: {sys}; Components: DocumentationComponent; Flags: ignoreversion
139+
Source: {#SOURCE_DOCS}\HtmlHelp\OdbcFb.chm; DestDir: {app}; Components: DeveloperComponent DeploymentComponent
140+
Source: {#SOURCE_DOCS}\HtmlHelp\OdbcFb.chm; DestDir: {sys}; Components: DeveloperComponent DeploymentComponent
141+
Source: {#SOURCE_DOCS}\HtmlHelp\OdbcFb.chm; DestDir: {app}; Components: DocumentationComponent
142+
Source: {#SOURCE_DOCS}\HtmlHelp\OdbcFb.chm; DestDir: {sys}; Components: DocumentationComponent
143143
Source: {#SOURCE_DOCS}\HtmlHelp\html\*.*; DestDir: {app}\html; Components: DocumentationComponent
144144
Source: {#SOURCE_DOCS}\HtmlHelp\images\*.*; DestDir: {app}\images; Components: DocumentationComponent
145145
#endif
@@ -148,12 +148,12 @@ Source: {#SOURCE_DOCS}\IDPLicense.txt; DestDir: {app}; Components: Documentation
148148
;Source: {#SOURCE_DOCS}\ReleaseNotes_v2.0.html; DestDir: {app}; Components: DocumentationComponent
149149

150150
#if PlatformTarget == "x64"
151-
Source: {#SOURCE_LIBS32}OdbcFb.dll; DestDir: {syswow64}; Components: DeveloperComponent DeploymentComponent; Flags: regserver restartreplace sharedfile
151+
Source: {#SOURCE_LIBS32}OdbcFb.dll; DestDir: {sys}; Components: DeveloperComponent DeploymentComponent; Flags: regserver restartreplace 32bit
152152
Source: {#SOURCE_LIBS32}\OdbcFb.lib; DestDir: {syswow64}; Components: DeveloperComponent DeploymentComponent
153153
Source: {#SOURCE_LIBS32}\OdbcFb.pdb; DestDir: {syswow64}; Components: DeveloperComponent DeploymentComponent
154154
#ifdef HtmlHelp
155-
Source: {#SOURCE_DOCS}\HtmlHelp\OdbcFb.chm; DestDir: {syswow64}; Components: DeveloperComponent DeploymentComponent; Flags: ignoreversion
156-
Source: {#SOURCE_DOCS}\HtmlHelp\OdbcFb.chm; DestDir: {syswow64}; Components: DocumentationComponent; Flags: ignoreversion
155+
Source: {#SOURCE_DOCS}\HtmlHelp\OdbcFb.chm; DestDir: {syswow64}; Components: DeveloperComponent DeploymentComponent
156+
Source: {#SOURCE_DOCS}\HtmlHelp\OdbcFb.chm; DestDir: {syswow64}; Components: DocumentationComponent
157157
#endif
158158
#endif
159159

Diff for: ‎IscDbc/IscResultSet.cpp

+8-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,14 @@ IscResultSet::IscResultSet( IscStatement *iscStatement ) : IscStatementMetaData(
5454

5555
IscResultSet::~IscResultSet()
5656
{
57-
close();
57+
try
58+
{
59+
close();
60+
}
61+
catch ( std::exception &ex )
62+
{
63+
fprintf (stdout, "Failed while deleting IscResultSet (exception: \"%s\")\n", ex.what());
64+
}
5865
}
5966

6067
StatementMetaData* IscResultSet::getMetaData()

Diff for: ‎OdbcJdbc.rc

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
LANGUAGE 0x09, 0x01
2323
#pragma code_page(1252)
2424
#ifndef __MINGW32__
25-
2 24 MOVEABLE PURE "OdbcJdbc.dll.manifest"
25+
2 24 MOVEABLE PURE "OdbcFb.dll.manifest"
2626
#endif
2727
#endif //_WINDOWS
2828

@@ -54,11 +54,11 @@ BEGIN
5454
VALUE "FileDescription", FILE_DESCRIPTION_STR
5555
VALUE "FileVersion", FILE_VERSION_STR
5656
VALUE "InternalName", INTERNAL_NAME_STR
57-
VALUE "LegalCopyright", "Copyright � 2000 - 2011\0"
57+
VALUE "LegalCopyright", "Copyright � 2000 - 2018\0"
5858
VALUE "OriginalFilename", ORIGINAL_FILENAME_STR
5959
VALUE "ProductName", "Firebird Odbc Dynamic Link Library\0"
6060
VALUE "ProductVersion", PRODUCT_VERSION_STR
61-
VALUE "SpecialBuild", "v2-1-beta\0"
61+
VALUE "SpecialBuild", "v2-1\0"
6262
END
6363
END
6464
BLOCK "VarFileInfo"

Diff for: ‎OdbcJdbcSetup/ServiceClient.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ void CServiceClient::openDatabase()
168168
properties );
169169
connection->close();
170170
}
171-
catch ( std::exception &ex )
171+
catch ( std::exception )
172172
{
173173
if ( connection )
174174
connection->close();

Diff for: ‎SetupAttributes.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#define SUFFIX_BUILD "32"
3737
#endif
3838

39-
#define DRIVER_FULL_NAME "Firebird/InterBase(r) driver"
39+
#define DRIVER_FULL_NAME "Firebird ODBC driver"
4040
#define DRIVER_NAME "OdbcFb"
4141
#define DEFAULT_DRIVER "IscDbc"
4242

Diff for: ‎TestInstall/TestInstall.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ extern BOOL INSTAPI ConfigDSN(HWND hWnd,
88

99
int main (int argc, char **argv)
1010
{
11-
ConfigDSN (NULL, ODBC_CONFIG_DSN, "Firebird/InterBase(r) driver", "");
11+
ConfigDSN (NULL, ODBC_CONFIG_DSN, "Firebird ODBC driver", "");
1212

1313
return 0;
1414
}

0 commit comments

Comments
 (0)