Menu
▾
▴
[JVCL-Checkins] dev/JVCL3/run JvUIB.pas,1.23,1.24 JvUIBase.pas,1.20,1.21 JvUIBConst.pas,1.15,1.16 JvUIBDataSet.pas,1.15,1.16 JvUIBError.pas,1.14,1.15 JvUIBLib.pas,1.26,1.27 JvUIBMetaData.pas,1.16,1.17 - no message
Update of /cvsroot/jvcl/dev/JVCL3/run In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2876 Modified Files: JvUIB.pas JvUIBase.pas JvUIBConst.pas JvUIBDataSet.pas JvUIBError.pas JvUIBLib.pas JvUIBMetaData.pas Log Message: no message Index: JvUIBError.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvUIBError.pas,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** JvUIBError.pas 18 Jan 2004 13:38:51 -0000 1.14 --- JvUIBError.pas 27 Jan 2004 23:32:41 -0000 1.15 *************** *** 5,9 **** { } { The contents of this file are subject to the Mozilla Public License Version } ! { 1.0 (the "License"); you may not use this file except in compliance with the } { License. You may obtain a copy of the License at http://www.mozilla.org/MPL/ } { } --- 5,9 ---- { } { The contents of this file are subject to the Mozilla Public License Version } ! { 1.1 (the "License"); you may not use this file except in compliance with the } { License. You may obtain a copy of the License at http://www.mozilla.org/MPL/ } { } *************** *** 12,20 **** { the specific language governing rights and limitations under the License. } { } - { The Original Code is JvUIBError.pas. } - { } { The Initial Developer of the Original Code is documented in the accompanying } { help file JCL.chm. Portions created by these individuals are Copyright (C) } ! { 2000 of these individuals. } { } { Interbase & FireBird Error Codes } --- 12,18 ---- { the specific language governing rights and limitations under the License. } { } { The Initial Developer of the Original Code is documented in the accompanying } { help file JCL.chm. Portions created by these individuals are Copyright (C) } ! { 2003 of these individuals. } { } { Interbase & FireBird Error Codes } *************** *** 25,38 **** {******************************************************************************} {$I jvcl.inc} {$I JvUIB.inc} - unit JvUIBError; - interface - {$IFDEF USE_IBERROR_H} ! (*$HPPEMIT '#include <iberror.h>'*) ! {$ENDIF USE_IBERROR_H} //***********************/ --- 23,34 ---- {******************************************************************************} + unit JvUIBError; {$I jvcl.inc} {$I JvUIB.inc} interface {$IFDEF USE_IBERROR_H} ! (*$HPPEMIT '#include<iberror.h>' *) ! {$ENDIF} //***********************/ *************** *** 80,88 **** isc_arg_warning = 18; (* warning argument *) {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_arg_warning} {$ENDIF} ! ! {$IFDEF IB7_UP} isc_arg_sql = 19; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_arg_sql} {$ENDIF} ! {$ENDIF IB7_UP} isc_arith_except = 335544321; --- 76,83 ---- isc_arg_warning = 18; (* warning argument *) {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_arg_warning} {$ENDIF} ! {$IFDEF IB7_UP} isc_arg_sql = 19; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_arg_sql} {$ENDIF} ! {$ENDIF IB7_UP} isc_arith_except = 335544321; *************** *** 1075,1079 **** {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_service_not_supported} {$ENDIF} ! {$IFDEF FB102ORYF867} isc_generator_name = 335544815; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_generator_name} {$ENDIF} --- 1070,1074 ---- {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_service_not_supported} {$ENDIF} ! {$IFDEF FB102ORYF867} isc_generator_name = 335544815; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_generator_name} {$ENDIF} *************** *** 1086,1092 **** isc_io_32bit_exceeded_err = 335544819; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_io_32bit_exceeded_err} {$ENDIF} ! {$ENDIF FB102ORYF867} ! {$IFDEF FB15_UP} isc_invalid_savepoint = 335544820; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_invalid_savepoint} {$ENDIF} --- 1081,1087 ---- isc_io_32bit_exceeded_err = 335544819; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_io_32bit_exceeded_err} {$ENDIF} ! {$ENDIF FB102ORYF867} ! {$IFDEF FB15_UP} isc_invalid_savepoint = 335544820; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_invalid_savepoint} {$ENDIF} *************** *** 1113,1119 **** isc_conf_access_denied = 335544831; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_conf_access_denied} {$ENDIF} ! {$ENDIF FB15_UP} ! {$IFDEF IB71_UP} isc_savepoint_err = 335544815; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_savepoint_err} {$ENDIF} --- 1108,1114 ---- isc_conf_access_denied = 335544831; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_conf_access_denied} {$ENDIF} ! {$ENDIF FB15_UP} ! {$IFDEF IB71_UP} isc_savepoint_err = 335544815; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_savepoint_err} {$ENDIF} *************** *** 1122,1126 **** isc_udf_name = 335544817; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_udf_name} {$ENDIF} ! {$ENDIF IB71_UP} isc_gfix_db_name = 335740929; --- 1117,1121 ---- isc_udf_name = 335544817; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_udf_name} {$ENDIF} ! {$ENDIF IB71_UP} isc_gfix_db_name = 335740929; *************** *** 1180,1189 **** isc_gfix_opt_SQL_dialect = 335741039; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_gfix_opt_SQL_dialect} {$ENDIF} ! ! {$IFDEF IB7_UP} isc_gfix_commits_opt = 335741041; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_gfix_commits_opt} {$ENDIF} ! {$ENDIF IB7_UP} ! isc_dsql_dbkey_from_non_table = 336003074; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_dsql_dbkey_from_non_table} {$ENDIF} --- 1175,1182 ---- isc_gfix_opt_SQL_dialect = 335741039; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_gfix_opt_SQL_dialect} {$ENDIF} ! {$IFDEF IB7_UP} isc_gfix_commits_opt = 335741041; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_gfix_commits_opt} {$ENDIF} ! {$ENDIF IB7_UP} isc_dsql_dbkey_from_non_table = 336003074; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_dsql_dbkey_from_non_table} {$ENDIF} *************** *** 1207,1228 **** {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_dsql_warn_precision_ambiguous2} {$ENDIF} ! {$IFDEF FB102ORYF867} isc_dsql_ambiguous_field_name = 336003085; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_dsql_ambiguous_field_name} {$ENDIF} isc_dsql_udf_return_pos_err = 336003086; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_dsql_udf_return_pos_err} {$ENDIF} ! {$ENDIF FB102ORYF867} ! {$IFDEF FB15_UP} isc_dsql_invalid_label = 336003087; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_dsql_invalid_label} {$ENDIF} isc_dsql_datatypes_not_comparable = 336003088; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_dsql_datatypes_not_comparable} {$ENDIF} ! {$ENDIF FB15_UP} ! {$IFDEF IB65_UP} isc_dsql_rows_ties_err = 336003085; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_dsql_rows_ties_err} {$ENDIF} ! {$ENDIF FB15_UP} isc_dyn_role_does_not_exist = 336068796; --- 1200,1221 ---- {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_dsql_warn_precision_ambiguous2} {$ENDIF} ! {$IFDEF FB102ORYF867} isc_dsql_ambiguous_field_name = 336003085; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_dsql_ambiguous_field_name} {$ENDIF} isc_dsql_udf_return_pos_err = 336003086; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_dsql_udf_return_pos_err} {$ENDIF} ! {$ENDIF FB102ORYF867} ! {$IFDEF FB15_UP} isc_dsql_invalid_label = 336003087; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_dsql_invalid_label} {$ENDIF} isc_dsql_datatypes_not_comparable = 336003088; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_dsql_datatypes_not_comparable} {$ENDIF} ! {$ENDIF} ! {$IFDEF IB65_UP} isc_dsql_rows_ties_err = 336003085; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_dsql_rows_ties_err} {$ENDIF} ! {$ENDIF FB15_UP} isc_dyn_role_does_not_exist = 336068796; *************** *** 1259,1273 **** {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_dyn_dtype_conv_invalid} {$ENDIF} ! {$IFDEF FB102ORYF867} isc_dyn_zero_len_id = 336068820; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_dyn_zero_len_id} {$ENDIF} ! {$ENDIF FB102ORYF867} ! {$IFDEF IB71_UP} isc_dyn_gen_does_not_exist = 336068820; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_dyn_gen_does_not_exist} {$ENDIF} isc_dyn_delete_generator_failed = 336068821; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_dyn_delete_generator_failed} {$ENDIF} ! {$ENDIF IB71_UP} isc_gbak_unknown_switch = 336330753; --- 1252,1266 ---- {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_dyn_dtype_conv_invalid} {$ENDIF} ! {$IFDEF FB102ORYF867} isc_dyn_zero_len_id = 336068820; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_dyn_zero_len_id} {$ENDIF} ! {$ENDIF FB102ORYF867} ! {$IFDEF IB71_UP} isc_dyn_gen_does_not_exist = 336068820; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_dyn_gen_does_not_exist} {$ENDIF} isc_dyn_delete_generator_failed = 336068821; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_dyn_delete_generator_failed} {$ENDIF} ! {$ENDIF IB71_UP} isc_gbak_unknown_switch = 336330753; *************** *** 1436,1450 **** {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_gbak_mode_req} {$ENDIF} ! {$IFDEF FB102ORYF867} isc_gbak_just_data = 336331033; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_gbak_just_data} {$ENDIF} isc_gbak_data_only = 336331034; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_gbak_data_only} {$ENDIF} ! {$ENDIF FB102ORYF867} ! {$IFDEF IB71_UP} isc_gbak_validate_restore = 336331034; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_gbak_validate_restore} {$ENDIF} ! {$ENDIF IB71_UP} isc_gsec_cant_open_db = 336723983; --- 1429,1443 ---- {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_gbak_mode_req} {$ENDIF} ! {$IFDEF FB102ORYF867} isc_gbak_just_data = 336331033; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_gbak_just_data} {$ENDIF} isc_gbak_data_only = 336331034; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_gbak_data_only} {$ENDIF} ! {$ENDIF FB102ORYF867} ! {$IFDEF IB71_UP} isc_gbak_validate_restore = 336331034; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_gbak_validate_restore} {$ENDIF} ! {$ENDIF IB71_UP} isc_gsec_cant_open_db = 336723983; *************** *** 1552,1557 **** isc_license_eval_exists = 336789563; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_license_eval_exists} {$ENDIF} ! ! {$IFDEF IB7_UP} isc_smp_cpu_license = 336789570; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_smp_cpu_license} {$ENDIF} --- 1545,1549 ---- isc_license_eval_exists = 336789563; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_license_eval_exists} {$ENDIF} ! {$IFDEF IB7_UP} isc_smp_cpu_license = 336789570; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_smp_cpu_license} {$ENDIF} *************** *** 1560,1565 **** isc_dev_only_full_server_licenses = 336789572; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_dev_only_full_server_licenses} {$ENDIF} ! {$ENDIF IB7_UP} ! isc_gstat_unknown_switch = 336920577; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_gstat_unknown_switch} {$ENDIF} --- 1552,1556 ---- isc_dev_only_full_server_licenses = 336789572; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_dev_only_full_server_licenses} {$ENDIF} ! {$ENDIF IB7_UP} isc_gstat_unknown_switch = 336920577; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_gstat_unknown_switch} {$ENDIF} *************** *** 1577,1624 **** {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_gstat_sysmemex} {$ENDIF} ! {$IFDEF FB102} isc_err_max = 699; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_err_max} {$ENDIF} ! {$ENDIF FB102} ! {$IFDEF FB103} isc_err_max = 699; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_err_max} {$ENDIF} ! {$ENDIF FB103} ! {$IFDEF FB15} isc_err_max = 713; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_err_max} {$ENDIF} ! {$ENDIF FB15} ! {$IFDEF YF867} isc_err_max = 699; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_err_max} {$ENDIF} ! {$ENDIF YF867} ! {$IFDEF IB601} isc_err_max = 689; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_err_max} {$ENDIF} ! {$ENDIF IB601} ! {$IFDEF IB602} isc_err_max = 689; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_err_max} {$ENDIF} ! {$ENDIF IB602} ! {$IFDEF IB65} isc_err_max = 690; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_err_max} {$ENDIF} ! {$ENDIF IB65} ! {$IFDEF IB7} isc_err_max = 694; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_err_max} {$ENDIF} ! {$ENDIF IB7} ! {$IFDEF IB71} isc_err_max = 700; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_err_max} {$ENDIF} ! {$ENDIF IB71} implementation --- 1568,1615 ---- {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_gstat_sysmemex} {$ENDIF} ! {$IFDEF FB102} isc_err_max = 699; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_err_max} {$ENDIF} ! {$ENDIF FB102} ! {$IFDEF FB103} isc_err_max = 699; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_err_max} {$ENDIF} ! {$ENDIF FB103} ! {$IFDEF FB15} isc_err_max = 713; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_err_max} {$ENDIF} ! {$ENDIF FB15} ! {$IFDEF YF867} isc_err_max = 699; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_err_max} {$ENDIF} ! {$ENDIF YF867} ! {$IFDEF IB601} isc_err_max = 689; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_err_max} {$ENDIF} ! {$ENDIF IB601} ! {$IFDEF IB602} isc_err_max = 689; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_err_max} {$ENDIF} ! {$ENDIF IB602} ! {$IFDEF IB65} isc_err_max = 690; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_err_max} {$ENDIF} ! {$ENDIF IB65} ! {$IFDEF IB7} isc_err_max = 694; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_err_max} {$ENDIF} ! {$ENDIF IB7} ! {$IFDEF IB71} isc_err_max = 700; {$IFDEF USE_IBERROR_H} {$EXTERNALSYM isc_err_max} {$ENDIF} ! {$ENDIF IB71} implementation Index: JvUIB.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvUIB.pas,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** JvUIB.pas 18 Jan 2004 13:38:50 -0000 1.23 --- JvUIB.pas 27 Jan 2004 23:32:41 -0000 1.24 *************** *** 1,4 **** {******************************************************************************} - { } { UNIFIED INTERBASE (UIB) } { } --- 1,3 ---- *************** *** 6,10 **** { } { The contents of this file are subject to the Mozilla Public License Version } ! { 1.0 (the "License"); you may not use this file except in compliance with the } [...4348 lines suppressed...] ! // (rom) added inherited Create ! inherited Create; FObjects := ALLOBjects; FTables := ALLTables; --- 2958,2966 ---- end; ! { TMetaDataOptions } constructor TMetaDataOptions.Create; begin ! inherited; FObjects := ALLOBjects; FTables := ALLTables; *************** *** 3109,3111 **** end. - --- 2972,2973 ---- Index: JvUIBConst.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvUIBConst.pas,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** JvUIBConst.pas 20 Jan 2004 05:06:15 -0000 1.15 --- JvUIBConst.pas 27 Jan 2004 23:32:41 -0000 1.16 *************** *** 5,9 **** { } { The contents of this file are subject to the Mozilla Public License Version } ! { 1.0 (the "License"); you may not use this file except in compliance with the } { License. You may obtain a copy of the License at http://www.mozilla.org/MPL/ } { } --- 5,9 ---- { } { The contents of this file are subject to the Mozilla Public License Version } ! { 1.1 (the "License"); you may not use this file except in compliance with the } { License. You may obtain a copy of the License at http://www.mozilla.org/MPL/ } { } *************** *** 12,20 **** { the specific language governing rights and limitations under the License. } { } - { The Original Code is JvUIBLib.pas. } - { } { The Initial Developer of the Original Code is documented in the accompanying } { help file JCL.chm. Portions created by these individuals are Copyright (C) } ! { 2000 of these individuals. } { } { UIB Constants } --- 12,18 ---- { the specific language governing rights and limitations under the License. } { } { The Initial Developer of the Original Code is documented in the accompanying } { help file JCL.chm. Portions created by these individuals are Copyright (C) } ! { 2003 of these individuals. } { } { UIB Constants } *************** *** 71,80 **** ALLProcedures = [OIDProcFieldIn, OIDProcFieldOut]; ALLUDFs = [OIDUDFField]; ! {$IFDEF LINUX} BreakLine = #10; ! {$ELSE} BreakLine = #13; ! {$ENDIF LINUX} ! // (rom) this is wrong for Windows #13#10 is correct NewLine = BreakLine + BreakLine; --- 69,77 ---- ALLProcedures = [OIDProcFieldIn, OIDProcFieldOut]; ALLUDFs = [OIDUDFField]; ! {$IFDEF LINUX} BreakLine = #10; ! {$ELSE} BreakLine = #13; ! {$ENDIF} NewLine = BreakLine + BreakLine; *************** *** 118,123 **** EUIB_UNEXPECTEDCASTERROR = 'Unexpected cast error.'; - EUIB_ERRCODEFMT = 'Error Code: %d'; - // ORB Errors EJvUIB_CantConnect = 'Can''t connect to server.'; --- 115,118 ---- *************** *** 164,169 **** EUIB_UNEXPECTEDCASTERROR = 'Unexpected cast error.'; - EUIB_ERRCODEFMT = 'Error Code: %d'; - // ORB Errors EJvUIB_CantConnect = 'Impossible de se connecter au serveur.'; --- 159,162 ---- *************** *** 210,215 **** EUIB_UNEXPECTEDCASTERROR = 'Unexpected cast error.'; - EUIB_ERRCODEFMT = 'Error Code: %d'; - // ORB Errors EJvUIB_CantConnect = 'Nelze pøipojit server.'; --- 203,206 ---- *************** *** 249,260 **** EUIB_DOMAINSTRNOTFOUND = 'Domäne %s nicht gefunden.'; EUIB_PROCSTRNOTFOUND = 'Prozedur %s nicht gefunden.'; ! EUIB_CACHEDFETCHNOTSET = 'CachedFetch property ist nicht auf True gesetzt.'; ! EUIB_PARSESQLDIALECT = 'Parse-Fehler: SET SQL DIALECT'; ! EUIB_PARSESETNAMES = 'Parse-Fehler: SET NAMES'; ! EUIB_BADAUTODLL = '"SET AUTODDL" Parameter muss "ON" oder "OFF" lauten.'; ! EUIB_CHARSETNOTFOUND = 'CharacterSet %s nicht gefunden.'; ! EUIB_UNEXPECTEDCASTERROR = 'Unerwarteter Fehler bei Typumwandlung.'; ! ! EUIB_ERRCODEFMT = 'Fehler-Code: %d'; // ORB Errors --- 240,249 ---- EUIB_DOMAINSTRNOTFOUND = 'Domäne %s nicht gefunden.'; EUIB_PROCSTRNOTFOUND = 'Prozedur %s nicht gefunden.'; ! EUIB_CACHEDFETCHNOTSET = 'CachedFetch property not set to True.'; ! EUIB_PARSESQLDIALECT = 'Parse error: SET SQL DIALECT'; ! EUIB_PARSESETNAMES = 'Parse error: SET NAMES'; ! EUIB_BADAUTODLL = '"SET AUTODDL" must be "ON" or "OFF"'; ! EUIB_CHARSETNOTFOUND = 'CharacterSet %s not found.'; ! EUIB_UNEXPECTEDCASTERROR = 'Unexpected cast error.'; // ORB Errors *************** *** 302,307 **** EUIB_UNEXPECTEDCASTERROR = 'Unexpected cast error.'; - EUIB_ERRCODEFMT = 'Error Code: %d'; - // ORB Errors EJvUIB_CantConnect = 'Íå ìîãó óñòàíîâèòü ñîåäèíåíèå ñ ñåðâåðîì.'; --- 291,294 ---- *************** *** 311,316 **** {$IFDEF UIBLANG_ES} ! sUIBTrue = 'Si'; ! sUIBFalse = 'No'; // UIB Errors --- 298,303 ---- {$IFDEF UIBLANG_ES} ! sUIBTrue = 'Si'; ! sUIBFalse = 'No'; // UIB Errors *************** *** 348,353 **** EUIB_UNEXPECTEDCASTERROR = 'Unexpected cast error.'; - EUIB_ERRCODEFMT = 'Error Code: %d'; - // ORB Errors EJvUIB_CantConnect = 'Imposible conectar con el servidor.'; --- 335,338 ---- Index: JvUIBLib.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvUIBLib.pas,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** JvUIBLib.pas 20 Jan 2004 05:06:15 -0000 1.26 --- JvUIBLib.pas 27 Jan 2004 23:32:41 -0000 1.27 *************** *** 5,9 **** { } { The contents of this file are subject to the Mozilla Public License Version } ! { 1.0 (the "License"); you may not use this file except in compliance with the } { License. You may obtain a copy of the License at http://www.mozilla.org/MPL/ } { } --- 5,9 ---- { } { The contents of this file are subject to the Mozilla Public License Version } ! { 1.1 (the "License"); you may not use this file except in compliance with the } { License. You may obtain a copy of the License at http://www.mozilla.org/MPL/ } [...10097 lines suppressed...] ! freemem(FXSQLDA.sqlvar[i].sqldata); ! freemem(FXSQLDA.sqlvar[i].sqlind); ! // don't free shared pointers ! for j := i + 1 to FXSQLDA.sqln - 1 do ! if (FXSQLDA.sqlvar[i].ID = FXSQLDA.sqlvar[j].ID) then ! begin ! FXSQLDA.sqlvar[j].sqldata := nil; ! FXSQLDA.sqlvar[j].sqlind := nil; ! end; ! end; end; + FXSQLDA.sqln := 0; + FXSQLDA.sqld := 0; + ReallocMem(FXSQLDA, XSQLDA_LENGTH(0)); + FParamCount := 0; end; end. + Index: JvUIBMetaData.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvUIBMetaData.pas,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** JvUIBMetaData.pas 17 Jan 2004 07:52:28 -0000 1.16 --- JvUIBMetaData.pas 27 Jan 2004 23:32:41 -0000 1.17 *************** *** 1,4 **** {******************************************************************************} - { } { UNIFIED INTERBASE (UIB) } { } --- 1,3 ---- *************** *** 6,10 **** { } { The contents of this file are subject to the Mozilla Public License Version } ! { 1.0 (the "License"); you may not use this file except in compliance with the } { License. You may obtain a copy of the License at http://www.mozilla.org/MPL/ } { } --- 5,9 ---- { } { The contents of this file are subject to the Mozilla Public License Version } ! { 1.1 (the "License"); you may not use this file except in compliance with the } { License. You may obtain a copy of the License at http://www.mozilla.org/MPL/ } { } *************** *** 15,19 **** { The Initial Developer of the Original Code is documented in the accompanying } { help file JCL.chm. Portions created by these individuals are Copyright (C) } ! { 2000 of these individuals. } { } { Unit owner: Henri Gourvest } --- 14,18 ---- { The Initial Developer of the Original Code is documented in the accompanying } { help file JCL.chm. Portions created by these individuals are Copyright (C) } ! { 2003 of these individuals. } { } { Unit owner: Henri Gourvest } Index: JvUIBDataSet.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvUIBDataSet.pas,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** JvUIBDataSet.pas 18 Jan 2004 13:38:51 -0000 1.15 --- JvUIBDataSet.pas 27 Jan 2004 23:32:41 -0000 1.16 *************** *** 1,4 **** {******************************************************************************} - { } { UNIFIED INTERBASE (UIB) } { } --- 1,3 ---- *************** *** 6,10 **** { } { The contents of this file are subject to the Mozilla Public License Version } ! { 1.0 (the "License"); you may not use this file except in compliance with the } [...1035 lines suppressed...] *************** *** 767,772 **** Result := True; end; ! ! {$ENDIF COMPILER5_UP} procedure TJvUIBCustomDataSet.SetDatabase(const Value: TJvUIBDataBase); --- 733,737 ---- Result := True; end; ! {$ENDIF} procedure TJvUIBCustomDataSet.SetDatabase(const Value: TJvUIBDataBase); *************** *** 876,878 **** end. - --- 841,842 ---- Index: JvUIBase.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvUIBase.pas,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** JvUIBase.pas 18 Jan 2004 13:38:51 -0000 1.20 --- JvUIBase.pas 27 Jan 2004 23:32:41 -0000 1.21 *************** *** 5,9 **** { } { The contents of this file are subject to the Mozilla Public License Version } ! { 1.0 (the "License"); you may not use this file except in compliance with the } { License. You may obtain a copy of the License at http://www.mozilla.org/MPL/ } { } --- 5,9 ---- { } { The contents of this file are subject to the Mozilla Public License Version } ! { 1.1 (the "License"); you may not use this file except in compliance with the } { License. You may obtain a copy of the License at http://www.mozilla.org/MPL/ } { } *************** *** 12,17 **** { the specific language governing rights and limitations under the License. } { } - { The Original Code is JvUIBase.pas. } - { } { The Initial Developer of the Original Code is documented in the accompanying } { help file JCL.chm. Portions created by these individuals are Copyright (C) } --- 12,15 ---- *************** *** 38,47 **** {$IFDEF USE_IBASE_H} (*$HPPEMIT '#include<ibase.h>'*) ! {$ENDIF USE_IBASE_H} unit JvUIBase; interface - uses {$IFDEF MSWINDOWS} --- 36,44 ---- {$IFDEF USE_IBASE_H} (*$HPPEMIT '#include<ibase.h>'*) ! {$ENDIF} unit JvUIBase; interface uses {$IFDEF MSWINDOWS} |
