-
Notifications
You must be signed in to change notification settings - Fork 1
/
IBchange_diff_1_0.log
1866 lines (1866 loc) · 77.5 KB
/
IBchange_diff_1_0.log
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/Builds/Gcc.lin/makefile.linux OdbcJdbc/Builds/Gcc.lin/makefile.linux
20c20,21
< #
---
> # 07-Aug-2012: Contribution by Embarcadero Technologies Inc.
> # Changes for InterBase ODBC driver
31,32c32,33
< #ARCH = x86
< #FIREBIRD=/usr/lib64/firebird
---
> ARCH = x86
> INTERBASE=/opt/interbase
40c41
< LIB_ROOT_NAME = OdbcFb
---
> LIB_ROOT_NAME = OdbcIB
74c75
< INCLUDEDIR = -I$(FBINCDIR) -I/usr/include/odbc $(INCLUDEDIR)
---
> INCLUDEDIR := -I$(FBINCDIR) -I/usr/include/odbc $(INCLUDEDIR)
97c98
< COMPFLAGS := -fPIC -m64
---
> COMPFLAGS += -fPIC -m64
100c101
< COMPFLAGS := -m32
---
> COMPFLAGS += -m32
113c114
< #ODBCJDBCSETUP = libOdbcFbS.so
---
> #ODBCJDBCSETUP = libOdbcIBS.so
202c203
< tar -C ../../Install/Linux -cf $(PACKAGE_NAME) install.sh readme.txt DriverTemplate.ini FirebirdDSNTemplate.ini InterBaseDSNTemplate.ini
---
> tar -C ../../Install/Linux -cf $(PACKAGE_NAME) install.sh readme.txt DriverTemplate.ini InterBaseDSNTemplate.ini
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/Builds/Gcc.lin/readme.linux OdbcJdbc/Builds/Gcc.lin/readme.linux
1,2c1,4
< 1)==================================================================
< For connect from unixODBC :
---
> #
> # 07-Aug-2012: Contribution by Embarcadero Technologies Inc.
> # Changes for InterBase ODBC driver
> #
4,21c6
< Into share folder :
< libOdbcFb.so
<
< 2)==================================================================
< Conrtributed by On Tuesday 28 October 2003 19:23, Yves Glodt wrote:
< > Hi,
< >
< > I downloaded the latest snapshot of the odbc/jdbc driver for Linux
< > from ibphoenix.com, but I fail to find information about the setup
< > in odbcinst.ini and odbc.ini.
< >
< > Where could I find it?
<
< ok, in case you don't have the wonderful ODBCConfig, here is what it
< takes to set it up manually (thanks to Vladimir Tsvigun):
< (On debian unstable, using the FB1.02 deb)
<
< first, untar the OdbcJdbc_Snapshot.tar.gz into /usr/lib
---
> For connect from unixODBC :
23,24c8,9
< Then you should have this in /usr/lib:
< libOdbcFb.so*
---
> Into share folder :
> libOdbcIB.so
31,34c16,19
< [Firebird]
< Description = InterBase/Firebird ODBC Driver
< Driver = /usr/lib/libOdbcFb.so
< Setup = /usr/lib/libOdbcFb.so
---
> [InterBase]
> Description = InterBase ODBC Driver
> Driver = /usr/lib/libOdbcIB.so
> Setup = /usr/lib/libOdbcIB.so
43,45c28,30
< Description = Firebird
< Driver = Firebird
< Dbname = localhost:/var/lib/firebird/data/bla.gdb
---
> Description = InterBase
> Driver = InterBase
> Dbname = localhost:/var/lib/interbase/data/bla.gdb
52,56d36
<
< regards,
< Yves
<
< 3)==================================================================
Only in OdbcJdbc/Builds: MsVc110.win
Only in OdbcJdbc/Builds/MsVc80.win: IscDbc.vcproj
Only in OdbcJdbc/Builds/MsVc80.win: OdbcIb.sln
Only in OdbcJdbc/Builds/MsVc80.win: OdbcIb.vcproj
Only in OdbcJdbc/Builds/MsVc80.win: OdbcJdbcSetup.vcproj
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/Builds/MsVc80.win/build_platform.bat OdbcJdbc/Builds/MsVc80.win/build_platform.bat
0a1,4
> ::
> :: 07-Aug-2012: Contribution by Embarcadero Technologies Inc.
> :: Changes for InterBase ODBC driver
> ::
8,15d11
< if defined USE_NMAKE (
< @echo using NMAKE
< @nmake /i /f %~dp0\makefile.%vs_ver% %1 all >> build_%1%.log 2>&1
< ) else (
< @devenv %~dp0\OdbcFb.sln /%BUILDTYPE% "%BUILDCONFIG%|%FB_TARGET_PLATFORM%" /OUT build_%1%.log 2>&1
< )
< echo.
< )
16a13
> @devenv %~dp0\OdbcIB.sln /%BUILDTYPE% "%BUILDCONFIG%|%FB_TARGET_PLATFORM%" /OUT build_%1%.log 2>&1
Only in OdbcJdbc/Builds/MsVc90.win: IscDbc.vcproj
Only in OdbcJdbc/Builds/MsVc90.win: OdbcJdbcSetup.vcproj
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/Builds/MsVc90.win/build_platform.bat OdbcJdbc/Builds/MsVc90.win/build_platform.bat
0a1,4
> ::
> :: 07-Aug-2012: Contribution by Embarcadero Technologies Inc.
> :: Changes for InterBase ODBC driver
> ::
9c13
< @devenv %~dp0\OdbcFb.sln /%BUILDTYPE% "%BUILDCONFIG%|%FB_TARGET_PLATFORM%" /OUT build_%1%.log 2>&1
---
> @devenv %~dp0\OdbcIB.sln /%BUILDTYPE% "%BUILDCONFIG%|%FB_TARGET_PLATFORM%" /OUT build_%1%.log 2>&1
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/ConnectDialog.cpp OdbcJdbc/ConnectDialog.cpp
18a19,22
> *
> * 07-Aug-2012: Contribution by Embarcadero Technologies Inc.
> * Changes for InterBase ODBC driver
> *
111c115
< BOOL CALLBACK wndprocConnectDialog(HWND hDlg, UINT message, WORD wParam, LONG lParam);
---
> BOOL CALLBACK wndprocConnectDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
158c162
< BOOL CALLBACK wndprocConnectDialog(HWND hDlg, UINT message, WORD wParam, LONG lParam)
---
> BOOL CALLBACK wndprocConnectDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
259c263
< //CAPTION "Firebird ODBC Setup"
---
> //CAPTION "InterBase ODBC Setup"
287c291
< nchar = nCopyAnsiToWideChar ( p, TEXT( _TR( IDS_DLG_TITLE_CONNECT, "Firebird ODBC Connect" ) ) );
---
> nchar = nCopyAnsiToWideChar ( p, TEXT( _TR( IDS_DLG_TITLE_CONNECT, "InterBase ODBC Connect" ) ) );
Only in OdbcJdbc: IBchange.log
Only in OdbcJdbc: IBchange_diff_1_0.log
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/Install/HtmlHelp/OdbcJdbc.hhc OdbcJdbc/Install/HtmlHelp/OdbcJdbc.hhc
12,13c12,13
< <param name="Name" value="Firebird ODBC">
< <param name="Local" value="html/FirebirdODBC.htm">
---
> <param name="Name" value="InterBase ODBC">
> <param name="Local" value="html/InterBaseODBC.htm">
18c18
< <param name="Name" value="Firebird ODBC Configuration">
---
> <param name="Name" value="InterBase ODBC Configuration">
68c68
< <param name="Name" value="About the Firebird ODBC driver">
---
> <param name="Name" value="About the InterBase ODBC driver">
72c72
< <param name="Name" value="Licensing and Copyright of the Firebird ODBC driver">
---
> <param name="Name" value="Licensing and Copyright of the InterBase ODBC driver">
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/Install/HtmlHelp/OdbcJdbc.hhk OdbcJdbc/Install/HtmlHelp/OdbcJdbc.hhk
9,10c9,10
< <param name="Name" value="Firebird ODBC">
< <param name="Local" value="html/FirebirdODBC.htm">
---
> <param name="Name" value="InterBase ODBC">
> <param name="Local" value="html/InterBaseODBC.htm">
13c13
< <param name="Name" value="Firebird ODBC Configuration">
---
> <param name="Name" value="InterBase ODBC Configuration">
17c17
< <param name="Name" value="About the Firebird ODBC driver">
---
> <param name="Name" value="About the InterBase ODBC driver">
29c29
< <param name="Name" value="Copyright Firebird ODBC">
---
> <param name="Name" value="Copyright InterBase ODBC">
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/Install/HtmlHelp/OdbcJdbc.hhp OdbcJdbc/Install/HtmlHelp/OdbcJdbc.hhp
3c3
< Compiled file=OdbcFb.chm
---
> Compiled file=OdbcIB.chm
5c5
< Default topic=html\FirebirdODBC.htm
---
> Default topic=html\InterBaseODBC.htm
9c9
< Title=Firebird ODBC
---
> Title=InterBase ODBC
13c13
< html\FirebirdODBC.htm
---
> html\InterBaseODBC.htm
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/Install/HtmlHelp/html/About.htm OdbcJdbc/Install/HtmlHelp/html/About.htm
26c26
< <TITLE>About the Firebird ODBC driver</TITLE>
---
> <TITLE>About the InterBase ODBC driver</TITLE>
31c31
< <P><A NAME="hid_about_firebird_odbc"></A><h1>About the Firebird ODBC driver</h1></P>
---
> <P><A NAME="hid_about_firebird_odbc"></A><h1>About the InterBase ODBC driver</h1></P>
33,34c33
< <P>The Firebird ODBC driver supports Firebird for Windows, FreeBSD, Solaris,
< and Linux.</P>
---
> <P>On <B>Windows</B>, InterBase ODBC driver consists of the following files:</P>
36,38c35
< <P>The Firebird ODBC driver consists of the following files:</P>
<
< <P><B>OdbcFb.dll</B> </P>
---
> <P><B>OdbcIB.dll</B> </P>
41,42c38
< - The JDBC interface, provides access to Firebird via the Firebird API. <br>
< - Install (Uninstall) the Firebird ODBC driver and configure the DSN.
---
> - Install (Uninstall) the InterBase ODBC driver and configure the DSN.
45c41
< <P><B>OdbcFb.chm</B></P>
---
> <P><B>OdbcIB.chm</B></P>
47c43
< <P>Help for the Firebird ODBC driver.</P>
---
> <P>Help for the InterBase ODBC driver.</P>
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/Install/HtmlHelp/html/Clarion.htm OdbcJdbc/Install/HtmlHelp/html/Clarion.htm
24c24
< <TITLE>Using the Firebird ODBC driver with Clarion</TITLE>
---
> <TITLE>Using the InterBase ODBC driver with Clarion</TITLE>
29c29
< <h2>Using the Firebird ODBC driver with Clarion</h2>
---
> <h2>Using the InterBase ODBC driver with Clarion</h2>
31c31
< Clarion users can work with mixed case object names in Firebird.<p>
---
> Clarion users can work with mixed case object names in InterBase.<p>
33c33
< <li>Create your database in Firebird. You can use table names like
---
> <li>Create your database in InterBase. You can use table names like
47,50d46
<
<
< <p><cite> Thanks to Jorge Andres Brugger, Vernon Godwin and Vladimir Tsvigun for
< the info contained in this document.</cite>
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/Install/HtmlHelp/html/ConfigurationParameters.htm OdbcJdbc/Install/HtmlHelp/html/ConfigurationParameters.htm
20a21,23
> * 08-Aug-2012: Contributions by Embarcadero Technologies, Inc.
> * Changes for InterBase ODBC driver
> *
26c29
< <TITLE>Firebird ODBC Configuration</TITLE>
---
> <TITLE>InterBase ODBC Configuration</TITLE>
31c34
< <P><A NAME="hid_fb_odbc_configuration"></A><h1>Firebird ODBC Configuration Parameters</h1></P>
---
> <P><A NAME="hid_fb_odbc_configuration"></A><h1>InterBase ODBC Configuration Parameters</h1></P>
41c44
< <CODE>Example</CODE>: Connect from FbEmbed or ConnectFbServer</P>
---
> <CODE>Example</CODE>: ConnectIBServer</P>
48,52d50
< <P><B>Driver</B></P>
<
< <P>Required.<BR>
< <CODE>Always</CODE>: <B>IscDbc</B></P>
<
59a58,62
> <P>Required when using InterBase ToGo edition. Optional when using Server or Desktop editions. Current possible values: <BR>
> <UL>gds32.dll - InterBase 32 bit client </UL>
> <UL>ibclient64.dll - InterBase 64 bit client </UL>
> <UL>ibtogo.dll - InterBase 32 bit ToGo </UL>
> <UL>ibtogo64.dll - InterBase 64 bit ToGo</UL>
61,63c64
< <P>Required when using the embedded Server
< Allows you to specify a command line to start the Firebird
< embedded database(fbembed) or Firebird SQL client (gds32,fbclient).</P>
---
> </P>
68c69
< The user name to be used when connecting to a Firebird database.
---
> The user name to be used when connecting to a InterBase database.
75c76
< The password to be used with the User ID when connecting to a Firebird
---
> The password to be used with the User ID when connecting to a InterBase
96c97
< Specify a transaction type when connecting to a Firebird database
---
> Specify a transaction type when connecting to a InterBase database
116c117
< 2 - Transitional flagger. InterBaseV6, and Firebird flags
---
> 2 - Transitional flagger. InterBaseV6, and InterBase flags
154a156,197
>
> <P><B>SCHEMA detail</B></P>
> <P>InterBase does not support any explicit schema names. But, the support here is for ODBC applications that might use schema names in their queries.<P>
> <UL>
> <P>"Set null field SCHEMA" or connect string USESCHEMA=0;(default)<BR>
> Examples:<BR>
> from:
> <UL>
> select COUNTRY,CURRENCY from COUNTRY
> </UL>
> to: server
> <UL>
> select COUNTRY,CURRENCY from COUNTRY
> </UL>
> </P>
>
> <P>
> "Remove SCHEMA from SQL query" or connect string USESCHEMA=1;<BR>
> Examples:<BR>
> from:
> <UL>
> select SYSDBA.COUNTRY,SYSDBA.CURRENCY from SYSDBA.COUNTRY
> </UL>
> to: server
> <UL>
> select COUNTRY,CURRENCY from COUNTRY
> </UL>
> </P>
>
> <P>
> "Use full SCHEMA" or connect string USESCHEMA=2;<BR>
> Examples:<BR>
> from:
> <UL>
> select SYSDBA.COUNTRY,SYSDBA.CURRENCY from SYSDBA.COUNTRY
> </UL>
> to: server
> <UL>
> select SYSDBA.COUNTRY,SYSDBA.CURRENCY from SYSDBA.COUNTRY
> </UL>
> </P>
>
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/Install/HtmlHelp/html/ConnectionExamples.htm OdbcJdbc/Install/HtmlHelp/html/ConnectionExamples.htm
39c39
< <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>
---
> <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.gdb;")</P>
41c41
< <P>4. Open("<B>DRIVER</B>=Firebird/InterBase(r) driver; <B>DBNAME</B>=172.17.2.10:/usr/local/db/myDb.fdb;")</P>
---
> <P>4. Open("<B>DRIVER</B>=InterBase ODBC driver; <B>DBNAME</B>=172.17.2.10:/usr/local/db/myDb.gdb;")</P>
43c43
< <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>
---
> <P>5. Open("<B>DRIVER</B>=InterBase ODBC driver; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=172.17.2.10:/usr/local/db/myDb.gdb;")</P>
47c47
< <P>6. Open("<B>DRIVER</B>=Firebird/InterBase(r) driver; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=dummy;")</P>
---
> <P>6. Open("<B>DRIVER</B>=InterBase ODBC driver; <B>UID</B>=MCSSITE; <B>PWD</B>=mcssite; <B>DBNAME</B>=dummy;")</P>
49,50c49,50
< <P>dummy is an alias derived from the Firebird <B>aliases.conf</B> file.
< If the environment variables <B>ISC_PASSWORD</B> and <B>ISC_USER</B> are set then the driver will use these. </P>
---
> <p>dummy is an alias derived from the InterBase security database (admin.ib). If the environment variables
> <B>ISC_PASSWORD</B> and <B>ISC_USER</B> are set then the driver will use these. </P>
65c65
< <B>172.17.2.10:/usr/local/db/myDb.fdb</B>
---
> <B>172.17.2.10:/usr/local/db/myDb.gdb</B>
73c73
< <B>myserver:/usr/local/db/myDb.fdb</B>
---
> <B>myserver:/usr/local/db/myDb.gdb</B>
81c81
< <B>172.17.2.10/3051:/usr/local/db/myDb.fdb</B>
---
> <B>172.17.2.10/3051:/usr/local/db/myDb.gdb</B>
84c84
< using the server IP address and especifing an alternate port, with
---
> using the server IP address and specifying an alternate port, with
90c90
< <B>myserver/3051:/usr/local/db/myDb.fdb</B>
---
> <B>myserver/3051:/usr/local/db/myDb.gdb</B>
93c93
< using the server name and especifing an alternate port, with
---
> using the server name and specifying an alternate port, with
99c99
< <B>172.17.2.10:c:\db\myDb.fdb</B>
---
> <B>172.17.2.10:c:\db\myDb.gdb</B>
108c108
< <B>myserver:c:\db\myDb.fdb</B>
---
> <B>myserver:c:\db\myDb.gdb</B>
116c116
< <B>172.17.2.10/3051:c:\db\myDb.fdb</B>
---
> <B>172.17.2.10/3051:c:\db\myDb.gdb</B>
119c119
< using the server IP address and especifing an alternate port,
---
> using the server IP address and specifying an alternate port,
125c125
< <B>myserver/3051:c:\db\myDb.fdb</B>
---
> <B>myserver/3051:c:\db\myDb.gdb</B>
128c128
< using the server name and especifing an alternate port, with a
---
> using the server name and specifying an alternate port, with a
134c134
< <B>127.0.0.1:/usr/local/db/myDb.fdb</B>
---
> <B>127.0.0.1:/usr/local/db/myDb.gdb</B>
142c142
< <B>localhost:/usr/local/db/myDb.fdb</B>
---
> <B>localhost:/usr/local/db/myDb.gdb</B>
150c150
< <B>127.0.0.1:c:\db\myDb.fdb</B>
---
> <B>127.0.0.1:c:\db\myDb.gdb</B>
158c158
< <B>localhost:c:\db\myDb.fdb</B>
---
> <B>localhost:c:\db\myDb.gdb</B>
179c179
< <B>C:\db\myDb.fdb</B>
---
> <B>C:\db\myDb.gdb</B>
182c182
< local conection on a Windows Server
---
> local connection on a Windows Server
187c187
< <B>/usr/local/db/myDb.fdb</B>
---
> <B>/usr/local/db/myDb.gdb</B>
190c190
< local conection with a file name following Unix notation
---
> local connection with a file name following Unix notation
195c195
< <P>Example alias: Using the Firebird aliases.conf e.g. set
---
> <p>Example alias: If you have a database alias setup in the security database (admin.ib) e.g. set
197c197
< dummy = c:\data\myDb.fdb</B><BR>
---
> dummy = c:\data\myDb.gdb</B><BR>
199c199
< dummy = /usr/local/db/myDb.fdb
---
> dummy = /usr/local/db/myDb.gdb
218c218
< remote conection using the server IP address and an alias
---
> remote connection using the server IP address and an alias
226c226
< remote conection using the server name and an alias
---
> remote connection using the server name and an alias
231,234d230
< <P>Note that does not matter for the client if the server are Unix or
< Windows, one should just specify the alias name, and on the aliases.conf
< you define the real file name.</P>
<
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/Install/HtmlHelp/html/Copyright.htm OdbcJdbc/Install/HtmlHelp/html/Copyright.htm
26c26
< <TITLE>Licensing and copyright of the Firebird ODBC driver</TITLE>
---
> <TITLE>Licensing and copyright of the InterBase ODBC driver</TITLE>
31c31
< <P><A NAME="hid_copyright_firebird_odbc"></A><h2>Copyright and Licensing of the Firebird ODBC driver</h2></P>
---
> <P><A NAME="hid_copyright_firebird_odbc"></A><h2>Copyright and Licensing of the InterBase ODBC driver</h2></P>
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/Install/HtmlHelp/html/Cursors.htm OdbcJdbc/Install/HtmlHelp/html/Cursors.htm
33c33
< <P>The current Firebird ODBC driver the cursors Dynamic and Keyset will be
---
> <P>The current InterBase ODBC driver the cursors Dynamic and Keyset will be
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/Install/HtmlHelp/html/Environment.htm OdbcJdbc/Install/HtmlHelp/html/Environment.htm
34c34
< The Firebird ODBC driver allows you to use multiple simultaneous connections
---
> The InterBase ODBC driver allows you to use multiple simultaneous connections
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/Install/HtmlHelp/html/Multithread.htm OdbcJdbc/Install/HtmlHelp/html/Multithread.htm
33c33
< <P>The Firebird ODBC driver provides two levels of thread protection.
---
> <P>The InterBase ODBC driver provides two levels of thread protection.
41c41
< performance, however responsibility for threading control is transferred to the Firebird
---
> performance, however responsibility for threading control is transferred to the InterBase
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/Install/HtmlHelp/html/Procedures.htm OdbcJdbc/Install/HtmlHelp/html/Procedures.htm
33c33
< <P>Firebird supports two mechanisms to call stored procedures.</P>
---
> <P>InterBase supports two mechanisms to call stored procedures.</P>
48c48
< <P>The Firebird ODBC driver determines what call to use to execute the stored procedure depending on how the stored procedure was constructed. The key to this is the usage of the word SUSPEND in the stored procedure definition.</P>
---
> <P>The InterBase ODBC driver determines what call to use to execute the stored procedure depending on how the stored procedure was constructed. The key to this is the usage of the word SUSPEND in the stored procedure definition.</P>
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/Install/HtmlHelp/html/Transactions.htm OdbcJdbc/Install/HtmlHelp/html/Transactions.htm
33c33
< <P>Firebird supports the following transaction isolation levels:</P>
---
> <P>InterBase supports the following transaction isolation levels:</P>
39c39
< <P>Firebird implements row-level locking in all cases.</P>
---
> <P>InterBase implements row-level locking in all cases.</P>
41c41
< <P>Firebird performs optimistic locking. Your transaction does not attempt to lock
---
> <P>InterBase performs optimistic locking. Your transaction does not attempt to lock
46c46
< <P>Firebird uses a unique versioning engine to achieve a granularity finer than that
---
> <P>InterBase uses a unique versioning engine to achieve a granularity finer than that
50c50
< block one another, and the Firebird database engine maintains these record
---
> block one another, and the InterBase database engine maintains these record
54c54
< Firebird databases. There is a restriction that only up to 10 databases can be used
---
> InterBase databases. There is a restriction that only up to 10 databases can be used
65c65
< <P>Firebird ODBC by default uses one transaction per connection, however programatically
---
> <P>InterBase ODBC by default uses one transaction per connection, however programatically
69c69
< different Firebird databases to carry out a two phase commit transaction across multiple
---
> different InterBase databases to carry out a two phase commit transaction across multiple
Only in OdbcFb-Source-2.0.1.152/Install: HtmlHelp.ua
Only in OdbcJdbc/Install: HtmlHelp.uk
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/Install/IDPLicense.txt OdbcJdbc/Install/IDPLicense.txt
482c482
< may obtain a copy of the License at http://www.ibphoenix.com/idpl.html. Software
---
> may obtain a copy of the License at http://www.firebirdsql.com/en/initial-developer-s-public-license-version-1-0/. Software
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/Install/Linux/DriverTemplate.ini OdbcJdbc/Install/Linux/DriverTemplate.ini
1,3c1,3
< [Firebird]
< Description = Firebird/InterBase(r) driver
< Driver = /usr/lib/libOdbcFb.so
\ No newline at end of file
---
> [InterBase]
> Description = InterBase ODBC driver
> Driver = /usr/lib/libOdbcIB.so
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/Install/Linux/InterBaseDSNTemplate.ini OdbcJdbc/Install/Linux/InterBaseDSNTemplate.ini
2,3c2,3
< Description = Firebird/InterBase(r) driver
< Driver = Firebird
---
> Description = InterBase ODBC driver
> Driver = InterBase
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/Install/Linux/install.sh OdbcJdbc/Install/Linux/install.sh
17a18,21
> # 07-Aug-2012: Contribution by Embarcadero Technologies Inc.
> # Changes for InterBase ODBC driver
> #
> #
44c48
< echo "Firebird ODBC driver for Linux. "
---
> echo "Interbase ODBC driver for Linux. "
93c97
< echo " The Firebird ODBC Driver documentation will be created "
---
> echo " The Interbase ODBC Driver documentation will be created "
195c199
< fbODBCDOCS=$fbODBCDOCS/FirebirdODBC
---
> fbODBCDOCS=$fbODBCDOCS/InterbaseODBC
237c241
< for afile in libOdbcFb.so
---
> for afile in libOdbcIB.so
327c331
< odbcinst -q -d -n Firebird || ErrorHelp 7
---
> odbcinst -q -d -n Interbase || ErrorHelp 7
340c344
< odbcinst -q -d -n Firebird || ErrorHelp 7
---
> odbcinst -q -d -n Interbase || ErrorHelp 7
342c346
< odbcinst -u -d -n Firebird || ErrorHelp 7
---
> odbcinst -u -d -n Interbase || ErrorHelp 7
355c359
< odbcinst -q -s -n TestFirebirdConnection
---
> odbcinst -q -s -n TestInterbaseConnection
363c367
< odbcinst -i -s -f FirebirdDSNTemplate.ini -l
---
> odbcinst -i -s -f InterbaseDSNTemplate.ini -l
410c414
< in $fbODBCDOCS.\n\n\nThe Firebird ODBC driver development team" | mail -s "Firebird ODBC Driver Installation" $USER@localhost
---
> in $fbODBCDOCS.\n\n\nThe Interbase ODBC driver development team" | mail -s "Interbase ODBC Driver Installation" $USER@localhost
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/Install/Linux/readme.txt OdbcJdbc/Install/Linux/readme.txt
1c1
< Firebird ODBC Driver For Linux v1.2
---
> InterBase ODBC Driver For Linux
4,5c4,5
< This is the latest version of the IBPhoenix ODBC
< driver for Firebird and InterBase. See
---
> This is the latest version of the InterBase ODBC
> driver for InterBase. See
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/Install/Win32/Installation_Readme.txt OdbcJdbc/Install/Win32/Installation_Readme.txt
1c1
< The IBPhoenix Firebird ODBC Driver Installation
---
> The InterBase ODBC Driver Installation
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/Install/Win32/MakePackage.bat OdbcJdbc/Install/Win32/MakePackage.bat
67c67
< for /f "tokens=*" %%a in ('type %temp%.\b$2.bat') do set PRODUCT_VER_STRING=2.0.1.%%a
---
> for /f "tokens=*" %%a in ('type %temp%.\b$2.bat') do set PRODUCT_VER_STRING=1.0.0.%%a
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/Install/Win32/OdbcJdbcSetup.iss OdbcJdbc/Install/Win32/OdbcJdbcSetup.iss
28a29,32
> ; 07-Aug-2012: Contribution by Embarcadero Technologies Inc.
> ; Changes for InterBase ODBC driver
> ;
> ;
49c53
< #define FIREBIRD_URL "http://www.firebirdsql.org"
---
> #define URL "http://www.embarcadero.com/"
81,82c85,86
< AppName=Firebird ODBC Driver
< AppVerName=Firebird/InterBase(r) ODBC driver {#ProductVersion}
---
> AppName=InterBase ODBC Driver
> AppVerName=InterBase ODBC driver {#ProductVersion}
85,93c89,97
< AppPublisher=Firebird Project
< AppPublisherURL={#FIREBIRD_URL}
< AppSupportURL={#FIREBIRD_URL}
< AppUpdatesURL={#FIREBIRD_URL}
<
< DefaultDirName={pf}\Firebird\Firebird_ODBC
< DefaultGroupName=Firebird\Firebird ODBC Driver
< UninstallDisplayIcon={sys}\OdbcFb.dll
< UninstallFilesDir={localappdata}\OdbcFb
---
> AppPublisher=Embarcadero Technologies, Inc.
> AppPublisherURL={#URL}
> AppSupportURL={#URL}
> AppUpdatesURL={#URL}
>
> DefaultDirName={pf}\Embarcadero\InterBase_ODBC
> DefaultGroupName=Embarcadero\InterBase ODBC Driver
> UninstallDisplayIcon={sys}\OdbcIB.dll
> UninstallFilesDir={localappdata}\OdbcIB
99c103
< OutputBaseFilename=Firebird_ODBC_{#ProductVersion}_{#PlatformTarget}{#debug_str}
---
> OutputBaseFilename=InterBase_ODBC_{#ProductVersion}_{#PlatformTarget}{#debug_str}
108c112
< WizardImageFile={#SOURCE_DOCS}\Win32\firebird-logo1.bmp
---
> ;WizardImageFile={#SOURCE_DOCS}\Win32\logo1.bmp
110c114
< WizardSmallImageFile={#SOURCE_DOCS}\Win32\firebird-logo2.bmp
---
> ;WizardSmallImageFile={#SOURCE_DOCS}\Win32\logo2.bmp
135,137c139,141
< Source: {#SOURCE_LIBS}OdbcFb.dll; DestDir: {sys}; Components: DeveloperComponent DeploymentComponent; Flags: regserver restartreplace sharedfile
< Source: {#SOURCE_LIBS}\OdbcFb.lib; DestDir: {sys}; Components: DeveloperComponent DeploymentComponent
< Source: {#SOURCE_LIBS}\OdbcFb.pdb; DestDir: {sys}; Components: DeveloperComponent DeploymentComponent
---
> Source: {#SOURCE_LIBS}OdbcIB.dll; DestDir: {sys}; Components: DeveloperComponent DeploymentComponent; Flags: regserver restartreplace sharedfile
> Source: {#SOURCE_LIBS}\OdbcIB.lib; DestDir: {sys}; Components: DeveloperComponent DeploymentComponent
> Source: {#SOURCE_LIBS}\OdbcIB.pdb; DestDir: {sys}; Components: DeveloperComponent DeploymentComponent
139,142c143,146
< Source: {#SOURCE_DOCS}\HtmlHelp\OdbcFb.chm; DestDir: {app}; Components: DeveloperComponent DeploymentComponent; Flags: ignoreversion
< Source: {#SOURCE_DOCS}\HtmlHelp\OdbcFb.chm; DestDir: {sys}; Components: DeveloperComponent DeploymentComponent; Flags: ignoreversion
< Source: {#SOURCE_DOCS}\HtmlHelp\OdbcFb.chm; DestDir: {app}; Components: DocumentationComponent; Flags: ignoreversion
< Source: {#SOURCE_DOCS}\HtmlHelp\OdbcFb.chm; DestDir: {sys}; Components: DocumentationComponent; Flags: ignoreversion
---
> Source: {#SOURCE_DOCS}\HtmlHelp\OdbcIB.chm; DestDir: {app}; Components: DeveloperComponent DeploymentComponent; Flags: ignoreversion
> Source: {#SOURCE_DOCS}\HtmlHelp\OdbcIB.chm; DestDir: {sys}; Components: DeveloperComponent DeploymentComponent; Flags: ignoreversion
> Source: {#SOURCE_DOCS}\HtmlHelp\OdbcIB.chm; DestDir: {app}; Components: DocumentationComponent; Flags: ignoreversion
> Source: {#SOURCE_DOCS}\HtmlHelp\OdbcIB.chm; DestDir: {sys}; Components: DocumentationComponent; Flags: ignoreversion
148d151
< ;Source: {#SOURCE_DOCS}\ReleaseNotes_v2.0.html; DestDir: {app}; Components: DocumentationComponent
151,153c154,156
< Source: {#SOURCE_LIBS32}OdbcFb.dll; DestDir: {syswow64}; Components: DeveloperComponent DeploymentComponent; Flags: regserver restartreplace sharedfile
< Source: {#SOURCE_LIBS32}\OdbcFb.lib; DestDir: {syswow64}; Components: DeveloperComponent DeploymentComponent
< Source: {#SOURCE_LIBS32}\OdbcFb.pdb; DestDir: {syswow64}; Components: DeveloperComponent DeploymentComponent
---
> Source: {#SOURCE_LIBS32}OdbcIB.dll; DestDir: {syswow64}; Components: DeveloperComponent DeploymentComponent; Flags: regserver restartreplace sharedfile
> Source: {#SOURCE_LIBS32}\OdbcIB.lib; DestDir: {syswow64}; Components: DeveloperComponent DeploymentComponent
> Source: {#SOURCE_LIBS32}\OdbcIB.pdb; DestDir: {syswow64}; Components: DeveloperComponent DeploymentComponent
155,156c158,159
< Source: {#SOURCE_DOCS}\HtmlHelp\OdbcFb.chm; DestDir: {syswow64}; Components: DeveloperComponent DeploymentComponent; Flags: ignoreversion
< Source: {#SOURCE_DOCS}\HtmlHelp\OdbcFb.chm; DestDir: {syswow64}; Components: DocumentationComponent; Flags: ignoreversion
---
> Source: {#SOURCE_DOCS}\HtmlHelp\OdbcIB.chm; DestDir: {syswow64}; Components: DeveloperComponent DeploymentComponent; Flags: ignoreversion
> Source: {#SOURCE_DOCS}\HtmlHelp\OdbcIB.chm; DestDir: {syswow64}; Components: DocumentationComponent; Flags: ignoreversion
161,162c164,165
< Name: {group}\Uninstall Firebird ODBC driver; Filename: {uninstallexe}; Components: DocumentationComponent; Comment: Remove Firebird ODBC Driver Documentation
< Name: {group}\Uninstall Firebird ODBC driver; Filename: {uninstallexe}; Components: DeveloperComponent; Comment: Remove Firebird ODBC Driver Library and Documentation
---
> Name: {group}\Uninstall OdbcIB ODBC driver; Filename: {uninstallexe}; Components: DocumentationComponent; Comment: Remove InterBase ODBC Driver Documentation
> Name: {group}\Uninstall InterBase ODBC driver; Filename: {uninstallexe}; Components: DeveloperComponent; Comment: Remove InterBase ODBC Driver Library and Documentation
164,170c167,172
< Name: {group}\Firebird ODBC Help; Filename: {app}\OdbcFb.chm; Components: DocumentationComponent
< Name: {group}\Firebird ODBC Help; Filename: {sys}\OdbcFb.chm; Components: DeveloperComponent
< Name: {app}\Firebird ODBC Help; Filename: {sys}\OdbcFb.chm; Components: DeveloperComponent
< #endif
< ;Name: {group}\Firebird ODBC v2.0 Release Notes; Filename: {app}\ReleaseNotes_v2.0.html; Components: DocumentationComponent
< Name: {group}\Firebird ODBC readme.txt; Filename: {app}\Readme.txt; Components: DocumentationComponent
< Name: {group}\Firebird ODBC license.txt; Filename: {app}\IDPLicense.txt; Components: DocumentationComponent
---
> Name: {group}\InterBase ODBC Help; Filename: {app}\OdbcIB.chm; Components: DocumentationComponent
> Name: {group}\InterBase ODBC Help; Filename: {sys}\OdbcIB.chm; Components: DeveloperComponent
> Name: {app}\InterBase ODBC Help; Filename: {sys}\OdbcIB.chm; Components: DeveloperComponent
> #endif
> Name: {group}\InterBase ODBC readme.txt; Filename: {app}\Readme.txt; Components: DocumentationComponent
> Name: {group}\InterBase ODBC license.txt; Filename: {app}\IDPLicense.txt; Components: DocumentationComponent
174c176
< ;Filename: {sys}\regsvr32.exe; Parameters: "/s ""{app}""\OdbcFb.dll"; Components: DeveloperComponent DeploymentComponent
---
> ;Filename: {sys}\regsvr32.exe; Parameters: "/s ""{app}""\OdbcIB.dll"; Components: DeveloperComponent DeploymentComponent
178c180
< ;Filename: {sys}\regsvr32.exe; Parameters: "/u /s ""{app}""\OdbcFb.dll"; Components: DeveloperComponent DeploymentComponent
---
> ;Filename: {sys}\regsvr32.exe; Parameters: "/u /s ""{app}""\OdbcIB.dll"; Components: DeveloperComponent DeploymentComponent
182c184
< Type: Files; Name: {sys}\OdbcFb.dll; Components: DeveloperComponent DeploymentComponent
---
> Type: Files; Name: {sys}\OdbcIB.dll; Components: DeveloperComponent DeploymentComponent
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/Install/Win32/Readme.txt OdbcJdbc/Install/Win32/Readme.txt
1c1
< Firebird ODBC Driver v2.0 Readme
---
> InterBase ODBC Driver v1.0 Readme
14c14
< Welcome to the latest release of the Firebird ODBC driver. This release
---
> Welcome to the latest release of the InterBase ODBC driver. This release
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/IscDbc/Attachment.cpp OdbcJdbc/IscDbc/Attachment.cpp
25a26,30
> * 07-Aug-2012: Contribution by Embarcadero Technologies Inc.
> * Changes for InterBase ODBC driver
> * InterBase client library support
> *
> *
47d51
< isc_info_firebird_version,
100,101c104,108
< client = "gds32.dll",
< clientDefault = "fbclient.dll";
---
> #ifdef _WIN64
> client = "ibclient64.dll";
> #else
> client = "gds32.dll";
> #endif
104d110
< clientDefault = "libfbclient.so";
351,388d356
< case isc_info_firebird_version:
< {
< int level = 0;
< char * start = p + 2;
< char * beg = start;
< char * end = beg + p [1];
<
< while ( beg < end )
< {
< if ( *beg >= '0' && *beg <= '9' )
< {
< switch ( ++level )
< {
< case 1:
< majorFb = atoi(beg);
< while( *++beg != '.' );
< break;
< case 2:
< minorFb = atoi(beg);
< while( *++beg != '.' );
< break;
< default:
< versionFb = atoi(beg);
< while( *beg >= '0' && *beg <= '9' || *beg == ' ')
< beg++;
< if ( *beg == '.' )
< break;
< beg = end;
< break;
< }
< }
< else
< beg++;
< }
< databaseProductName = "Firebird";
< }
< break;
<
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/IscDbc/Connection.h OdbcJdbc/IscDbc/Connection.h
30a31,34
> * 07-Aug-2012: Contribution by Embarcadero Technologies Inc.
> * Changes for InterBase ODBC driver
> *
> *
68c72,74
<
---
> #ifdef _WIN64
> #define NAME_CLIENT_SHARE_LIBRARY "ibclient64.dll"
> #else
70c76,77
< #define NAME_DEFAULT_CLIENT_SHARE_LIBRARY "fbclient.dll"
---
> #endif
> #define NAME_DEFAULT_CLIENT_SHARE_LIBRARY NULL
82c89
< #define NAME_DEFAULT_CLIENT_SHARE_LIBRARY "libfbclient.so"
---
> #define NAME_DEFAULT_CLIENT_SHARE_LIBRARY NULL
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/IscDbc/IscColumnPrivilegesResultSet.cpp OdbcJdbc/IscDbc/IscColumnPrivilegesResultSet.cpp
18a19,23
> *
> * 07-Aug-2012: Contribution by Embarcadero Technologies Inc.
> * Changes for InterBase ODBC driver
> * Extended Metadata name length
> *
49,53c54,58
< "cast (tbl.rdb$owner_name as varchar(31)) as table_schem,"
< "cast (rfr.rdb$relation_name as varchar(31)) as table_name,"
< "cast (rfr.rdb$field_name as varchar(31)) as column_name,"
< "cast (priv.rdb$grantor as varchar(31)) as grantor,"
< "cast (priv.rdb$user as varchar(31)) as grantee,"
---
> "cast (tbl.rdb$owner_name as varchar(67)) as table_schem,"
> "cast (rfr.rdb$relation_name as varchar(67)) as table_name,"
> "cast (rfr.rdb$field_name as varchar(67)) as column_name,"
> "cast (priv.rdb$grantor as varchar(67)) as grantor,"
> "cast (priv.rdb$user as varchar(67)) as grantee,"
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/IscDbc/IscColumnsResultSet.cpp OdbcJdbc/IscDbc/IscColumnsResultSet.cpp
31a32,36
> * 07-Aug-2012: Contribution by Embarcadero Technologies Inc.
> * Changes for InterBase ODBC driver
> * Extended Metadata name length
> *
> *
87,89c92,94
< "\tcast (tbl.rdb$owner_name as varchar(31)) as table_schem,\n" // 2 - VARCHAR
< "\tcast (rfr.rdb$relation_name as varchar(31)) as table_name,\n" // 3 - VARCHAR NOT NULL
< "\tcast (rfr.rdb$field_name as varchar(31)) as column_name,\n" // 4 - VARCHAR NOT NULL
---
> "\tcast (tbl.rdb$owner_name as varchar(67)) as table_schem,\n" // 2 - VARCHAR
> "\tcast (rfr.rdb$relation_name as varchar(67)) as table_name,\n" // 3 - VARCHAR NOT NULL
> "\tcast (rfr.rdb$field_name as varchar(67)) as column_name,\n" // 4 - VARCHAR NOT NULL
91c96
< "\tcast (fld.rdb$field_name as varchar(31)) as type_name,\n" // 6 - VARCHAR NOT NULL
---
> "\tcast (fld.rdb$field_name as varchar(67)) as type_name,\n" // 6 - VARCHAR NOT NULL
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/IscDbc/IscCrossReferenceResultSet.cpp OdbcJdbc/IscDbc/IscCrossReferenceResultSet.cpp
18a19,23
> *
> * 07-Aug-2012: Contribution by Embarcadero Technologies Inc.
> * Changes for InterBase ODBC driver
> * Extended Metadata name length
> *
60,62c65,67
< " cast (ptbl.rdb$owner_name as varchar(31)) as pktable_schem,\n" // 2
< " cast (pidx.rdb$relation_name as varchar(31)) as pktable_name,\n" // 3
< " cast (pseg.rdb$field_name as varchar(31)) as pkcolumn_name,\n" // 4
---
> " cast (ptbl.rdb$owner_name as varchar(67)) as pktable_schem,\n" // 2
> " cast (pidx.rdb$relation_name as varchar(67)) as pktable_name,\n" // 3
> " cast (pseg.rdb$field_name as varchar(67)) as pkcolumn_name,\n" // 4
64,66c69,71
< " cast (ftbl.rdb$owner_name as varchar(31)) as fktable_schem,\n"// 6
< " cast (fidx.rdb$relation_name as varchar(31)) as fktable_name,\n" // 7
< " cast (fseg.rdb$field_name as varchar(31)) as fkcolumn_name,\n" // 8
---
> " cast (ftbl.rdb$owner_name as varchar(67)) as fktable_schem,\n"// 6
> " cast (fidx.rdb$relation_name as varchar(67)) as fktable_name,\n" // 7
> " cast (fseg.rdb$field_name as varchar(67)) as fkcolumn_name,\n" // 8
70,71c75,76
< " cast (fkey.rdb$constraint_name as varchar(31)) as fk_name,\n" // 12
< " cast (refc.rdb$const_name_uq as varchar(31)) as pk_name,\n" // 13
---
> " cast (fkey.rdb$constraint_name as varchar(67)) as fk_name,\n" // 12
> " cast (refc.rdb$const_name_uq as varchar(67)) as pk_name,\n" // 13
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/IscDbc/IscDatabaseMetaData.cpp OdbcJdbc/IscDbc/IscDatabaseMetaData.cpp
19a20,23
> * 28-Jun-2013: Contribution by Embarcadero Technologies Inc.
> * Changes for InterBase ODBC driver, QC case 116886
> * Extended Metadata name length
> *
829c833
< return 31;
---
> return METADATALENGTH-1;
882c886
< return 31;
---
> return METADATALENGTH-1;
913c917
< return 31;
---
> return METADATALENGTH-1;
Only in OdbcJdbc/IscDbc: IscDbc.rc
diff -r --strip-trailing-cr OdbcFb-Source-2.0.1.152/IscDbc/IscIndexInfoResultSet.cpp OdbcJdbc/IscDbc/IscIndexInfoResultSet.cpp
27c27,34
< *
---
> *
> * 07-Aug-2012: Contribution by Embarcadero Technologies Inc.
> * Changes for InterBase ODBC driver
> * Extended Metadata name length
> *
> * 17-Sep-2012: Contribution by Embarcadero Technologies Inc., and, Alexander Potapchenko
> * Fix for http://qc.embarcadero.com/wc/qcmain.aspx?d=108767
> * Resolve Microsoft Access bug with UTF8 databases
72,73c79,80
< "\tcast(rl.rdb$owner_name as varchar(31)) as table_schem,\n" // 2
< "\tcast(rl.rdb$relation_name as varchar(31)) as table_name,\n" // 3
---
> "\tcast(rl.rdb$owner_name as varchar(67)) as table_schem,\n" // 2
> "\tcast(rl.rdb$relation_name as varchar(67)) as table_name,\n" // 3
75,76c82,83
< "\tcast(NULL as varchar(31)) as index_qualifier,\n" // 5
< "\tcast(NULL as varchar(31)) index_name,\n" // 6
---
> "\tcast(NULL as varchar(67)) as index_qualifier,\n" // 5
> "\tcast(NULL as varchar(67)) index_name,\n" // 6
79,80c86,87
< "\tcast(NULL as varchar(31)) as column_name,\n" // 9
< "\tcast(NULL as char) as asc_or_desc,\n" // 10
---
> "\tcast(NULL as varchar(67)) as column_name,\n" // 9
> "\tcast(NULL as char CHARACTER SET NONE) as asc_or_desc,\n" // 10
83c90
< "\tcast(NULL as varchar(31)) as filter_condition,\n" // 13
---
> "\tcast(NULL as varchar(67)) as filter_condition,\n" // 13
85c92
< "\tcast(NULL as varchar(31)) as constraint_type\n" // 15
---
> "\tcast(NULL as varchar(67)) as constraint_type\n" // 15
91,92c98,99
< "\tcast(tbl.rdb$owner_name as varchar(31)) as table_schem,\n" // 2
< "\tcast(idx.rdb$relation_name as varchar(31)) as table_name,\n" // 3
---
> "\tcast(tbl.rdb$owner_name as varchar(67)) as table_schem,\n" // 2
> "\tcast(idx.rdb$relation_name as varchar(67)) as table_name,\n" // 3
94,95c101,102
< "\tcast(idx.rdb$index_name as varchar(31)) as index_qualifier,\n" // 5
< "\tcast(idx.rdb$index_name as varchar(31)) as index_name,\n" // 6
---
> "\tcast(idx.rdb$index_name as varchar(67)) as index_qualifier,\n" // 5
> "\tcast(idx.rdb$index_name as varchar(67)) as index_name,\n" // 6
98,100c105,106
< "\tcast(coalesce(seg.rdb$field_name,\n"
< "substring(idx.rdb$expression_source from 1 for 31)) as varchar(31)) as column_name,\n" // 9
< "\tcast(NULL as char) as asc_or_desc,\n" // 10
---
> "\tcast(seg.rdb$field_name as varchar(67)) as column_name,\n" // 9
> "\tcast(NULL as char CHARACTER SET NONE) as asc_or_desc,\n" // 10
102c108
< "1/idx.rdb$statistics end) as integer) as cardinality,\n" // 11
---
> "cast(1/idx.rdb$statistics as integer) end) as integer) as cardinality,\n" // 11
104c110
< "\tcast(NULL as varchar(31)) as filter_condition,\n" // 13