firebird-checkins — CVS checkins

[Firebird-checkins] CVS: interbase/utilities util.c,1.1.1.1,1.2

[Tom C. <tm...@us...>]

Update of /cvsroot/firebird/interbase/utilities
In directory slayer.i.sourceforge.net:/tmp/cvs-serv5517

Modified Files:
	util.c 
Log Message:
AIX_PPC


Index: util.c
===================================================================
RCS file: /cvsroot/firebird/interbase/utilities/util.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** util.c	2000/08/03 20:54:29	1.1.1.1
--- util.c	2000/10/02 21:25:06	1.2
***************
*** 21,24 ****
--- 21,27 ----
   * Contributor(s): ______________________________________.
   */
+ /*
+ $Id$
+ */
  
  #include "../jrd/ib_stdio.h"
***************
*** 133,139 ****
      return (WEXITSTATUS (child_exit_status));
  
! if (WCOREDUMP (child_exit_status) ||
      WIFSIGNALED (child_exit_status) ||
!     !WIFEXITED (child_exit_status))
      return (-1);
  
--- 136,145 ----
      return (WEXITSTATUS (child_exit_status));
  
! if (
! #ifndef AIX_PPC
! 	WCOREDUMP (child_exit_status) ||
! #endif
      WIFSIGNALED (child_exit_status) ||
!     !WIFEXITED (child_exit_status) )
      return (-1);
  

[Firebird-checkins] CVS: interbase/builds/original add_template,1.1.1.1,1.2 build_kit,1.2,1.3 mpm_template,1.1.1.1,1.2 mpp_template,1.1.1.1,1.2 put_template,1.1.1.1,1.2 sfx.interbase,1.5,1.6

[Frank Schlottmann-G. <fs...@us...>]

Update of /cvsroot/firebird/interbase/builds/original
In directory slayer.i.sourceforge.net:/tmp/cvs-serv19218/interbase/builds/original

Modified Files:
	add_template build_kit mpm_template mpp_template put_template 
	sfx.interbase 
Log Message:
Added some changes from the inprise tree


Index: add_template
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/add_template,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** add_template	2000/08/03 20:42:40	1.1.1.1
--- add_template	2000/09/30 12:03:55	1.2
***************
*** 19,24 ****
  umask 002
  TARGET=source/$2/$1
! runas builder cp $1 $TARGET
! runas builder chmod 644 $TARGET
  umask $UMASK
  
--- 19,26 ----
  umask 002
  TARGET=source/$2/$1
! #removed runas builder according to inprise tree 
! #FSG  093000
! cp $1 $TARGET
! chmod 644 $TARGET
  umask $UMASK
  

Index: build_kit
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/build_kit,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** build_kit	2000/08/11 14:33:56	1.2
--- build_kit	2000/09/30 12:03:56	1.3
***************
*** 89,93 ****
  STATUS=$?
  
! rasu ./unset_prot builder
  
  if [ $STATUS = 0 ]; then
--- 89,96 ----
  STATUS=$?
  
! #removed rasu ./unset_prot  builder according to inprise tree
! # and to get rid of this annoying rasu not found message
! #FSG  093000
! 
  
  if [ $STATUS = 0 ]; then

Index: mpm_template
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/mpm_template,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** mpm_template	2000/08/03 20:42:44	1.1.1.1
--- mpm_template	2000/09/30 12:03:56	1.2
***************
*** 19,24 ****
  umask 002
  HERE=`pwd`
  cd source/$1
! runas builder make
  cd $HERE
  umask $UMASK
--- 19,26 ----
  umask 002
  HERE=`pwd`
+ #removed runas builder according to inprise tree
+ #FSG  093000
  cd source/$1
! make
  cd $HERE
  umask $UMASK

Index: mpp_template
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/mpp_template,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** mpp_template	2000/08/03 20:42:44	1.1.1.1
--- mpp_template	2000/09/30 12:03:56	1.2
***************
*** 19,24 ****
  umask 002
  TARGET=source/$2/$1
! runas builder mv $TARGET $TARGET.bak
! runas builder cp $1 $TARGET
! runas builder chmod 644 $TARGET
  umask $UMASK
--- 19,27 ----
  umask 002
  TARGET=source/$2/$1
! #removed runas builder according to inprise tree
! #FSG  093000
! 
! mv $TARGET $TARGET.bak
! cp $1 $TARGET
! chmod 644 $TARGET
  umask $UMASK

Index: put_template
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/put_template,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** put_template	2000/08/03 20:42:48	1.1.1.1
--- put_template	2000/09/30 12:03:56	1.2
***************
*** 19,28 ****
  umask 002
  TARGET=source/$2/$1
! runas builder mv $TARGET $TARGET.bak
! runas builder cp $1 $TARGET
! runas builder chmod 644 $TARGET
  HERE=`pwd`
  cd source/$2
! runas builder make
  cd $HERE
  umask $UMASK
--- 19,30 ----
  umask 002
  TARGET=source/$2/$1
! #removed runas builder according to inprise tree
! #FSG  093000
! mv $TARGET $TARGET.bak
! cp $1 $TARGET
! chmod 644 $TARGET
  HERE=`pwd`
  cd source/$2
! make
  cd $HERE
  umask $UMASK

Index: sfx.interbase
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/sfx.interbase,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** sfx.interbase	2000/08/16 23:30:37	1.5
--- sfx.interbase	2000/09/30 12:03:56	1.6
***************
*** 36,41 ****
  # removed examples 03-Aug-00 TMC
  #interbase:	run_codes gds.h includes executables examples help msgs msgs_intl extlib
- interbase:	run_codes gds.h includes executables help msgs msgs_intl extlib
  
  # Run the codes program, thus generating codes.h, iberror.h, etc
  # compare and copy the file only if the files are different
--- 36,44 ----
  # removed examples 03-Aug-00 TMC
  #interbase:	run_codes gds.h includes executables examples help msgs msgs_intl extlib
  
+ #added completed according to inprise tree
+ #FSG  093000
+ interbase:	run_codes gds.h includes executables help msgs msgs_intl extlib completed
+ 
  # Run the codes program, thus generating codes.h, iberror.h, etc
  # compare and copy the file only if the files are different
***************
*** 54,57 ****
--- 57,66 ----
  	
  super_targets: 	s_run_codes s_alice s_burp s_dba s_security_c super_client super_server super_utils 
+ 
+ 
+ #added completed according to inprise tree
+ #FSG  093000
+ completed:	force
+ 	$(QUIET_ECHO) "Build succeeded!"
  
  alice gfix:	gpre force

[Firebird-checkins] CVS: interbase/jrd license.h,1.2,1.3

[Frank Schlottmann-G. <fs...@us...>]

Update of /cvsroot/firebird/interbase/jrd
In directory slayer.i.sourceforge.net:/tmp/cvs-serv19218/interbase/jrd

Modified Files:
	license.h 
Log Message:
Added some changes from the inprise tree


Index: license.h
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/license.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** license.h	2000/08/16 23:30:38	1.2
--- license.h	2000/09/30 12:03:56	1.3
***************
*** 217,221 ****
  
  #ifdef LINUX
! #define IB_PLATFORM     "LI-B"         /* Linux on Intel */
  #endif
  
--- 217,221 ----
  
  #ifdef LINUX
! #define IB_PLATFORM     "LI-T"         /* Linux on Intel */
  #endif
  

[Firebird-checkins] CVS: interbase/remote inet.c,1.1.1.1,1.2

[Frank Schlottmann-G. <fs...@us...>]

Update of /cvsroot/firebird/interbase/remote
In directory slayer.i.sourceforge.net:/tmp/cvs-serv19218/interbase/remote

Modified Files:
	inet.c 
Log Message:
Added some changes from the inprise tree


Index: inet.c
===================================================================
RCS file: /cvsroot/firebird/interbase/remote/inet.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** inet.c	2000/08/03 20:54:04	1.1.1.1
--- inet.c	2000/09/30 12:03:56	1.2
***************
*** 34,38 ****
  #ifdef SUPERSERVER
  #ifdef	WIN_NT
! #define FD_SETSIZE 256
  #endif
  #endif /* SUPERSERVER */
--- 34,38 ----
  #ifdef SUPERSERVER
  #ifdef	WIN_NT
! #define FD_SETSIZE 1024
  #endif
  #endif /* SUPERSERVER */

[Firebird-checkins] CVS: interbase/jrd why.c,1.4,1.5

[Tom C. <tm...@us...>]

Update of /cvsroot/firebird/interbase/jrd
In directory slayer.i.sourceforge.net:/tmp/cvs-serv20276

Modified Files:
	why.c 
Log Message:
fix conditional syntax

Index: why.c
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/why.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** why.c	2000/09/29 14:49:47	1.4
--- why.c	2000/09/29 17:47:47	1.5
***************
*** 486,490 ****
  
  #if (defined UNIX) && \
!     !(defined SUPERCLIENT || defined SUPERSERVER || defined DECOSF || defined NCR3000 || defined DG_X86 || defined linux || defined FREEBSD || AIX_PPC /* platforms without a V3 bridge */)
  #ifndef PIPE_SERVER_YVALUE
  #define PIPE_BRIDGE_TO_V3
--- 486,490 ----
  
  #if (defined UNIX) && \
!     !(defined SUPERCLIENT || defined SUPERSERVER || defined DECOSF || defined NCR3000 || defined DG_X86 || defined linux || defined FREEBSD || defined AIX_PPC /* platforms without a V3 bridge */)
  #ifndef PIPE_SERVER_YVALUE
  #define PIPE_BRIDGE_TO_V3

[Firebird-checkins] CVS: interbase/utilities drop.c,1.2,1.3

[Tom C. <tm...@us...>]

Update of /cvsroot/firebird/interbase/utilities
In directory slayer.i.sourceforge.net:/tmp/cvs-serv1075

Modified Files:
	drop.c 
Log Message:
AIX_PPC port

Index: drop.c
===================================================================
RCS file: /cvsroot/firebird/interbase/utilities/drop.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** drop.c	2000/08/16 23:30:39	1.2
--- drop.c	2000/09/29 14:51:26	1.3
***************
*** 21,24 ****
--- 21,27 ----
   * Contributor(s): ______________________________________.
   */
+ /*
+ $Id$
+ */
  
  #include "../jrd/ib_stdio.h"
***************
*** 154,158 ****
  #endif
  
! #if !(defined WIN_NT || defined OS2_ONLY || defined NETWARE_386 || defined linux || defined FREEBSD)
  if (!sw_nobridge)
      {
--- 157,161 ----
  #endif
  
! #if !(defined WIN_NT || defined OS2_ONLY || defined NETWARE_386 || defined linux || defined FREEBSD || defined AIX_PPC )
  if (!sw_nobridge)
      {

[Firebird-checkins] CVS: interbase/jrd why.c,1.3,1.4

[Tom C. <tm...@us...>]

Update of /cvsroot/firebird/interbase/jrd
In directory slayer.i.sourceforge.net:/tmp/cvs-serv31952

Modified Files:
	why.c 
Log Message:
AIX_PPC port

Index: why.c
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/why.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** why.c	2000/08/26 04:52:47	1.3
--- why.c	2000/09/29 14:49:47	1.4
***************
*** 21,24 ****
--- 21,27 ----
   * Contributor(s): ______________________________________.
   */
+ /*
+ $Id$
+ */
  
  #include <stdlib.h>
***************
*** 483,487 ****
  
  #if (defined UNIX) && \
!     !(defined SUPERCLIENT || defined SUPERSERVER || defined DECOSF || defined NCR3000 || defined DG_X86 || defined linux || defined FREEBSD /* platforms without a V3 bridge */)
  #ifndef PIPE_SERVER_YVALUE
  #define PIPE_BRIDGE_TO_V3
--- 486,490 ----
  
  #if (defined UNIX) && \
!     !(defined SUPERCLIENT || defined SUPERSERVER || defined DECOSF || defined NCR3000 || defined DG_X86 || defined linux || defined FREEBSD || AIX_PPC /* platforms without a V3 bridge */)
  #ifndef PIPE_SERVER_YVALUE
  #define PIPE_BRIDGE_TO_V3

[Firebird-checkins] CVS: interbase/builds/original bind_gds.aix_ppc,1.1,1.2

[Tom C. <tm...@us...>]

Update of /cvsroot/firebird/interbase/builds/original
In directory slayer.i.sourceforge.net:/tmp/cvs-serv26275

Modified Files:
	bind_gds.aix_ppc 
Log Message:
update export list

Index: bind_gds.aix_ppc
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/bind_gds.aix_ppc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** bind_gds.aix_ppc	2000/08/23 21:21:42	1.1
--- bind_gds.aix_ppc	2000/09/28 17:43:51	1.2
***************
*** 372,373 ****
--- 372,379 ----
  isc_encode_timestamp
  CVT_move
+ isc_portable_integer
+ DLS_add_dir
+ isc_blob_display
+ isc_blob_dump
+ isc_blob_edit
+ isc_blob_load

[Firebird-checkins] CVS: interbase/builds/original bind_gdsintl.aix_ppc,NONE,1.1

[Tom C. <tm...@us...>]

Update of /cvsroot/firebird/interbase/builds/original
In directory slayer.i.sourceforge.net:/tmp/cvs-serv26199

Added Files:
	bind_gdsintl.aix_ppc 
Log Message:
AIX intl shared library


***** Error reading new file: (2, 'No such file or directory')

[Firebird-checkins] CVS: interbase/dsql ddl.c,1.3,1.4 gen.c,1.3,1.4

[Tom C. <tm...@us...>]

Update of /cvsroot/firebird/interbase/dsql
In directory slayer.i.sourceforge.net:/tmp/cvs-serv994

Modified Files:
	ddl.c gen.c 
Log Message:
C for AIX requires stmt after default switch case

Index: ddl.c
===================================================================
RCS file: /cvsroot/firebird/interbase/dsql/ddl.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ddl.c	2000/09/04 16:04:21	1.3
--- ddl.c	2000/09/28 15:06:50	1.4
***************
*** 21,24 ****
--- 21,27 ----
   * Contributor(s): ______________________________________.
   */
+ /*
+ $Id$
+ */
  
  #include "../jrd/ib_stdio.h"
***************
*** 1038,1042 ****
  	    break;
  
!         default:
  	}
      }
--- 1041,1046 ----
  	    break;
  
! 	default:
! 		break;
  	}
      }
***************
*** 1139,1143 ****
  	    break;
  
!         default:
  	}
      }
--- 1143,1148 ----
  	    break;
  
! 	default:
! 		break;
  	}
      }
***************
*** 2259,2263 ****
  	   break;
  
!         default:
  	}
      }
--- 2264,2269 ----
  	   break;
  
! 	default:
! 		break;
  	}
      }
***************
*** 3696,3700 ****
  	break;
  
!     default:
      }
  }
--- 3702,3707 ----
  	break;
  
! 	default:
! 		break;
      }
  }
***************
*** 3998,4002 ****
  		break;
  
!         default:
  	}
      }
--- 4005,4010 ----
  		break;
  
! 	default:
! 		break;
  	}
      }
***************
*** 4101,4105 ****
  	    break;
  
!         default:
  	}
      }
--- 4109,4114 ----
  	    break;
  
! 	default:
! 		break;
  	}
      }
***************
*** 4215,4219 ****
  	   break;
  
!         default:
  	}
      }
--- 4224,4229 ----
  	   break;
  
! 	default:
! 		break;
  	}
      }
***************
*** 4326,4330 ****
  	break;
  
!     default:
      }
  
--- 4336,4341 ----
  	break;
  
! 	default:
! 		break;
      }
  
***************
*** 4398,4402 ****
  	break;
  
!     default:
      }
  
--- 4409,4414 ----
  	break;
  
! 	default:
! 		break;
      }
  
***************
*** 4538,4542 ****
  	   break;
  
!         default:
  	}
      }
--- 4550,4555 ----
  	   break;
  
! 	default:
! 		break;
  	}
      }

Index: gen.c
===================================================================
RCS file: /cvsroot/firebird/interbase/dsql/gen.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** gen.c	2000/09/04 16:04:21	1.3
--- gen.c	2000/09/28 15:06:50	1.4
***************
*** 413,417 ****
  		break;
  
!             default:
  	    }
  
--- 413,418 ----
  		break;
  
! 		default:
! 			break;
  	    }
  

[Firebird-checkins] CVS: interbase/jrd flu.c,1.4,1.5

[Tom C. <tm...@us...>]

Update of /cvsroot/firebird/interbase/jrd
In directory slayer.i.sourceforge.net:/tmp/cvs-serv18297

Modified Files:
	flu.c 
Log Message:
AIX_PPC fix ifdef

Index: flu.c
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/flu.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** flu.c	2000/09/27 23:53:31	1.4
--- flu.c	2000/09/28 00:05:00	1.5
***************
*** 65,69 ****
  /* SGI, EPSON, UNIXWARE, M88K, DECOSF specific stuff */
  
! #if (defined SOLARIS || defined sgi || defined EPSON || defined M88K || defined UNIXWARE || defined NCR3000 || defined DECOSF || defined SCO_EV || defined linux || AIX_PPC)
  #include <dlfcn.h>
  #define DYNAMIC_SHARED_LIBRARIES
--- 65,69 ----
  /* SGI, EPSON, UNIXWARE, M88K, DECOSF specific stuff */
  
! #if (defined SOLARIS || defined sgi || defined EPSON || defined M88K || defined UNIXWARE || defined NCR3000 || defined DECOSF || defined SCO_EV || defined linux || defined AIX_PPC)
  #include <dlfcn.h>
  #define DYNAMIC_SHARED_LIBRARIES

[Firebird-checkins] CVS: interbase/jrd flu.c,1.3,1.4

[Tom C. <tm...@us...>]

Update of /cvsroot/firebird/interbase/jrd
In directory slayer.i.sourceforge.net:/tmp/cvs-serv1156

Modified Files:
	flu.c 
Log Message:
AIX_PPC

Index: flu.c
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/flu.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** flu.c	2000/08/23 21:16:26	1.3
--- flu.c	2000/09/27 23:53:31	1.4
***************
*** 65,69 ****
  /* SGI, EPSON, UNIXWARE, M88K, DECOSF specific stuff */
  
! #if (defined SOLARIS || defined sgi || defined EPSON || defined M88K || defined UNIXWARE || defined NCR3000 || defined DECOSF || defined SCO_EV || defined linux)
  #include <dlfcn.h>
  #define DYNAMIC_SHARED_LIBRARIES
--- 65,69 ----
  /* SGI, EPSON, UNIXWARE, M88K, DECOSF specific stuff */
  
! #if (defined SOLARIS || defined sgi || defined EPSON || defined M88K || defined UNIXWARE || defined NCR3000 || defined DECOSF || defined SCO_EV || defined linux || AIX_PPC)
  #include <dlfcn.h>
  #define DYNAMIC_SHARED_LIBRARIES

[Firebird-checkins] CVS: interbase/jrd gds.c,1.3,1.4

[Reed F. M. <rf...@us...>]

Update of /cvsroot/firebird/interbase/jrd
In directory slayer.i.sourceforge.net:/tmp/cvs-serv7880

Modified Files:
	gds.c 
Log Message:
define V4_THREADING for all superserver platfroms, as
recommended by Charlie Caro. See my message
'[Firebird-devel] Re: IB Super Server on Linux Crash (borland bug #114840)'
on firebird-devel for some thoughts on V4_THREADING in general.


Index: gds.c
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/gds.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** gds.c	2000/08/16 23:30:38	1.3
--- gds.c	2000/09/23 04:39:22	1.4
***************
*** 143,148 ****
  #endif
  
! #if (defined(HP10) && defined(SUPERSERVER))
! #define V4_THREADING
  #endif
  
--- 143,149 ----
  #endif
  
! #ifdef SUPERSERVER
! #define V4_THREADING /* RFM: 9/22/2000 fix from Inprise tree, 
! 						Inprise bug 114840*/
  #endif
  

[Firebird-checkins] CVS: interbase setup_build.ksh,1.2,1.3

[Reed F. M. <rf...@us...>]

Update of /cvsroot/firebird/interbase
In directory slayer.i.sourceforge.net:/tmp/cvs-serv28325

Modified Files:
	setup_build.ksh 
Log Message:
exit if no argument is given.


Index: setup_build.ksh
===================================================================
RCS file: /cvsroot/firebird/interbase/setup_build.ksh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** setup_build.ksh	2000/08/21 20:57:49	1.2
--- setup_build.ksh	2000/09/23 03:54:00	1.3
***************
*** 25,28 ****
--- 25,29 ----
  	echo "include a server name. DB_DIR should not be the"
  	echo "source directory."
+ 	exit 1
  fi
  DB_PATH="$1" #path to look for db in .e files

[Firebird-checkins] CVS: ibx/runtime vclib50.rc,1.2,1.3

[Pavel C. <pc...@us...>]

Update of /cvsroot/firebird/ibx/runtime
In directory slayer.i.sourceforge.net:/tmp/cvs-serv19328

Added Files:
	vclib50.rc 
Log Message:
Update to version 4.3

[Firebird-checkins] CVS: ibx/runtime vclib50.res,1.2,1.3

[Pavel C. <pc...@us...>]

Update of /cvsroot/firebird/ibx/runtime
In directory slayer.i.sourceforge.net:/tmp/cvs-serv18222

Added Files:
	vclib50.res 
Log Message:
Update to version 4.3

[Firebird-checkins] CVS: ibx/runtime IB.pas,1.1.1.1,1.2 IBBlob.pas,1.1.1.1,1.2 IBCustomDataSet.pas,1.1.1.1,1.2 IBDataBase.pas,1.2,1.3 IBDatabaseInfo.pas,1.1.1.1,1.2 IBInstall.pas,1.1.1.1,1.2 IBInstallHeader.pas,1.1.1.1,1.2 IBSQL.pas,1.1.1.1,1.2 IBSQLMonitor.pas,1.1.1.1,1.2 IBServices.pas,1.1.1.1,1.2 IBStoredProc.pas,1.1.1.1,1.2 IBTable.pas,1.1.1.1,1.2 IBUpdateSQL.pas,1.1.1.1,1.2 IBUtils.pas,1.1.1.1,1.2 IBXConst.pas,1.1.1.1,1.2

[Pavel C. <pc...@us...>]

Update of /cvsroot/firebird/ibx/runtime
In directory slayer.i.sourceforge.net:/tmp/cvs-serv15704/runtime

Modified Files:
	IB.pas IBBlob.pas IBCustomDataSet.pas IBDataBase.pas 
	IBDatabaseInfo.pas IBInstall.pas IBInstallHeader.pas IBSQL.pas 
	IBSQLMonitor.pas IBServices.pas IBStoredProc.pas IBTable.pas 
	IBUpdateSQL.pas IBUtils.pas IBXConst.pas 
Log Message:
Update to version 4.3

Index: IB.pas
===================================================================
RCS file: /cvsroot/firebird/ibx/runtime/IB.pas,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** IB.pas	2000/08/03 20:17:05	1.1.1.1
--- IB.pas	2000/09/21 15:04:10	1.2
***************
*** 155,159 ****
      ibxeOutputParsingError,
      ibxeUseSpecificProcedures,
!     ibxeSQLMonitorAlreadyPresent
      );
  
--- 155,177 ----
      ibxeOutputParsingError,
      ibxeUseSpecificProcedures,
!     ibxeSQLMonitorAlreadyPresent,
!     ibxeCantPrintValue,
!     ibxeEOFReached,
!     ibxeEOFInComment,
!     ibxeEOFInString,
!     ibxeParamNameExpected,
!     ibxeSuccess,
!     ibxeDelphiException,
!     ibxeNoOptionsSet,
!     ibxeNoDestinationDirectory,
!     ibxeNosourceDirectory,
!     ibxeNoUninstallFile,
!     ibxeOptionNeedsClient,
!     ibxeOptionNeedsServer,
!     ibxeInvalidOption,
!     ibxeInvalidOnErrorResult,
!     ibxeInvalidOnStatusResult,
!     ibxeDPBConstantUnknownEx,
!     ibxeTPBConstantUnknownEx
      );
  
***************
*** 268,272 ****
      SOutputParsingError,
      SUseSpecificProcedures,
!     SSQLMonitorAlreadyPresent
    );
  
--- 286,308 ----
      SOutputParsingError,
      SUseSpecificProcedures,
!     SSQLMonitorAlreadyPresent,
!     SCantPrintValue,
!     SEOFReached,
!     SEOFInComment,
!     SEOFInString,
!     SParamNameExpected,
!     SSuccess,
!     SDelphiException,
!     SNoOptionsSet,
!     SNoDestinationDirectory,
!     SNosourceDirectory,
!     SNoUninstallFile,
!     SOptionNeedsClient,
!     SOptionNeedsServer,
!     SInvalidOption,
!     SInvalidOnErrorResult,
!     SInvalidOnStatusResult,
!     SDPBConstantUnknownEx,
!     STPBConstantUnknownEx
    );
  

Index: IBBlob.pas
===================================================================
RCS file: /cvsroot/firebird/ibx/runtime/IBBlob.pas,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** IBBlob.pas	2000/08/03 20:17:05	1.1.1.1
--- IBBlob.pas	2000/09/21 15:04:10	1.2
***************
*** 32,37 ****
  
  uses
!   Windows, SysUtils, Classes, Forms, IBHeader, IBErrorCodes, IBExternals,
!   DB, IB, IBDatabase, IBUtils;
  
  const
--- 32,37 ----
  
  uses
!   SysUtils, Classes, IBHeader, IBErrorCodes, IBExternals, DB, IB, IBDatabase, IBUtils;
! 
  
  const

Index: IBCustomDataSet.pas
===================================================================
RCS file: /cvsroot/firebird/ibx/runtime/IBCustomDataSet.pas,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** IBCustomDataSet.pas	2000/08/03 20:17:07	1.1.1.1
--- IBCustomDataSet.pas	2000/09/21 15:04:10	1.2
***************
*** 240,248 ****
      function GetTransaction: TIBTransaction;
      function GetTRHandle: PISC_TR_HANDLE;
!     procedure InternalDeleteRecord(Qry: TIBSQL; Buff: Pointer);
      function InternalLocate(const KeyFields: string; const KeyValues: Variant;
                              Options: TLocateOptions): Boolean; virtual;
!     procedure InternalPostRecord(Qry: TIBSQL; Buff: Pointer);
!     procedure InternalRevertRecord(RecordNumber: Integer);
      function IsVisible(Buffer: PChar): Boolean;
      procedure SaveOldBuffer(Buffer: PChar);
--- 240,248 ----
      function GetTransaction: TIBTransaction;
      function GetTRHandle: PISC_TR_HANDLE;
!     procedure InternalDeleteRecord(Qry: TIBSQL; Buff: Pointer); virtual;
      function InternalLocate(const KeyFields: string; const KeyValues: Variant;
                              Options: TLocateOptions): Boolean; virtual;
!     procedure InternalPostRecord(Qry: TIBSQL; Buff: Pointer); virtual;
!     procedure InternalRevertRecord(RecordNumber: Integer); virtual;
      function IsVisible(Buffer: PChar): Boolean;
      procedure SaveOldBuffer(Buffer: PChar);
***************
*** 270,274 ****
      procedure WriteRecordCache(RecordNumber: Integer; Buffer: PChar);
      function InternalGetRecord(Buffer: PChar; GetMode: TGetMode;
!                        DoCheck: Boolean): TGetResult;
  
    protected
--- 270,274 ----
      procedure WriteRecordCache(RecordNumber: Integer; Buffer: PChar);
      function InternalGetRecord(Buffer: PChar; GetMode: TGetMode;
!                        DoCheck: Boolean): TGetResult; virtual;
  
    protected
***************
*** 279,289 ****
      procedure CheckDatasetOpen;
      function GetActiveBuf: PChar;
!     procedure InternalBatchInput(InputObject: TIBBatchInput);
!     procedure InternalBatchOutput(OutputObject: TIBBatchOutput);
      procedure InternalPrepare; virtual;
      procedure InternalUnPrepare; virtual;
      procedure InternalExecQuery; virtual;
      procedure InternalRefreshRow; virtual;
!     procedure InternalSetParamsFromCursor;
      procedure CheckNotUniDirectional;
  
--- 279,289 ----
      procedure CheckDatasetOpen;
      function GetActiveBuf: PChar;
!     procedure InternalBatchInput(InputObject: TIBBatchInput); virtual;
!     procedure InternalBatchOutput(OutputObject: TIBBatchOutput); virtual;
      procedure InternalPrepare; virtual;
      procedure InternalUnPrepare; virtual;
      procedure InternalExecQuery; virtual;
      procedure InternalRefreshRow; virtual;
!     procedure InternalSetParamsFromCursor; virtual;
      procedure CheckNotUniDirectional;
  
***************
*** 328,332 ****
      procedure InternalDelete; override;
      procedure InternalFirst; override;
!     function InternalGetFieldData(Field: TField; Buffer: Pointer): Boolean;
      procedure InternalGotoBookmark(Bookmark: Pointer); override;
      procedure InternalHandleException; override;
--- 328,332 ----
      procedure InternalDelete; override;
      procedure InternalFirst; override;
!     function InternalGetFieldData(Field: TField; Buffer: Pointer): Boolean; virtual;
      procedure InternalGotoBookmark(Bookmark: Pointer); override;
      procedure InternalHandleException; override;
***************
*** 337,341 ****
      procedure InternalPost; override;
      procedure InternalRefresh; override;
!     procedure InternalSetFieldData(Field: TField; Buffer: Pointer);
      procedure InternalSetToRecord(Buffer: PChar); override;
      function IsCursorOpen: Boolean; override;
--- 337,341 ----
      procedure InternalPost; override;
      procedure InternalRefresh; override;
!     procedure InternalSetFieldData(Field: TField; Buffer: Pointer); virtual;
      procedure InternalSetToRecord(Buffer: PChar); override;
      function IsCursorOpen: Boolean; override;
***************
*** 2949,2953 ****
              Size := FieldSize;
              Precision := FieldPrecision;
!             Required := False;
              InternalCalcField := False;
              if (FieldName <> '') and (RelationName <> '') then
--- 2949,2953 ----
              Size := FieldSize;
              Precision := FieldPrecision;
!             Required := not FieldNullable;
              InternalCalcField := False;
              if (FieldName <> '') and (RelationName <> '') then
***************
*** 3737,3741 ****
    lTempCurr : System.Currency;
  begin
!   if Field.DataType = ftBCD then
    begin
      BCDToCurr(TBCD(Buffer^), lTempCurr);
--- 3737,3741 ----
    lTempCurr : System.Currency;
  begin
!   if (Field.DataType = ftBCD) and (Buffer <> nil) then
    begin
      BCDToCurr(TBCD(Buffer^), lTempCurr);
***************
*** 3766,3770 ****
  begin
    FRefreshSQL.Free;
!   inherited destroy;
  end;
  
--- 3766,3770 ----
  begin
    FRefreshSQL.Free;
!   inherited Destroy;
  end;
  
***************
*** 3805,3808 ****
--- 3805,3809 ----
      IBError(ibxeNotEditing, [nil]);
    TIBCustomDataSet(FField.DataSet).RecordModified(True);
+   TBlobField(FField).Modified := true;
    result := FBlobStream.Write(Buffer, Count);
    TIBCustomDataSet(FField.DataSet).DataEvent(deFieldChange, Longint(FField));

Index: IBDataBase.pas
===================================================================
RCS file: /cvsroot/firebird/ibx/runtime/IBDataBase.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** IBDataBase.pas	2000/09/04 12:10:34	1.2
--- IBDataBase.pas	2000/09/21 15:04:10	1.3
***************
*** 1936,1940 ****
            IBError(ibxeDPBConstantNotSupported, [DPBConstantNames[DPBVal]])
          else
!           IBError(ibxeDPBConstantUnknown, [sl.Names[i]]);
        end;
      end;
--- 1936,1940 ----
            IBError(ibxeDPBConstantNotSupported, [DPBConstantNames[DPBVal]])
          else
!           IBError(ibxeDPBConstantUnknownEx, [sl.Names[i]]);
        end;
      end;
***************
*** 2005,2009 ****
            IBError(ibxeTPBConstantNotSupported, [TPBConstantNames[TPBVal]])
          else
!           IBError(ibxeTPBConstantUnknown, [TPBVal]);
        end;
      end;
--- 2005,2009 ----
            IBError(ibxeTPBConstantNotSupported, [TPBConstantNames[TPBVal]])
          else
!           IBError(ibxeTPBConstantUnknownEx, [sl.Names[i]]);
        end;
      end;

Index: IBDatabaseInfo.pas
===================================================================
RCS file: /cvsroot/firebird/ibx/runtime/IBDatabaseInfo.pas,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** IBDatabaseInfo.pas	2000/08/03 20:17:09	1.1.1.1
--- IBDatabaseInfo.pas	2000/09/21 15:04:10	1.2
***************
*** 19,24 ****
  {    express or implied. See the License for the specific language       }
  {    governing rights and limitations under the License.                 }
- {    The Original Code was created by InterBase Software Corporation     }
- {       and its successors.                                              }
  {    Portions created by Inprise Corporation are Copyright (C) Inprise   }
  {       Corporation. All Rights Reserved.                                }
--- 19,22 ----
***************
*** 32,37 ****
  
  uses
!   Windows, SysUtils, Classes, Forms, ExtCtrls,
!   IBHeader, IBExternals, IB, IBDatabase;
  
  type
--- 30,34 ----
  
  uses
!   SysUtils, Classes, IBHeader, IBExternals, IB, IBDatabase;
  
  type
***************
*** 81,85 ****
      function GetOperationCounts(DBInfoCommand: Integer; FOperation: TStringList): TStringList;
      function GetReadOnly: Long;
-     function GetLongDatabaseInfo(DatabaseInfoCommand: Integer): Long;
      function GetStringDatabaseInfo(DatabaseInfoCommand: Integer): String;
      function GetDBSQLDialect: Long;
--- 78,81 ----
***************
*** 88,91 ****
--- 84,88 ----
      destructor Destroy; override;
      function Call(ErrCode: ISC_STATUS; RaiseError: Boolean): ISC_STATUS;
+     function GetLongDatabaseInfo(DatabaseInfoCommand: Integer): Long;
      property Allocation: Long read GetAllocation;
      property BaseLevel: Long read GetBaseLevel;

Index: IBInstall.pas
===================================================================
RCS file: /cvsroot/firebird/ibx/runtime/IBInstall.pas,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** IBInstall.pas	2000/08/03 20:17:14	1.1.1.1
--- IBInstall.pas	2000/09/21 15:04:10	1.2
***************
*** 40,44 ****
  interface
  
! uses Windows, TypInfo,SysUtils, Classes, IB, IBInstallHeader, IBIntf, IBXConst;
  
  type
--- 40,44 ----
  interface
  
! uses TypInfo,SysUtils, Classes, IB, IBInstallHeader, IBIntf, IBXConst;
  
  type

Index: IBInstallHeader.pas
===================================================================
RCS file: /cvsroot/firebird/ibx/runtime/IBInstallHeader.pas,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** IBInstallHeader.pas	2000/08/03 20:17:14	1.1.1.1
--- IBInstallHeader.pas	2000/09/21 15:04:10	1.2
***************
*** 41,46 ****
  interface
  
- uses  Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs;
- 
  { InterBase Install API interface }
  type
--- 41,44 ----

Index: IBSQL.pas
===================================================================
RCS file: /cvsroot/firebird/ibx/runtime/IBSQL.pas,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** IBSQL.pas	2000/08/03 20:17:16	1.1.1.1
--- IBSQL.pas	2000/09/21 15:04:10	1.2
***************
*** 425,429 ****
  function TIBXSQLVAR.AdjustScale(Value: Int64; Scale: Integer): Double;
  var
!   Scaling, i: Integer;
    Val: Double;
  begin
--- 425,430 ----
  function TIBXSQLVAR.AdjustScale(Value: Int64; Scale: Integer): Double;
  var
!   Scaling : Int64;
!   i: Integer;
    Val: Double;
  begin
***************
*** 448,452 ****
  function TIBXSQLVAR.AdjustScaleToInt64(Value: Int64; Scale: Integer): Int64;
  var
!   Scaling, i: Integer;
    Val: Int64;
  begin
--- 449,454 ----
  function TIBXSQLVAR.AdjustScaleToInt64(Value: Int64; Scale: Integer): Int64;
  var
!   Scaling : Int64;
!   i: Integer;
    Val: Int64;
  begin
***************
*** 464,471 ****
  function TIBXSQLVAR.AdjustScaleToCurrency(Value: Int64; Scale: Integer): Currency;
  var
!   Scaling, i : Integer;
    FractionText, PadText, CurrText: string;
  begin
!   result := Value;
    Scaling := 1;
    if Scale > 0 then
--- 466,474 ----
  function TIBXSQLVAR.AdjustScaleToCurrency(Value: Int64; Scale: Integer): Currency;
  var
!   Scaling : Int64;
!   i : Integer;
    FractionText, PadText, CurrText: string;
  begin
!   Result := 0;
    Scaling := 1;
    if Scale > 0 then
***************
*** 490,496 ****
          result := StrToCurr(CurrText);
        except
!         on E: Exception do IBError(ibxeInvalidDataConversion, [nil]);
        end;
!     end;
  end;
  
--- 493,502 ----
          result := StrToCurr(CurrText);
        except
!         on E: Exception do
!           IBError(ibxeInvalidDataConversion, [nil]);
        end;
!     end
!     else
!       result := Value;
  end;
  
***************
*** 1294,1311 ****
        if FParent.FNames[i] = FName then
        begin
-         xvar := FParent[i];
-         xvar.FXSQLVAR^.sqlind^ := -1;
-         xvar.FModified := True;
-       end;
-   end else if ((not Value) and IsNullable) then
-   begin
-     for i := 0 to FParent.FCount - 1 do
-       if FParent.FNames[i] = FName then
-       begin
          xvar := FParent[i];
!         xvar.FXSQLVAR^.sqlind^ := 0;
          xvar.FModified := True;
        end;
!   end;
  end;
  
--- 1300,1321 ----
        if FParent.FNames[i] = FName then
        begin
          xvar := FParent[i];
!         if Assigned(xvar.FXSQLVAR^.sqlind) then
!           xvar.FXSQLVAR^.sqlind^ := -1;
          xvar.FModified := True;
        end;
!   end
!   else
!     if ((not Value) and IsNullable) then
!     begin
!       for i := 0 to FParent.FCount - 1 do
!         if FParent.FNames[i] = FName then
!         begin
!           xvar := FParent[i];
!           if Assigned(xvar.FXSQLVAR^.sqlind) then
!             xvar.FXSQLVAR^.sqlind^ := 0;
!           xvar.FModified := True;
!         end;
!     end;
  end;
  
***************
*** 1443,1471 ****
    bUnique := True;
    NamesWereEmpty := (FNames.Count = 0);
!   if FXSQLDA <> nil then begin
!     for i := 0 to FCount - 1 do begin
!       with FXSQLVARs[i].Data^ do begin
          if bUnique and (String(relname) <> '') then
          begin
            if FUniqueRelationName = '' then
              FUniqueRelationName := String(relname)
!           else if String(relname) <> FUniqueRelationName then
!           begin
!             FUniqueRelationName := '';
!             bUnique := False;
!           end;
          end;
!         if NamesWereEmpty then begin
            st := String(aliasname);
!           if st = '' then begin
              st := 'F_'; {do not localize}
              aliasname_length := 2;
              j := 1; j_len := 1;
              StrPCopy(aliasname, st + IntToStr(j));
!           end else begin
              StrPCopy(aliasname, st);
              j := 0; j_len := 0;
            end;
!           while GetXSQLVARByName(String(aliasname)) <> nil do begin
              Inc(j); j_len := Length(IntToStr(j));
              if j_len + aliasname_length > 31 then
--- 1453,1490 ----
    bUnique := True;
    NamesWereEmpty := (FNames.Count = 0);
!   if FXSQLDA <> nil then
!   begin
!     for i := 0 to FCount - 1 do
!     begin
!       with FXSQLVARs[i].Data^ do
!       begin
          if bUnique and (String(relname) <> '') then
          begin
            if FUniqueRelationName = '' then
              FUniqueRelationName := String(relname)
!           else
!             if String(relname) <> FUniqueRelationName then
!             begin
!               FUniqueRelationName := '';
!               bUnique := False;
!             end;
          end;
!         if NamesWereEmpty then
!         begin
            st := String(aliasname);
!           if st = '' then
!           begin
              st := 'F_'; {do not localize}
              aliasname_length := 2;
              j := 1; j_len := 1;
              StrPCopy(aliasname, st + IntToStr(j));
!           end
!           else
!           begin
              StrPCopy(aliasname, st);
              j := 0; j_len := 0;
            end;
!           while GetXSQLVARByName(String(aliasname)) <> nil do
!           begin
              Inc(j); j_len := Length(IntToStr(j));
              if j_len + aliasname_length > 31 then
***************
*** 1533,1537 ****
          FXSQLVARs[i].FXSQLVAR := p;
          p := Pointer(PChar(p) + sizeof(FXSQLDA^.sqlvar));
- //        FNames.Add('');
        end;
        FSize := FCount;
--- 1552,1555 ----

Index: IBSQLMonitor.pas
===================================================================
RCS file: /cvsroot/firebird/ibx/runtime/IBSQLMonitor.pas,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** IBSQLMonitor.pas	2000/08/03 20:17:16	1.1.1.1
--- IBSQLMonitor.pas	2000/09/21 15:04:10	1.2
***************
*** 311,315 ****
    inherited Create;
    FEventsCreated := false;
!   FTraceFlags := [tfqPrepare .. tfMisc];
  end;
  
--- 311,316 ----
    inherited Create;
    FEventsCreated := false;
!   FTraceFlags := [tfQPrepare..tfMisc];
!   FEnabled := true;
  end;
  
***************
*** 343,348 ****
    Sa.bInheritHandle := true;
  
-   FTraceFlags := [tfQPrepare..tfMisc];
-   FEnabled := true;
    FSharedBuffer := CreateFileMapping($FFFFFFFF, @sa, PAGE_READWRITE,
                         0, cMonitorHookSize, PChar(MonitorHookNames[1]));
--- 344,347 ----
***************
*** 773,781 ****
          Sleep(50);
    end;
-   { This little bit is to unlock the reader thread.  bDone is normally true
-     at this point and therefor this will allow the reader thread to stop
-     waiting }
- {  WriteSQLData(' ', tfMisc);
-   WriteToBuffer;   }
  end;
  
--- 772,775 ----

Index: IBServices.pas
===================================================================
RCS file: /cvsroot/firebird/ibx/runtime/IBServices.pas,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** IBServices.pas	2000/08/03 20:17:18	1.1.1.1
--- IBServices.pas	2000/09/21 15:04:10	1.2
***************
*** 635,638 ****
--- 635,639 ----
    FLoginPrompt := True;
    FTraceFlags := [];
+   FOutputbuffer := nil;
  end;
  
***************
*** 647,650 ****
--- 648,652 ----
      FParams.Free;
    end;
+   ReallocMem(FOutputBuffer, 0);
    inherited Destroy;
  end;
***************
*** 1731,1735 ****
      FUserInfo[i].Free;
    FUserInfo := nil;
!   inherited destroy;
  end;
  
--- 1733,1737 ----
      FUserInfo[i].Free;
    FUserInfo := nil;
!   inherited Destroy;
  end;
  

Index: IBStoredProc.pas
===================================================================
RCS file: /cvsroot/firebird/ibx/runtime/IBStoredProc.pas,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** IBStoredProc.pas	2000/08/03 20:17:18	1.1.1.1
--- IBStoredProc.pas	2000/09/21 15:04:10	1.2
***************
*** 31,37 ****
  interface
  
! uses Windows, SysUtils, Graphics, Classes, Controls, Db, StdVCL, IB,
!   IBDatabase, IBCustomDataSet, IBHeader, IBSQL, IBUtils;
! 
  { TIBStoredProc }
  type
--- 31,37 ----
  interface
  
! uses SysUtils, Classes, DB, IB, IBDatabase, IBCustomDataSet,
!      IBHeader, IBSQL, IBUtils;
!      
  { TIBStoredProc }
  type

Index: IBTable.pas
===================================================================
RCS file: /cvsroot/firebird/ibx/runtime/IBTable.pas,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** IBTable.pas	2000/08/03 20:17:19	1.1.1.1
--- IBTable.pas	2000/09/21 15:04:10	1.2
***************
*** 31,37 ****
  interface
  
! uses Windows, SysUtils, Graphics, Classes, Controls, Db, StdVCL,
!      IB, IBDatabase, IBCustomDataSet, IBHeader, IBSQL, IBUtils;
! 
  type
  
--- 31,37 ----
  interface
  
! uses SysUtils, Classes, DB, IB, IBDatabase, IBCustomDataSet,
!      IBHeader, IBSQL, IBUtils;
!      
  type
  
***************
*** 317,321 ****
                          'where R.RDB$RELATION_NAME = ' + {do not localize}
                          '''' +
!                         FormatIdentifierValue(Database.SQLDialect, FTableName) +
                          ''' ' +
                          'and R.RDB$FIELD_SOURCE = F.RDB$FIELD_NAME '+ {do not localize}
--- 317,322 ----
                          'where R.RDB$RELATION_NAME = ' + {do not localize}
                          '''' +
!                         FormatIdentifierValue(Database.SQLDialect,
!                           QuoteIdentifier(DataBase.SQLDialect, FTableName)) +
                          ''' ' +
                          'and R.RDB$FIELD_SOURCE = F.RDB$FIELD_NAME '+ {do not localize}
***************
*** 333,368 ****
              Name := TrimRight(Query.Current.ByName('RDB$FIELD_NAME').AsString); {do not localize}
              case Query.Current.ByName('RDB$FIELD_TYPE').AsInteger of {do not localize}
!               blr_varying, blr_text: begin
                  DataType := ftString;
                  Size := Query.Current.ByName('RDB$FIELD_LENGTH').AsInteger; {do not localize}
                end;
                blr_float, blr_double, blr_d_float: DataType := ftFloat;
!               blr_short: begin
                  sqlscale := Query.Current.ByName('RDB$FIELD_SCALE').AsInteger; {do not localize}
                  if (sqlscale = 0) then
                    DataType := ftSmallInt
!                 else begin
                    DataType := ftBCD;
                    Precision := 4;
                  end;
                end;
!               blr_long: begin
                  sqlscale := Query.Current.ByName('RDB$FIELD_SCALE').AsInteger; {do not localize}
                  if (sqlscale = 0) then
                    DataType := ftInteger
!                 else if (sqlscale >= (-4)) then begin
                    DataType := ftBCD;
                    Precision := 9;
!                 end else
                    DataType := ftFloat;
                end;
!               blr_int64: begin
                  sqlscale := Query.Current.ByName('RDB$FIELD_SCALE').AsInteger; {do not localize}
                  if (sqlscale = 0) then
                    DataType := ftLargeInt
!                 else if (sqlscale >= (-4)) then begin
                    DataType := ftBCD;
                    Precision := 18;
!                 end else
                    DataType := ftFloat;
                end;
--- 334,378 ----
              Name := TrimRight(Query.Current.ByName('RDB$FIELD_NAME').AsString); {do not localize}
              case Query.Current.ByName('RDB$FIELD_TYPE').AsInteger of {do not localize}
!               blr_varying, blr_text:
!               begin
                  DataType := ftString;
                  Size := Query.Current.ByName('RDB$FIELD_LENGTH').AsInteger; {do not localize}
                end;
                blr_float, blr_double, blr_d_float: DataType := ftFloat;
!               blr_short:
!               begin
                  sqlscale := Query.Current.ByName('RDB$FIELD_SCALE').AsInteger; {do not localize}
                  if (sqlscale = 0) then
                    DataType := ftSmallInt
!                 else
!                 begin
                    DataType := ftBCD;
                    Precision := 4;
                  end;
                end;
!               blr_long:
!               begin
                  sqlscale := Query.Current.ByName('RDB$FIELD_SCALE').AsInteger; {do not localize}
                  if (sqlscale = 0) then
                    DataType := ftInteger
!                 else if (sqlscale >= (-4)) then
!                 begin
                    DataType := ftBCD;
                    Precision := 9;
!                 end
!                 else
                    DataType := ftFloat;
                end;
!               blr_int64:
!               begin
                  sqlscale := Query.Current.ByName('RDB$FIELD_SCALE').AsInteger; {do not localize}
                  if (sqlscale = 0) then
                    DataType := ftLargeInt
!                 else if (sqlscale >= (-4)) then
!                 begin
                    DataType := ftBCD;
                    Precision := 18;
!                 end
!                 else
                    DataType := ftFloat;
                end;
***************
*** 375,379 ****
                  else
                    DataType := ftBlob;
!               blr_quad: begin
                  DataType := ftUnknown;
                  Size := sizeof (TISC_QUAD);
--- 385,390 ----
                  else
                    DataType := ftBlob;
!               blr_quad:
!               begin
                  DataType := ftUnknown;
                  Size := sizeof (TISC_QUAD);
***************
*** 391,395 ****
              if ((not InternalCalcField) and
                   Query.Current.ByName('RDB$DEFAULT_VALUE').IsNull and {do not localize}
!                  (Query.Current.ByName('RDB$NULL_FLAG').AsInteger = 1) )then begin {do not localize}
                Attributes := [faRequired];
                Required := True;
--- 402,407 ----
              if ((not InternalCalcField) and
                   Query.Current.ByName('RDB$DEFAULT_VALUE').IsNull and {do not localize}
!                  (Query.Current.ByName('RDB$NULL_FLAG').AsInteger = 1) )then {do not localize}
!             begin
                Attributes := [faRequired];
                Required := True;
***************
*** 426,432 ****
      begin
       Query.SQL.Text := 'Alter Table ' + {do not localize}
!        FormatIdentifier(Database.SQLDialect, FTableName) +
         ' Add CONSTRAINT ' +   {do not localize}
!        FormatIdentifier(Database.SQLDialect, Name)
         + ' Primary Key (' + {do not localize}
         FormatFieldsList(Fields) +
--- 438,444 ----
      begin
       Query.SQL.Text := 'Alter Table ' + {do not localize}
!        QuoteIdentifier(Database.SQLDialect, FTableName) +
         ' Add CONSTRAINT ' +   {do not localize}
!        QuoteIdentifier(Database.SQLDialect, Name)
         + ' Primary Key (' + {do not localize}
         FormatFieldsList(Fields) +
***************
*** 435,459 ****
      else if ([ixUnique, ixDescending] * Options = [ixUnique, ixDescending]) then
        Query.SQL.Text := 'Create unique Descending Index ' + {do not localize}
!                         FormatIdentifier(Database.SQLDialect, Name) +
                          ' on ' + {do not localize}
!                         FormatIdentifier(Database.SQLDialect, FTableName) +
                          ' (' + FieldList + ')'
      else if (ixUnique in Options) then
        Query.SQL.Text := 'Create unique Index ' + {do not localize}
!                         FormatIdentifier(Database.SQLDialect, Name) +
                          ' on ' + {do not localize}
!                         FormatIdentifier(Database.SQLDialect, FTableName) +
                          ' (' + FieldList + ')'
      else if (ixDescending in Options) then
        Query.SQL.Text := 'Create Descending Index ' + {do not localize}
!                         FormatIdentifier(Database.SQLDialect, Name) +
                          ' on ' + {do not localize}
!                         FormatIdentifier(Database.SQLDialect, FTableName) +
                          ' (' + FieldList + ')'
      else
        Query.SQL.Text := 'Create Index ' + {do not localize}
!                         FormatIdentifier(Database.SQLDialect, Name) +
                          ' on ' + {do not localize}
!                         FormatIdentifier(Database.SQLDialect, FTableName) +
                          ' (' + FieldList + ')';
      Query.Prepare;
--- 447,471 ----
      else if ([ixUnique, ixDescending] * Options = [ixUnique, ixDescending]) then
        Query.SQL.Text := 'Create unique Descending Index ' + {do not localize}
!                         QuoteIdentifier(Database.SQLDialect, Name) +
                          ' on ' + {do not localize}
!                         QuoteIdentifier(Database.SQLDialect, FTableName) +
                          ' (' + FieldList + ')'
      else if (ixUnique in Options) then
        Query.SQL.Text := 'Create unique Index ' + {do not localize}
!                         QuoteIdentifier(Database.SQLDialect, Name) +
                          ' on ' + {do not localize}
!                         QuoteIdentifier(Database.SQLDialect, FTableName) +
                          ' (' + FieldList + ')'
      else if (ixDescending in Options) then
        Query.SQL.Text := 'Create Descending Index ' + {do not localize}
!                         QuoteIdentifier(Database.SQLDialect, Name) +
                          ' on ' + {do not localize}
!                         QuoteIdentifier(Database.SQLDialect, FTableName) +
                          ' (' + FieldList + ')'
      else
        Query.SQL.Text := 'Create Index ' + {do not localize}
!                         QuoteIdentifier(Database.SQLDialect, Name) +
                          ' on ' + {do not localize}
!                         QuoteIdentifier(Database.SQLDialect, FTableName) +
                          ' (' + FieldList + ')';
      Query.Prepare;
***************
*** 476,480 ****
        Query.Transaction := Transaction;
        Query.SQL.Text := 'Drop index ' +  {do not localize}
!                          FormatIdentifier(Database.SQLDialect, Name);
        Query.Prepare;
        Query.ExecQuery;
--- 488,492 ----
        Query.Transaction := Transaction;
        Query.SQL.Text := 'Drop index ' +  {do not localize}
!                          QuoteIdentifier(Database.SQLDialect, Name);
        Query.Prepare;
        Query.ExecQuery;
***************
*** 495,503 ****
          'where RDB$RELATION_NAME = ' +
          '''' +
!         FormatIdentifierValue(Database.SQLDialect, FTableName) +
          ''' ' +
          ' AND RDB$CONSTRAINT_NAME = ' +
          '''' +
!         FormatIdentifierValue(Database.SQLDialect, Name) +
          ''' ' +
          'AND RDB$CONSTRAINT_TYPE = ''PRIMARY KEY''';
--- 507,517 ----
          'where RDB$RELATION_NAME = ' +
          '''' +
!         FormatIdentifierValue(Database.SQLDialect,
!           QuoteIdentifier(DataBase.SQLDialect, FTableName)) +
          ''' ' +
          ' AND RDB$CONSTRAINT_NAME = ' +
          '''' +
!         FormatIdentifierValue(Database.SQLDialect,
!           QuoteIdentifier(DataBase.SQLDialect, Name)) +
          ''' ' +
          'AND RDB$CONSTRAINT_TYPE = ''PRIMARY KEY''';
***************
*** 508,514 ****
          Query.Close;
          Query.SQL.Text := 'Alter Table ' +  {do not localize}
!           FormatIdentifier(Database.SQLDialect, FTableName) +
            ' Drop Constraint ' +
!           FormatIdentifier(Database.SQLDialect, Name);
          Query.Prepare;
          Query.ExecQuery;
--- 522,528 ----
          Query.Close;
          Query.SQL.Text := 'Alter Table ' +  {do not localize}
!           QuoteIdentifier(DataBase.SQLDialect, FTableName) +
            ' Drop Constraint ' +
!           QuoteIdentifier(DataBase.SQLDialect, Name);
          Query.Prepare;
          Query.ExecQuery;
***************
*** 530,538 ****
          'where RDB$RELATION_NAME = ' +
          '''' +
!         FormatIdentifierValue(Database.SQLDialect, FTableName) +
          ''' ' +
          'AND RDB$INDEX_NAME = ' +
          '''' +
!         FormatIdentifierValue(Database.SQLDialect, Name) +
          ''' ' +
          'AND RDB$CONSTRAINT_TYPE = ''PRIMARY KEY''';
--- 544,554 ----
          'where RDB$RELATION_NAME = ' +
          '''' +
!         FormatIdentifierValue(Database.SQLDialect,
!           QuoteIdentifier(DataBase.SQLDialect, FTableName)) +
          ''' ' +
          'AND RDB$INDEX_NAME = ' +
          '''' +
!         FormatIdentifierValue(Database.SQLDialect,
!           QuoteIdentifier(DataBase.SQLDialect, Name)) +
          ''' ' +
          'AND RDB$CONSTRAINT_TYPE = ''PRIMARY KEY''';
***************
*** 543,549 ****
          Query.Close;
          Query.SQL.Text := 'Alter Table ' +  {do not localize}
!           FormatIdentifier(Database.SQLDialect, FTableName) +
            ' Drop Constraint ' +
!           FormatIdentifier(Database.SQLDialect, Query.Current.ByName('RDB$CONSTRAINT_NAME').AsString);
          Query.Prepare;
          Query.ExecQuery;
--- 559,565 ----
          Query.Close;
          Query.SQL.Text := 'Alter Table ' +  {do not localize}
!           QuoteIdentifier(DataBase.SQLDialect, FTableName) +
            ' Drop Constraint ' +
!           QuoteIdentifier(DataBase.SQLDialect, Query.Current.ByName('RDB$CONSTRAINT_NAME').AsString);
          Query.Prepare;
          Query.ExecQuery;
***************
*** 647,651 ****
      'RDB$INDEX_SEGMENTS S where I.RDB$INDEX_NAME = S.RDB$INDEX_NAME '+ {do not localize}
      'and I.RDB$RELATION_NAME = ' + '''' + {do not localize}
!      FormatIdentifierValue(Database.SQLDialect, FTableName) + '''';
      Query.Prepare;
      Query.ExecQuery;
--- 663,668 ----
      'RDB$INDEX_SEGMENTS S where I.RDB$INDEX_NAME = S.RDB$INDEX_NAME '+ {do not localize}
      'and I.RDB$RELATION_NAME = ' + '''' + {do not localize}
!      FormatIdentifierValue(Database.SQLDialect,
!        QuoteIdentifier(DataBase.SQLDialect, FTableName)) + '''';
      Query.Prepare;
      Query.ExecQuery;
***************
*** 671,675 ****
           'Select RDB$FIELD_NAME from RDB$INDEX_SEGMENTS where RDB$INDEX_NAME = ' + {do not localize}
            '''' +
!           FormatIdentifierValue(Database.SQLDialect, Name) +
            '''' + 'ORDER BY RDB$FIELD_POSITION'; {do not localize}
            SubQuery.Prepare;
--- 688,693 ----
           'Select RDB$FIELD_NAME from RDB$INDEX_SEGMENTS where RDB$INDEX_NAME = ' + {do not localize}
            '''' +
!           FormatIdentifierValue(Database.SQLDialect,
!             QuoteIdentifier(DataBase.SQLDialect, Name)) +
            '''' + 'ORDER BY RDB$FIELD_POSITION'; {do not localize}
            SubQuery.Prepare;
***************
*** 717,721 ****
      'Select USER from RDB$RELATIONS where RDB$RELATION_NAME = ' + {do not localize}
      '''' +
!     FormatIdentifierValue(Database.SQLDialect, FTableName) + '''';
      Query.Prepare;
      Query.ExecQuery;
--- 735,740 ----
      'Select USER from RDB$RELATIONS where RDB$RELATION_NAME = ' + {do not localize}
      '''' +
!     FormatIdentifierValue(Database.SQLDialect,
!       QuoteIdentifier(DataBase.SQLDialect, FTableName)) + '''';
      Query.Prepare;
      Query.ExecQuery;
***************
*** 759,779 ****
            ftString:
              FieldList := FieldList +
!               FormatIdentifier(Database.SQLDialect, Name) +
                ' VARCHAR(' + IntToStr(Size) + ')'; {do not localize}
            ftFixedChar:
              FieldList := FieldList +
!               FormatIdentifier(Database.SQLDialect, Name) +
                ' CHAR(' + IntToStr(Size) + ')'; {do not localize}
            ftBoolean, ftSmallint, ftWord:
              FieldList := FieldList +
!               FormatIdentifier(Database.SQLDialect, Name) +
                ' SMALLINT'; {do not localize}
            ftInteger:
              FieldList := FieldList +
!               FormatIdentifier(Database.SQLDialect, Name) +
                ' INTEGER'; {do not localize}
            ftFloat, ftCurrency:
              FieldList := FieldList +
!               FormatIdentifier(Database.SQLDialect, Name) +
                ' DOUBLE PRECISION'; {do not localize}
            ftBCD: begin
--- 778,798 ----
            ftString:
              FieldList := FieldList +
!               QuoteIdentifier(DataBase.SQLDialect, Name) +
                ' VARCHAR(' + IntToStr(Size) + ')'; {do not localize}
            ftFixedChar:
              FieldList := FieldList +
!               QuoteIdentifier(DataBase.SQLDialect, Name) +
                ' CHAR(' + IntToStr(Size) + ')'; {do not localize}
            ftBoolean, ftSmallint, ftWord:
              FieldList := FieldList +
!               QuoteIdentifier(DataBase.SQLDialect, Name) +
                ' SMALLINT'; {do not localize}
            ftInteger:
              FieldList := FieldList +
!               QuoteIdentifier(DataBase.SQLDialect, Name) +
                ' INTEGER'; {do not localize}
            ftFloat, ftCurrency:
              FieldList := FieldList +
!               QuoteIdentifier(DataBase.SQLDialect, Name) +
                ' DOUBLE PRECISION'; {do not localize}
            ftBCD: begin
***************
*** 786,812 ****
              if (Precision <= 4 ) then
                FieldList := FieldList +
!                 FormatIdentifier(Database.SQLDialect, Name) +
                  ' Numeric(18, 4)' {do not localize}
              else
                FieldList := FieldList +
!                 FormatIdentifier(Database.SQLDialect, Name) +
                  ' Numeric(' + IntToStr(Precision) + ', 4)'; {do not localize}
            end;
            ftDate:
              FieldList := FieldList +
!               FormatIdentifier(Database.SQLDialect, Name) +
                ' DATE'; {do not localize}
            ftTime:
              FieldList := FieldList +
!               FormatIdentifier(Database.SQLDialect, Name) +
                ' TIME'; {do not localize}
            ftDateTime:
              if (Database.SQLDialect = 1) then
                FieldList := FieldList +
!               FormatIdentifier(Database.SQLDialect, Name) +
                ' DATE' {do not localize}
              else
                FieldList := FieldList +
!               FormatIdentifier(Database.SQLDialect, Name) +
                ' TIMESTAMP'; {do not localize}
            ftLargeInt:
--- 805,831 ----
              if (Precision <= 4 ) then
                FieldList := FieldList +
!                 QuoteIdentifier(DataBase.SQLDialect, Name) +
                  ' Numeric(18, 4)' {do not localize}
              else
                FieldList := FieldList +
!                 QuoteIdentifier(DataBase.SQLDialect, Name) +
                  ' Numeric(' + IntToStr(Precision) + ', 4)'; {do not localize}
            end;
            ftDate:
              FieldList := FieldList +
!               QuoteIdentifier(DataBase.SQLDialect, Name) +
                ' DATE'; {do not localize}
            ftTime:
              FieldList := FieldList +
!               QuoteIdentifier(DataBase.SQLDialect, Name) +
                ' TIME'; {do not localize}
            ftDateTime:
              if (Database.SQLDialect = 1) then
                FieldList := FieldList +
!               QuoteIdentifier(DataBase.SQLDialect, Name) +
                ' DATE' {do not localize}
              else
                FieldList := FieldList +
!               QuoteIdentifier(DataBase.SQLDialect, Name) +
                ' TIMESTAMP'; {do not localize}
            ftLargeInt:
***************
*** 815,827 ****
              else
                FieldList := FieldList +
!                 FormatIdentifier(Database.SQLDialect, Name) +
                  ' Numeric(18, 0)'; {do not localize}
            ftBlob, ftMemo:
              FieldList := FieldList +
!               FormatIdentifier(Database.SQLDialect, Name) +
                ' BLOB SUB_TYPE 1'; {do not localize}
            ftBytes, ftVarBytes, ftGraphic..ftTypedBinary:
              FieldList := FieldList +
!               FormatIdentifier(Database.SQLDialect, Name) +
                ' BLOB SUB_TYPE 0'; {do not localize}
            ftUnknown, ftADT, ftArray, ftReference, ftDataSet,
--- 834,846 ----
              else
                FieldList := FieldList +
!                 QuoteIdentifier(DataBase.SQLDialect, Name) +
                  ' Numeric(18, 0)'; {do not localize}
            ftBlob, ftMemo:
              FieldList := FieldList +
!               QuoteIdentifier(DataBase.SQLDialect, Name) +
                ' BLOB SUB_TYPE 1'; {do not localize}
            ftBytes, ftVarBytes, ftGraphic..ftTypedBinary:
              FieldList := FieldList +
!               QuoteIdentifier(DataBase.SQLDialect, Name) +
                ' BLOB SUB_TYPE 0'; {do not localize}
            ftUnknown, ftADT, ftArray, ftReference, ftDataSet,
***************
*** 849,853 ****
        Query.transaction := Transaction;
        Query.SQL.Text := 'Create Table ' +
!         FormatIdentifier(Database.SQLDialect, FTableName) +
          ' (' + FieldList; {do not localize}
        for I := 0 to IndexDefs.Count - 1 do
--- 868,872 ----
        Query.transaction := Transaction;
        Query.SQL.Text := 'Create Table ' +
!         QuoteIdentifier(DataBase.SQLDialect, FTableName) +
          ' (' + FieldList; {do not localize}
        for I := 0 to IndexDefs.Count - 1 do
***************
*** 856,860 ****
          begin
            Query.SQL.Text := Query.SQL.Text + ', CONSTRAINT ' +
!             FormatIdentifier(Database.SQLDialect, Name) +
              ' Primary Key (' +
              FormatFieldsList(Fields) +
--- 875,879 ----
          begin
            Query.SQL.Text := Query.SQL.Text + ', CONSTRAINT ' +
!             QuoteIdentifier(DataBase.SQLDialect, Name) +
              ' Primary Key (' +
              FormatFieldsList(Fields) +
***************
*** 896,900 ****
      Query.Transaction := Transaction;
      Query.SQL.Text := 'drop table ' +  {do not localize}
!       FormatIdentifier(Database.SQLDialect, FTableName);
      Query.Prepare;
      Query.ExecQuery;
--- 915,919 ----
      Query.Transaction := Transaction;
      Query.SQL.Text := 'drop table ' +  {do not localize}
!       QuoteIdentifier(DataBase.SQLDialect, FTableName);
      Query.Prepare;
      Query.ExecQuery;
***************
*** 915,919 ****
      Query.Transaction := Transaction;
      Query.SQL.Text := 'delete from ' + {do not localize}
!       FormatIdentifier(Database.SQLDialect, FTableName);
      Query.Prepare;
      Query.ExecQuery;
--- 934,938 ----
      Query.Transaction := Transaction;
      Query.SQL.Text := 'delete from ' + {do not localize}
!       QuoteIdentifier(DataBase.SQLDialect, FTableName);
      Query.Prepare;
      Query.ExecQuery;
***************
*** 959,963 ****
                      'from RDB$RELATIONS where RDB$RELATION_NAME = ' + {do not localize}
                      '''' +
!                     FormatIdentifierValue(Database.SQLDialect, FTableName) + '''';
      Query.Prepare;
      Query.ExecQuery;
--- 978,983 ----
                      'from RDB$RELATIONS where RDB$RELATION_NAME = ' + {do not localize}
                      '''' +
!                     FormatIdentifierValue(Database.SQLDialect,
!                       QuoteIdentifier(DataBase.SQLDialect, FTableName)) + '''';
      Query.Prepare;
      Query.ExecQuery;
***************
*** 1049,1053 ****
  begin
    if Database.SQLDialect = 1 then begin
!     Value := FormatIdentifier(Database.SQLDialect, Value);
      Result := StringReplace (Value, ';', ', ', [rfReplaceAll]);
    end
--- 1069,1073 ----
  begin
    if Database.SQLDialect = 1 then begin
!     Value := QuoteIdentifier(Database.SQLDialect, Value);
      Result := StringReplace (Value, ';', ', ', [rfReplaceAll]);
    end
***************
*** 1059,1065 ****
        FieldName := ExtractFieldName(Value, i);
        if Result = '' then
!         Result := FormatIdentifier(Database.SQLDialect, FieldName)
        else
!         Result := Result + ', ' + FormatIdentifier(Database.SQLDialect, FieldName);
      end;
    end;
--- 1079,1085 ----
        FieldName := ExtractFieldName(Value, i);
        if Result = '' then
!         Result := QuoteIdentifier(Database.SQLDialect, FieldName)
        else
!         Result := Result + ', ' + QuoteIdentifier(Database.SQLDialect, FieldName);
      end;
    end;
***************
*** 1294,1300 ****
    SQL := TStringList.Create;
    SQL.Text := 'select ' + {do not localize}
!     FormatIdentifier(Database.SQLDialect, FTableName) + '.*, '
      + 'RDB$DB_KEY as IBX_INTERNAL_DBKEY from ' {do not localize}
!     + FormatIdentifier(Database.SQLDialect, FTableName);
    if Filtered and (Filter <> '') then
    begin
--- 1314,1320 ----
    SQL := TStringList.Create;
    SQL.Text := 'select ' + {do not localize}
!     QuoteIdentifier(DataBase.SQLDialect, FTableName) + '.*, ' {do not localize}
      + 'RDB$DB_KEY as IBX_INTERNAL_DBKEY from ' {do not localize}
!     + QuoteIdentifier(DataBase.SQLDialect, FTableName);
    if Filtered and (Filter <> '') then
    begin
***************
*** 1316,1322 ****
          SQL.Text := SQL.Text + 'AND ';
        SQL.Text := SQL.Text +
!         FormatIdentifier(Database.SQLDialect, FDetailFieldsList.Strings[i]) +
          ' = :' +
!         FormatIdentifier(Database.SQLDialect, FMasterFieldsList.Strings[i]);
      end;
    end;
--- 1336,1342 ----
          SQL.Text := SQL.Text + 'AND ';
        SQL.Text := SQL.Text +
!         QuoteIdentifier(DataBase.SQLDialect, FDetailFieldsList.Strings[i]) +
          ' = :' +
!         QuoteIdentifier(DataBase.SQLDialect, FMasterFieldsList.Strings[i]);
      end;
    end;
***************
*** 1325,1331 ****
    SelectSQL.Assign(SQL);
    RefreshSQL.Text := 'select ' + {do not localize}
!     FormatIdentifier(Database.SQLDialect, FTableName) + '.*, '
      + 'RDB$DB_KEY as IBX_INTERNAL_DBKEY from ' {do not localize}
!     + FormatIdentifier(Database.SQLDialect, FTableName) +
      ' where RDB$DB_KEY = :IBX_INTERNAL_DBKEY'; {do not localize}
    WhereDBKeyRefreshSQL.Assign(RefreshSQL);
--- 1345,1351 ----
    SelectSQL.Assign(SQL);
    RefreshSQL.Text := 'select ' + {do not localize}
!     QuoteIdentifier(DataBase.SQLDialect, FTableName) + '.*, ' {do not localize}
      + 'RDB$DB_KEY as IBX_INTERNAL_DBKEY from ' {do not localize}
!     + QuoteIdentifier(DataBase.SQLDialect, FTableName) +
      ' where RDB$DB_KEY = :IBX_INTERNAL_DBKEY'; {do not localize}
    WhereDBKeyRefreshSQL.Assign(RefreshSQL);
***************
*** 1356,1370 ****
            end;
            InsertFieldList := InsertFieldList +
!             FormatIdentifier(Database.SQLDialect, Name);
            InsertParamList := InsertParamList + ':' +
!             FormatIdentifier(Database.SQLDialect, Name);
            UpdateFieldList := UpdateFieldList +
!             FormatIdentifier(Database.SQLDialect, Name) +
              ' = :' +
!             FormatIdentifier(Database.SQLDialect, Name);
            if (DataType <> ftBlob) and (DataType <>ftMemo) then
              WhereAllFieldList := WhereAllFieldList +
!               FormatIdentifier(Database.SQLDialect, Name) + ' = :' +
!               FormatIdentifier(Database.SQLDialect, Name);{do not localize}
          end;
        end;
--- 1376,1390 ----
            end;
            InsertFieldList := InsertFieldList +
!             QuoteIdentifier(DataBase.SQLDialect, Name);
            InsertParamList := InsertParamList + ':' +
!             QuoteIdentifier(DataBase.SQLDialect, Name);
            UpdateFieldList := UpdateFieldList +
!             QuoteIdentifier(DataBase.SQLDialect, Name) +
              ' = :' +
!             QuoteIdentifier(DataBase.SQLDialect, Name);
            if (DataType <> ftBlob) and (DataType <>ftMemo) then
              WhereAllFieldList := WhereAllFieldList +
!               QuoteIdentifier(DataBase.SQLDialect, Name) + ' = :' +
!               QuoteIdentifier(DataBase.SQLDialect, Name);{do not localize}
          end;
        end;
***************
*** 1382,1387 ****
        tmp := ExtractFieldName(FPrimaryIndexFields, i);
        tmp :=
!         FormatIdentifier(Database.SQLDialect, tmp) +  ' = :' +
!         FormatIdentifier(Database.SQLDialect, tmp);{do not localize}
        if WherePrimaryFieldList <> '' then
          WherePrimaryFieldList :=
--- 1402,1407 ----
        tmp := ExtractFieldName(FPrimaryIndexFields, i);
        tmp :=
!         QuoteIdentifier(DataBase.SQLDialect, tmp) +  ' = :' +
!         QuoteIdentifier(DataBase.SQLDialect, tmp);{do not localize}
        if WherePrimaryFieldList <> '' then
          WherePrimaryFieldList :=
***************
*** 1398,1416 ****
    begin
      DeleteSQL.Text := 'delete from ' + {do not localize}
!       FormatIdentifier(Database.SQLDialect, FTableName) +
        ' where RDB$DB_KEY = ' + ':IBX_INTERNAL_DBKEY'; {do not localize}
      GenerateFieldLists;
      InsertSQL.Text := 'insert into ' + {do not localize}
!       FormatIdentifier(Database.SQLDialect, FTableName) +
      ' (' + InsertFieldList + {do not localize}
        ') values (' + InsertParamList + ')'; {do not localize}
      ModifySQL.Text := 'update ' +
!       FormatIdentifier(Database.SQLDialect, FTableName) +
        ' set ' + UpdateFieldList + {do not localize}
        ' where RDB$DB_KEY = :IBX_INTERNAL_DBKEY'; {do not localize}
      WhereAllRefreshSQL.Text := 'select ' +  {do not localize}
!       FormatIdentifier(Database.SQLDialect, FTableName) + '.*, '
        + 'RDB$DB_KEY as IBX_INTERNAL_DBKEY from ' {do not localize}
!       + FormatIdentifier(Database.SQLDialect, FTableName) +
        ' where ' + WhereAllFieldList; {do not localize}
      if FPrimaryIndexFields <> '' then
--- 1418,1436 ----
    begin
      DeleteSQL.Text := 'delete from ' + {do not localize}
!       QuoteIdentifier(DataBase.SQLDialect, FTableName) +
        ' where RDB$DB_KEY = ' + ':IBX_INTERNAL_DBKEY'; {do not localize}
      GenerateFieldLists;
      InsertSQL.Text := 'insert into ' + {do not localize}
!       QuoteIdentifier(DataBase.SQLDialect, FTableName) +
      ' (' + InsertFieldList + {do not localize}
        ') values (' + InsertParamList + ')'; {do not localize}
      ModifySQL.Text := 'update ' +
!       QuoteIdentifier(DataBase.SQLDialect, FTableName) +
        ' set ' + UpdateFieldList + {do not localize}
        ' where RDB$DB_KEY = :IBX_INTERNAL_DBKEY'; {do not localize}
      WhereAllRefreshSQL.Text := 'select ' +  {do not localize}
!       QuoteIdentifier(DataBase.SQLDialect, FTableName) + '.*, '
        + 'RDB$DB_KEY as IBX_INTERNAL_DBKEY from ' {do not localize}
!       + QuoteIdentifier(DataBase.SQLDialect, FTableName) +
        ' where ' + WhereAllFieldList; {do not localize}
      if FPrimaryIndexFields <> '' then
***************
*** 1418,1424 ****
        GenerateWherePrimaryFieldList;
        WherePrimaryRefreshSQL.Text := 'select ' + {do not localize}
!         FormatIdentifier(Database.SQLDialect, FTableName) + '.*, ' {do not localize}
          + 'RDB$DB_KEY as IBX_INTERNAL_DBKEY from ' {do not localize}
!         + FormatIdentifier(Database.SQLDialect, FTableName) +
          ' where ' + WherePrimaryFieldList; {do not localize}
      end;
--- 1438,1444 ----
        GenerateWherePrimaryFieldList;
        WherePrimaryRefreshSQL.Text := 'select ' + {do not localize}
!         QuoteIdentifier(DataBase.SQLDialect, FTableName) + '.*, ' {do not localize}
          + 'RDB$DB_KEY as IBX_INTERNAL_DBKEY from ' {do not localize}
!         + QuoteIdentifier(DataBase.SQLDialect, FTableName) +
          ' where ' + WherePrimaryFieldList; {do not localize}
      end;

Index: IBUpdateSQL.pas
===================================================================
RCS file: /cvsroot/firebird/ibx/runtime/IBUpdateSQL.pas,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** IBUpdateSQL.pas	2000/08/03 20:17:19	1.1.1.1
--- IBUpdateSQL.pas	2000/09/21 15:04:10	1.2
***************
*** 31,36 ****
  interface
  
! uses Windows, SysUtils, Graphics, Classes, Controls, Db, StdVCL,
!      IB, IBCustomDataSet, IBQuery;
  
  type
--- 31,35 ----
  interface
  
! uses SysUtils, Classes, DB, IB, IBCustomDataSet, IBQuery;
  
  type

Index: IBUtils.pas
===================================================================
RCS file: /cvsroot/firebird/ibx/runtime/IBUtils.pas,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** IBUtils.pas	2000/08/03 20:17:19	1.1.1.1
--- IBUtils.pas	2000/09/21 15:04:10	1.2
***************
*** 147,153 ****
  function QuoteIdentifier(Dialect: Integer; Value: String): String;
  begin
-   Value := Trim(Value);
    if Dialect = 1 then
!     Value := AnsiUpperCase(Value)
    else
      Value := '"' + Value + '"';
--- 147,152 ----
  function QuoteIdentifier(Dialect: Integer; Value: String): String;
  begin
    if Dialect = 1 then
!     Value := AnsiUpperCase(Trim(Value))
    else
      Value := '"' + Value + '"';

Index: IBXConst.pas
===================================================================
RCS file: /cvsroot/firebird/ibx/runtime/IBXConst.pas,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** IBXConst.pas	2000/08/03 20:17:19	1.1.1.1
--- IBXConst.pas	2000/09/21 15:04:10	1.2
***************
*** 166,172 ****
    SInvalidOnStatusResult = 'Unexpected onStatus return value';
  
!   SInterbaseExpressVersion = 'InterbaseExpress 4.2';
    SEditSQL = 'Edit SQL';
!   
  implementation
  
--- 166,174 ----
    SInvalidOnStatusResult = 'Unexpected onStatus return value';
  
!   SInterbaseExpressVersion = 'InterbaseExpress 4.3';
    SEditSQL = 'Edit SQL';
!   SDPBConstantUnknownEx = 'DPB Constant (%s) is unknown';
!   STPBConstantUnknownEx = 'TPB Constant (%s) is unknown';
! 
  implementation
  

[Firebird-checkins] CVS: ibx/design DCLIB50.cfg,1.1.1.1,1.2 DCLIB50.dof,1.2,1.3 IBDBReg.pas,1.2,1.3 ibreg.dcr,1.1.1.1,1.2

[Pavel C. <pc...@us...>]

Update of /cvsroot/firebird/ibx/design
In directory slayer.i.sourceforge.net:/tmp/cvs-serv15704/design

Modified Files:
	DCLIB50.cfg DCLIB50.dof IBDBReg.pas ibreg.dcr 
Log Message:
Update to version 4.3

Index: DCLIB50.cfg
===================================================================
RCS file: /cvsroot/firebird/ibx/design/DCLIB50.cfg,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** DCLIB50.cfg	2000/08/03 20:16:53	1.1.1.1
--- DCLIB50.cfg	2000/09/21 15:04:10	1.2
***************
*** 35,38 ****
  -LE"c:\program files\borland\delphi5\bin"
  -LN"c:\program files\borland\delphi5\lib"
! -DDEBUG_ONLY;IB6_ONLY
  -Z
--- 35,38 ----
  -LE"c:\program files\borland\delphi5\bin"
  -LN"c:\program files\borland\delphi5\lib"
! -DDEBUG_ONLY
  -Z

Index: DCLIB50.dof
===================================================================
RCS file: /cvsroot/firebird/ibx/design/DCLIB50.dof,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** DCLIB50.dof	2000/09/04 12:10:33	1.2
--- DCLIB50.dof	2000/09/21 15:04:10	1.3
***************
*** 58,62 ****
  MinorVer=0
  Release=13
! Build=5
  Debug=0
  PreRelease=0
--- 58,62 ----
  MinorVer=0
  Release=13
! Build=10
  Debug=0
  PreRelease=0
***************
*** 69,73 ****
  CompanyName=Inprise Corporation
  FileDescription=Interbase Express Design Package
! FileVersion=5.0.13.5
  InternalName=IBX50
  LegalCopyright=Copyright © 1997-1999 Inprise Corporation
--- 69,73 ----
  CompanyName=Inprise Corporation
  FileDescription=Interbase Express Design Package
! FileVersion=5.0.13.10
  InternalName=IBX50
  LegalCopyright=Copyright © 1997-1999 Inprise Corporation

Index: IBDBReg.pas
===================================================================
RCS file: /cvsroot/firebird/ibx/design/IBDBReg.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** IBDBReg.pas	2000/09/04 12:10:33	1.2
--- IBDBReg.pas	2000/09/21 15:04:10	1.3
***************
*** 337,341 ****
       IBIntf, IBSQL, IBSQLMonitor, IBDatabaseInfo, IBEvents,
       IBServices, IBInstall, IBDatabaseEdit, IBTransactionEdit,
!      IBBatchMove, DBLogDlg;
  
  procedure Register;
--- 337,341 ----
       IBIntf, IBSQL, IBSQLMonitor, IBDatabaseInfo, IBEvents,
       IBServices, IBInstall, IBDatabaseEdit, IBTransactionEdit,
!      IBBatchMove, DBLogDlg, IBExtract;
  
  procedure Register;
***************
*** 343,347 ****
    RegisterComponents(IBPalette1, [TIBTable, TIBQuery,
      TIBStoredProc, TIBDatabase, TIBTransaction, TIBUpdateSQL,
!     TIBDataSet, TIBSQL, TIBDatabaseInfo, TIBSQLMonitor, TIBEvents]);
    if (TryIBLoad) and (GetIBClientVersion >= 6) then
      RegisterComponents(IBPalette2, [TIBConfigService, TIBBackupService,
--- 343,347 ----
    RegisterComponents(IBPalette1, [TIBTable, TIBQuery,
      TIBStoredProc, TIBDatabase, TIBTransaction, TIBUpdateSQL,
!     TIBDataSet, TIBSQL, TIBDatabaseInfo, TIBSQLMonitor, TIBEvents, TIBExtract]);
    if (TryIBLoad) and (GetIBClientVersion >= 6) then
      RegisterComponents(IBPalette2, [TIBConfigService, TIBBackupService,

Index: ibreg.dcr
===================================================================
RCS file: /cvsroot/firebird/ibx/design/ibreg.dcr,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
Binary files /tmp/cvsZi2yAg and /tmp/cvso0QLPm differ

[Firebird-checkins] CVS: ibconsole IBConsole.cfg,1.3,1.4 IBConsole.dof,1.4,1.5 IBConsole.res,1.4,1.5 IBConsole.todo,1.1,1.2 IBExtract.pas,1.3,1.4 frmuDBCreate.pas,1.1.1.1,1.2 frmuMain.pas,1.3,1.4 frmuObjectWindow.dfm,1.2,1.3 frmuObjectWindow.pas,1.2,1.3 wisql.dfm,1.3,1.4 wisql.pas,1.3,1.4

[Pavel C. <pc...@us...>]

Update of /cvsroot/firebird/ibconsole
In directory slayer.i.sourceforge.net:/tmp/cvs-serv9775

Modified Files:
	IBConsole.cfg IBConsole.dof IBConsole.res IBConsole.todo 
	IBExtract.pas frmuDBCreate.pas frmuMain.pas 
	frmuObjectWindow.dfm frmuObjectWindow.pas wisql.dfm wisql.pas 
Log Message:
Update to version 319

Index: IBConsole.cfg
===================================================================
RCS file: /cvsroot/firebird/ibconsole/IBConsole.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** IBConsole.cfg	2000/09/04 14:18:40	1.3
--- IBConsole.cfg	2000/09/21 14:57:20	1.4
***************
*** 2,6 ****
  -$B-
  -$C+
! -$D-
  -$E-
  -$F-
--- 2,6 ----
  -$B-
  -$C+
! -$D+
  -$E-
  -$F-

Index: IBConsole.dof
===================================================================
RCS file: /cvsroot/firebird/ibconsole/IBConsole.dof,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** IBConsole.dof	2000/09/04 14:18:40	1.4
--- IBConsole.dof	2000/09/21 14:57:20	1.5
***************
*** 3,7 ****
  B=0
  C=1
! D=0
  E=0
  F=0
--- 3,7 ----
  B=0
  C=1
! D=1
  E=0
  F=0
***************
*** 58,62 ****
  MinorVer=0
  Release=0
! Build=315
  Debug=0
  PreRelease=0
--- 58,62 ----
  MinorVer=0
  Release=0
! Build=319
  Debug=0
  PreRelease=0
***************
*** 69,73 ****
  CompanyName=Inprise Corporation
  FileDescription=IBConsole.exe
! FileVersion=1.0.0.315
  InternalName=
  LegalCopyright=Copyright © 2000 Inprise Corporation
--- 69,73 ----
  CompanyName=Inprise Corporation
  FileDescription=IBConsole.exe
! FileVersion=1.0.0.319
  InternalName=
  LegalCopyright=Copyright © 2000 Inprise Corporation
***************
*** 81,105 ****
  $(DELPHI)\Projects\Bpl\rbIP45.bpl=ReportBuilder wwRichEdit support
  $(DELPHI)\Projects\Bpl\GxComponents5.bpl=GExperts source components
! [HistoryLists\hlConditionals]
  Count=1
  Item0=DEBUG_ONLY;IB6_ONLY
  [HistoryLists\hlUnitAliases]
  Count=1
  Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
  [HistoryLists\hlSearchPath]
! Count=4
  Item0=$(DELPHI)\ibx\packages
! Item1=$(DELPHI)\Lib\Debug;$(DELPHI)\ibx\packages
! Item2=C:\Program Files\Borland\Delphi5\IBX\Packages
! Item3=$(DELPHI)\DOA\Delphi4
  [HistoryLists\hlUnitOutputDirectory]
  Count=2
! Item0=$(DELPHI)\lib
! Item1=$(DELPHI)\lib\debug
  [HistoryLists\hlBPLOutput]
! Count=1
  Item0=c:\winnt\system32
  [HistoryLists\hlDCPOutput]
! Count=2
  Item0=$(DELPHI)\lib
! Item1=$(DELPHI)\lib\debug
--- 81,111 ----
  $(DELPHI)\Projects\Bpl\rbIP45.bpl=ReportBuilder wwRichEdit support
  $(DELPHI)\Projects\Bpl\GxComponents5.bpl=GExperts source components
! [HistoryLists\hlDebugSourcePath]
  Count=1
+ Item0=$(DELPHI)\ibdac;$(DELPHI)\db;$(DELPHI)\midas
+ [HistoryLists\hlConditionals]
+ Count=2
  Item0=DEBUG_ONLY;IB6_ONLY
+ Item1=DEBUG_ONLY
  [HistoryLists\hlUnitAliases]
  Count=1
  Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
  [HistoryLists\hlSearchPath]
! Count=3
  Item0=$(DELPHI)\ibx\packages
! Item1=$(DELPHI)\Experts\GExperts
! Item2=$(DELPHI)\ibdac;$(DELPHI)\db;$(DELPHI)\midas
  [HistoryLists\hlUnitOutputDirectory]
  Count=2
! Item0=$(DELPHI)\Lib
! Item1=$(DELPHI)\Lib\Debug
  [HistoryLists\hlBPLOutput]
! Count=3
  Item0=c:\winnt\system32
+ Item1=$(DELPHI)\bin
+ Item2=c:\windows\system32
  [HistoryLists\hlDCPOutput]
! Count=3
  Item0=$(DELPHI)\lib
! Item1=$(DELPHI)\lib\Debug
! Item2=$DELPHI)\lib

Index: IBConsole.res
===================================================================
RCS file: /cvsroot/firebird/ibconsole/IBConsole.res,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
Binary files /tmp/cvsj6GIMv and /tmp/cvsapIQrR differ

Index: IBConsole.todo
===================================================================
RCS file: /cvsroot/firebird/ibconsole/IBConsole.todo,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** IBConsole.todo	2000/08/21 11:11:23	1.1
--- IBConsole.todo	2000/09/21 14:57:20	1.2
***************
*** 1 ****
! {TODO : Remove certificates from IBConsole as IB 6.0 no longer requires nor has this functionality} 
\ No newline at end of file
--- 1 ----
! {TODO :   Remove certificates  from IBConsole as IB 6.0 no longer requires nor has this functionality} 

Index: IBExtract.pas
===================================================================
RCS file: /cvsroot/firebird/ibconsole/IBExtract.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** IBExtract.pas	2000/09/04 14:18:40	1.3
--- IBExtract.pas	2000/09/21 14:57:20	1.4
***************
*** 9,16 ****
  {    express or implied. See the License for the specific language       }
  {    governing rights and limitations under the License.                 }
! {    The Original Code was created by InterBase Software Corporation     }
! {       and its successors.                                              }
! {    Portions created by Inprise Corporation are Copyright (C) Inprise   }
! {       Corporation. All Rights Reserved.                                }
  {    IBX Version 4.2 or higher required                                  }
  {    Contributor(s): Jeff Overcash                                       }
--- 9,17 ----
  {    express or implied. See the License for the specific language       }
  {    governing rights and limitations under the License.                 }
! {                                                                        }
! {    The Original Code was created by Jeff Overcash.                     } 
! {    Portions based upon code by Inprise Corporation are Copyright (C)   }
! {       Inprise Corporation. All Rights Reserved.                        }
! {                                                                        }
  {    IBX Version 4.2 or higher required                                  }
  {    Contributor(s): Jeff Overcash                                       }
***************
*** 27,38 ****
  
  type
! 	TExtractObjectTypes =
!   	 (eoDatabase, eoDomain, eoTable, eoView, eoProcedure, eoFunction,
!     	eoGenerator, eoException, eoBLOBFilter, eoRole, eoTrigger, eoForeign,
!       eoIndexes, eoChecks, eoData);
  
    TExtractType =
!   	 (etDomain, etTable, etRole, etTrigger, etForeign,
!       etIndex, etData, etGrant, etCheck);
  
    TExtractTypes = Set of TExtractType;
--- 28,39 ----
  
  type
!   TExtractObjectTypes =
!     (eoDatabase, eoDomain, eoTable, eoView, eoProcedure, eoFunction,
!      eoGenerator, eoException, eoBLOBFilter, eoRole, eoTrigger, eoForeign,
!      eoIndexes, eoChecks, eoData);
  
    TExtractType =
!     (etDomain, etTable, etRole, etTrigger, etForeign,
!      etIndex, etData, etGrant, etCheck);
  
    TExtractTypes = Set of TExtractType;
***************
*** 213,218 ****
    obj_sql_role = 13;
  
- procedure Register;
- 
  implementation
  
--- 214,217 ----
***************
*** 247,266 ****
      'ORDER BY FDIM.RDB$DIMENSION';
  
- procedure Register;
- begin
-   RegisterComponents('InterBase', [TIBExtract]);
- end;
- 
- function QuoteIdentifier(Dialect: Integer; Value: String): String;
- begin
-   Value := Trim(Value);
-   if Dialect = 1 then
-     Value := AnsiUpperCase(Value)
-   else
-     Value := '"' + Value + '"';
-   Result := Value;
- end;
- 
- 
  { TIBExtract }
  
--- 246,249 ----
***************
*** 471,474 ****
--- 454,459 ----
        else
        begin
+         FieldType := qryTables.FieldByName('RDB$FIELD_TYPE').AsInteger;
+         FieldScale := qryTables.FieldByName('RDB$FIELD_SCALE').AsInteger;
          if not ((Copy(qryTables.FieldByName('RDB$FIELD_NAME1').AsString, 1, 4) = 'RDB$') and
            (qryTables.FieldByName('RDB$FIELD_NAME1').AsString[5] in ['0'..'9'])) and
***************
*** 485,490 ****
                               Collation, true);
            end;
-           if qryTables.FieldByName('RDB$NULL_FLAG').AsInteger = 1 then
-             Column := Column + ' NOT NULL';
          end
          else
--- 470,473 ----
***************
*** 494,499 ****
            begin
              PrecisionKnown := false;
-             FieldType := qryTables.FieldByName('RDB$FIELD_TYPE').AsInteger;
-             FieldScale := qryTables.FieldByName('RDB$FIELD_SCALE').AsInteger;
              if qryTables.FieldByname('RDB$FIELD_TYPE').AsShort = ColumnTypes[i].SQLType then
              begin
--- 477,480 ----
***************
*** 542,546 ****
                end;
              end;
!           end; 
            if FieldType in [blr_text, blr_varying] then
              if qryTables.FieldByName('RDB$CHARACTER_LENGTH').IsNull then
--- 523,527 ----
                end;
              end;
!           end;
            if FieldType in [blr_text, blr_varying] then
              if qryTables.FieldByName('RDB$CHARACTER_LENGTH').IsNull then
***************
*** 581,636 ****
              intchar := 1;
            end;
  
  
-           { Handle defaults for columns }
-           { Originally This called PrintMetadataTextBlob,
-               should no longer need }
-           if not qryTables.FieldByName('RDB$DEFAULT_SOURCE').IsNull then
-             Column := Column + ' ' + qryTables.FieldByName('RDB$DEFAULT_SOURCE').AsString;
  
  
!           { The null flag is either 1 or null (for nullable) .  if there is
!             a constraint name, print that too.  Domains cannot have named
!             constraints.  The column name is in rdb$trigger_name in
!             rdb$check_constraints.  We hope we get at most one row back. }
  
!           if qryTables.FieldByName('RDB$NULL_FLAG').AsInteger = 1 then
            begin
!             qryConstraints.Params.ByName('FIELDNAME').AsString := qryTables.FieldByName('RDB$FIELD_NAME').AsString;
!             qryConstraints.Params.ByName('RELATIONNAME').AsString := qryTables.FieldByName('RDB$RELATION_NAME').AsString;
!             qryConstraints.ExecQuery;
! 
!             while not qryConstraints.Eof do
!             begin
!               if Pos('INTEG', qryConstraints.FieldByName('RDB$CONSTRAINT_NAME').AsString) <> 1 then
!                 Column := Column + Format(' CONSTRAINT %s',
!                   [ QuoteIdentifier( FDatabase.SQLDialect,
!                         qryConstraints.FieldByName('RDB$CONSTRAINT_NAME').AsString)]);
!               qryConstraints.Next;
!             end;
!             qryConstraints.Close;
!             Column := Column + ' NOT NULL';
            end;
! 
!           if ((FieldType in [blr_text, blr_varying]) or
!               (FieldType = blr_blob)) and
!              (not qryTables.FieldByName('RDB$CHARACTER_SET_ID').IsNull) and
!              (qryTables.FieldByName('RDB$CHARACTER_SET_ID').AsInteger <> 0) and
!              (intchar <> 0) then
!           begin
!             Collation := 0;
!             if not qryTables.FieldByName('RDB$COLLATION_ID1').IsNull then
!               Collation := qryTables.FieldByName('RDB$COLLATION_ID1').AsInteger
!             else
!               if not qryTables.FieldByName('RDB$COLLATION_ID').IsNull then
!                 Collation := qryTables.FieldByName('RDB$COLLATION_ID').AsInteger;
! 
!             CharSetId := 0;
!             if not qryTables.FieldByName('RDB$CHARACTER_SET_ID').IsNull then
!               CharSetId := qryTables.FieldByName('RDB$CHARACTER_SET_ID').AsInteger;
  
!             if Collation <> 0 then
!               Column := Column + GetCharacterSets(CharSetId, Collation, true);
!           end;
          end;
        end;
--- 562,616 ----
              intchar := 1;
            end;
+         end;
  
+         { Handle defaults for columns }
+         { Originally This called PrintMetadataTextBlob,
+             should no longer need }
+         if not qryTables.FieldByName('RDB$DEFAULT_SOURCE').IsNull then
+           Column := Column + ' ' + qryTables.FieldByName('RDB$DEFAULT_SOURCE').AsString;
  
  
+         { The null flag is either 1 or null (for nullable) .  if there is
+           a constraint name, print that too.  Domains cannot have named
+           constraints.  The column name is in rdb$trigger_name in
+           rdb$check_constraints.  We hope we get at most one row back. }
  
!         if qryTables.FieldByName('RDB$NULL_FLAG').AsInteger = 1 then
!         begin
!           qryConstraints.Params.ByName('FIELDNAME').AsString := qryTables.FieldByName('RDB$FIELD_NAME').AsString;
!           qryConstraints.Params.ByName('RELATIONNAME').AsString := qryTables.FieldByName('RDB$RELATION_NAME').AsString;
!           qryConstraints.ExecQuery;
  
!           while not qryConstraints.Eof do
            begin
!             if Pos('INTEG', qryConstraints.FieldByName('RDB$CONSTRAINT_NAME').AsString) <> 1 then
!               Column := Column + Format(' CONSTRAINT %s',
!                 [ QuoteIdentifier( FDatabase.SQLDialect,
!                       qryConstraints.FieldByName('RDB$CONSTRAINT_NAME').AsString)]);
!             qryConstraints.Next;
            end;
!           qryConstraints.Close;
!           Column := Column + ' NOT NULL';
!         end;
! 
!         if ((FieldType in [blr_text, blr_varying]) or
!             (FieldType = blr_blob)) and
!            (not qryTables.FieldByName('RDB$CHARACTER_SET_ID').IsNull) and
!            (qryTables.FieldByName('RDB$CHARACTER_SET_ID').AsInteger <> 0) and
!            (intchar <> 0) then
!         begin
!           Collation := 0;
!           if not qryTables.FieldByName('RDB$COLLATION_ID1').IsNull then
!             Collation := qryTables.FieldByName('RDB$COLLATION_ID1').AsInteger
!           else
!             if not qryTables.FieldByName('RDB$COLLATION_ID').IsNull then
!               Collation := qryTables.FieldByName('RDB$COLLATION_ID').AsInteger;
! 
!           CharSetId := 0;
!           if not qryTables.FieldByName('RDB$CHARACTER_SET_ID').IsNull then
!             CharSetId := qryTables.FieldByName('RDB$CHARACTER_SET_ID').AsInteger;
  
!           if Collation <> 0 then
!             Column := Column + GetCharacterSets(CharSetId, Collation, true);
          end;
        end;

Index: frmuDBCreate.pas
===================================================================
RCS file: /cvsroot/firebird/ibconsole/frmuDBCreate.pas,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** frmuDBCreate.pas	2000/08/03 20:15:01	1.1.1.1
--- frmuDBCreate.pas	2000/09/21 14:57:20	1.2
***************
*** 390,394 ****
  
    sgOptions.Cells[OPTION_NAME_COL,PAGE_SIZE_ROW] := 'Page Size';
!   sgOptions.Cells[OPTION_VALUE_COL,PAGE_SIZE_ROW] := '1024';
  
    sgOptions.Cells[OPTION_NAME_COL,DEFAULT_CHARSET_ROW] := 'Default Character Set';
--- 390,394 ----
  
    sgOptions.Cells[OPTION_NAME_COL,PAGE_SIZE_ROW] := 'Page Size';
!   sgOptions.Cells[OPTION_VALUE_COL,PAGE_SIZE_ROW] := '4096';
  
    sgOptions.Cells[OPTION_NAME_COL,DEFAULT_CHARSET_ROW] := 'Default Character Set';

Index: frmuMain.pas
===================================================================
RCS file: /cvsroot/firebird/ibconsole/frmuMain.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** frmuMain.pas	2000/09/04 14:18:40	1.3
--- frmuMain.pas	2000/09/21 14:57:20	1.4
***************
*** 820,824 ****
                  end;
  
!               FCurrSelDatabase.ObjectViewer.InitDlg (FCurrSelTreeNode.NodeType,FCurrSelTreeNode.ObjectList,
                                       Selected.Caption, FCurrSelDatabase.Database, Icon, FViewSystemData, FRefetch);
                FRefetch := false;
--- 820,824 ----
                  end;
  
!               FCurrSelDatabase.ObjectViewer.InitDlg(FCurrSelTreeNode.NodeType,FCurrSelTreeNode.ObjectList,
                                       Selected.Caption, FCurrSelDatabase.Database, Icon, FViewSystemData, FRefetch);
                FRefetch := false;

Index: frmuObjectWindow.dfm
===================================================================
RCS file: /cvsroot/firebird/ibconsole/frmuObjectWindow.dfm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** frmuObjectWindow.dfm	2000/08/21 11:11:24	1.2
--- frmuObjectWindow.dfm	2000/09/21 14:57:20	1.3
***************
*** 282,286 ****
              Top = 171
              Width = 615
!             Height = 177
              Align = alClient
              Columns = <>
--- 282,286 ----
              Top = 171
              Width = 615
!             Height = 176
              Align = alClient
              Columns = <>
***************
*** 509,513 ****
          Top = 0
          Width = 623
!         Height = 376
          Align = alClient
          Font.Charset = ANSI_CHARSET
--- 509,513 ----
          Top = 0
          Width = 623
!         Height = 375
          Align = alClient
          Font.Charset = ANSI_CHARSET
***************
*** 531,535 ****
          Top = 0
          Width = 623
!         Height = 335
          Align = alClient
          Columns = <
--- 531,535 ----
          Top = 0
          Width = 623
!         Height = 334
          Align = alClient
          Columns = <

Index: frmuObjectWindow.pas
===================================================================
RCS file: /cvsroot/firebird/ibconsole/frmuObjectWindow.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** frmuObjectWindow.pas	2000/08/21 11:11:24	1.2
--- frmuObjectWindow.pas	2000/09/21 14:57:20	1.3
***************
*** 29,33 ****
  
  type
!   TTblData = record
      Columns,
      Indexes,
--- 29,34 ----
  
  type
!   TTblData = class
!   public
      Columns,
      Indexes,
***************
*** 36,51 ****
      UniqueConst,
      RefConst: TStringList;
    end;
  
!   TProcedureData = record
      Params: TStringList;
      Source: TStringList;
    end;
  
!   TFunctionData = record
      Params: TStringList;
      ReturnVal,
      EntryPoint,
      ModuleName: String;
    end;
  
--- 37,60 ----
      UniqueConst,
      RefConst: TStringList;
+     constructor Create;
+     destructor Destroy; override;
    end;
  
!   TProcedureData = class
!   public
      Params: TStringList;
      Source: TStringList;
+     constructor Create;
+     destructor Destroy; override;
    end;
  
!   TFunctionData = class
!   public
      Params: TStringList;
      ReturnVal,
      EntryPoint,
      ModuleName: String;
+     constructor Create;
+     destructor Destroy; override;
    end;
  
***************
*** 179,183 ****
      FMetadataRefreshList: array of boolean;
      FRefreshList: array of boolean;
!     
      FIndex,
      FObjType: Integer;
--- 188,192 ----
      FMetadataRefreshList: array of boolean;
      FRefreshList: array of boolean;
! 
      FIndex,
      FObjType: Integer;
***************
*** 276,318 ****
      FObjectArray.Free;
  
!   for lCnt := 0 to High(FTableData) do
!   begin
!     with FTableData[lCnt] do
!     begin
!       if Assigned (Columns) then Columns.Free;
!       if Assigned (Indexes) then Indexes.Free;
!       if Assigned (TriggerS) then Triggers.Free;
!       if Assigned (CheckConst) then CheckConst.Free;
!       if Assigned (UniqueConst) then UniqueConst.Free;
!       if Assigned (RefConst) then RefConst.Free;
!     end;
!   end;
! 
!   for lCnt := 0 to High(FProcedureData) do
!   begin
!     with FProcedureData[lCnt] do
!     begin
!       if Assigned(Params) then Params.Free;
!       if Assigned(Source) then Source.Free;
!     end;
!   end;
  
!   for lCnt := 0 to High(FFunctionData) do
!     if Assigned (FFunctionData[lCnt].Params) then FFunctionData[lCnt].Params.Free;
  
  
    if Assigned(FFilterData) then
      FFilterData.Free;
  
!   if Assigned (FRoleData) then FRoleData.Free;
!   if Assigned (FExceptionData) then FExceptionData.Free;
!   if Assigned (FViewData) then FViewData.Free;
!   if Assigned (FGenData) then FGenData.Free;
!   if Assigned (FDomainData) then FDomainData.Free;
  
!   if Assigned (FDataSet) then
      FDataSet.Free;
  
!   if Assigned (FTransaction) then
    begin
      if FTransaction.InTransaction then
--- 285,315 ----
      FObjectArray.Free;
  
!   for lCnt := Low(FTableData) to High(FTableData) do
!     FreeAndNil(FTableData[lCnt]);
  
!   for lCnt := Low(FProcedureData) to High(FProcedureData) do
!     FreeAndNil(FProcedureData[lCnt]);
  
+   for lCnt := Low(FFunctionData) to High(FFunctionData) do
+     FreeAndNil(FFunctionData[lCnt]);
  
    if Assigned(FFilterData) then
      FFilterData.Free;
  
!   if Assigned(FRoleData) then
!     FRoleData.Free;
!   if Assigned(FExceptionData) then
!     FExceptionData.Free;
!   if Assigned(FViewData) then
!     FViewData.Free;
!   if Assigned(FGenData) then
!     FGenData.Free;
!   if Assigned(FDomainData) then
!     FDomainData.Free;
  
!   if Assigned(FDataSet) then
      FDataSet.Free;
  
!   if Assigned(FTransaction) then
    begin
      if FTransaction.InTransaction then
***************
*** 321,325 ****
    end;
  
!   inherited;
  end;
  
--- 318,322 ----
    end;
  
!   inherited Destroy;
  end;
  
***************
*** 346,351 ****
    Caption := Format('Properties for: %s',[Trim(ObjName)]);
    Icon := ObjIcon;
!   FObjNameList := TStringList.Create;
!   FObjectArray := TStringList.Create;
    cbObjectList.Items.Clear;
    reMetadata.Clear;
--- 343,355 ----
    Caption := Format('Properties for: %s',[Trim(ObjName)]);
    Icon := ObjIcon;
!   if not Assigned(FObjNameList) then
!     FObjNameList := TStringList.Create
!   else
!     FObjNameList.Clear;
!   if not Assigned(FObjectArray) then
!     FObjectArray := TStringList.Create
!   else
!     FObjectArray.Clear;
!     
    cbObjectList.Items.Clear;
    reMetadata.Clear;
***************
*** 453,457 ****
    reMetadata.Clear;
    pgcPropertiesChange(pgcProperties);
!   frmMain.UpdateWindowList(Caption, Self);  
  end;
  
--- 457,461 ----
    reMetadata.Clear;
    pgcPropertiesChange(pgcProperties);
!   frmMain.UpdateWindowList(Caption, Self);
  end;
  
***************
*** 461,465 ****
    Visible := false;
  
!   FDataSet := TIBDataSet.Create (self);
    with FDataSet do
    begin
--- 465,469 ----
    Visible := false;
  
!   FDataSet := TIBDataSet.Create(nil);
    with FDataSet do
    begin
***************
*** 469,473 ****
      SparseArrays := true;
    end;
- 
  end;
  
--- 473,476 ----
***************
*** 966,979 ****
    end;
    TmpList := TStringList.create;
!   TmpList.Add(Format('Type%sCharacter Set%sCollation%sDefault Value%sAllow Nulls', [DEL,DEL,DEL,DEL]));
!   TmpList.Add (FDomainData.Strings[FIdx]);
!   FillList (lVDomains, TmpList);
! 
!   tmpString := FDomainData.Strings[FIdx];
!   for cnt := 0 to lvDomains.Items[0].SubItems.Count - 1 do
!     GetNextField (tmpString, DEL);
! 
!   reConstraint.Text := GetNextField(tmpString, DEL);
!   TmpList.Free;
  end;
  
--- 969,985 ----
    end;
    TmpList := TStringList.create;
!   try
!     TmpList.Add(Format('Type%sCharacter Set%sCollation%sDefault Value%sAllow Nulls', [DEL,DEL,DEL,DEL]));
!     TmpList.Add(FDomainData.Strings[FIdx]);
!     FillList(lVDomains, TmpList);
! 
!     tmpString := FDomainData.Strings[FIdx];
!     for cnt := 0 to lvDomains.Items[0].SubItems.Count - 1 do
!       GetNextField(tmpString, DEL);
! 
!     reConstraint.Text := GetNextField(tmpString, DEL);
!   finally
!     TmpList.Free;
!   end;
  end;
  
***************
*** 989,994 ****
    end;
    
!   if not Assigned (FTableData[Fidx].Columns) then
!     FTableData[Fidx].Columns := TStringList.Create;
  
    if (FTableData[Fidx].Columns.Count <= 0) or FRefreshList[FIdx] = true then
--- 995,1000 ----
    end;
    
!   if not Assigned(FTableData[Fidx]) then
!     FTableData[Fidx] := TTblData.Create;
  
    if (FTableData[Fidx].Columns.Count <= 0) or FRefreshList[FIdx] = true then
***************
*** 999,1003 ****
    end;
  
!   FillList (lvTableObjects, FTableData[Fidx].Columns);
  
    if FObjType = NODE_VIEWS then
--- 1005,1009 ----
    end;
  
!   FillList(lvTableObjects, FTableData[Fidx].Columns);
  
    if FObjType = NODE_VIEWS then
***************
*** 1032,1067 ****
    lsCurrLine: string;
    i: integer;
  
  begin
!   ListObject.Items.BeginUpdate;
!   ListObject.Items.Clear;
! 
!   ListObject.Columns.Clear;
  
!   ListObject.AllocBy := StringList.Count;
  
!   { The column Headers are stored in element 0 }
!   lsCurrLine := StringList.Strings[0];
!   while Length(lsCurrLine) > 0 do
!   begin
!     loListColumn := ListObject.Columns.Add;
!     loListColumn.Caption := GetNextField(lsCurrLine, DEL);
!     loListColumn.Width := ColumnHeaderWidth;
!   end;
  
!   for i := 1  to StringList.Count - 1 do
!   begin
!     lsCurrLine := StringList.Strings[i];
!     loListItem := ListObject.Items.Add;
!     loListItem.Caption := GetNextField(lsCurrLine, DEL);
  
      while Length(lsCurrLine) > 0 do
      begin
!       loListItem.SubItems.Add(GetNextField(lsCurrLine, DEL));
      end;
    end;
-   ListObject.Items.EndUpdate;
-   if ListObject.Items.Count > 0 then
-     ListObject.Items[0].Selected := true;
  end;
  
--- 1038,1082 ----
    lsCurrLine: string;
    i: integer;
+   WasVisible: boolean;
  
  begin
!   // to prevent delay
!   WasVisible := ListObject.Visible;
!   ListObject.Visible := FALSE;
!   try
  
!     ListObject.Items.BeginUpdate;
!     ListObject.Items.Clear;
  
!     ListObject.Columns.Clear;
  
!     ListObject.AllocBy := StringList.Count;
  
+     { The column Headers are stored in element 0 }
+     lsCurrLine := StringList.Strings[0];
      while Length(lsCurrLine) > 0 do
      begin
!       loListColumn := ListObject.Columns.Add;
!       loListColumn.Caption := GetNextField(lsCurrLine, DEL);
!       loListColumn.Width := ColumnHeaderWidth;
      end;
+ 
+     for i := 1  to StringList.Count - 1 do
+     begin
+       lsCurrLine := StringList.Strings[i];
+       loListItem := ListObject.Items.Add;
+       loListItem.Caption := GetNextField(lsCurrLine, DEL);
+ 
+       while Length(lsCurrLine) > 0 do
+       begin
+         loListItem.SubItems.Add(GetNextField(lsCurrLine, DEL));
+       end;
+     end;
+     ListObject.Items.EndUpdate;
+     if ListObject.Items.Count > 0 then
+       ListObject.Items[0].Selected := true;
+   finally
+     ListObject.Visible := WasVisible;
    end;
  end;
  
***************
*** 1076,1081 ****
    SplitterWnd.Visible := true;
    SplitterWnd.Top := lvTableObjects.Height + lvTableObjects.Top;
!   if not Assigned (FTableData[Fidx].Triggers) then
!     FTableData[Fidx].Triggers := TStringList.Create;
  
    if (FTableData[Fidx].Triggers.Count <= 0) or FRefreshList[FIdx] = true then
--- 1091,1096 ----
    SplitterWnd.Visible := true;
    SplitterWnd.Top := lvTableObjects.Height + lvTableObjects.Top;
!   if not Assigned(FTableData[Fidx]) then
!     FTableData[Fidx] := TTblData.Create;
  
    if (FTableData[Fidx].Triggers.Count <= 0) or FRefreshList[FIdx] = true then
***************
*** 1118,1123 ****
    SplitterWnd.Visible := true;
    SplitterWnd.Top := lvTableObjects.Height + lvTableObjects.Top;
!   if not Assigned (FTableData[Fidx].CheckConst) then
!     FTableData[Fidx].CheckConst := TStringList.Create;
  
    if (FTableData[Fidx].CheckConst.Count <= 0) or FRefreshList[FIdx] = true then
--- 1133,1138 ----
    SplitterWnd.Visible := true;
    SplitterWnd.Top := lvTableObjects.Height + lvTableObjects.Top;
!   if not Assigned(FTableData[Fidx]) then
!     FTableData[Fidx] := TTblData.Create;
  
    if (FTableData[Fidx].CheckConst.Count <= 0) or FRefreshList[FIdx] = true then
***************
*** 1141,1146 ****
    lvTableObjects.OnChange := nil;
    SplitterWnd.Visible := false;
!   if not Assigned (FTableData[Fidx].Indexes) then
!     FTableData[Fidx].Indexes := TStringList.Create;
  
    if (FTableData[Fidx].Indexes.Count <= 0) or FRefreshList[FIdx] = true then
--- 1156,1161 ----
    lvTableObjects.OnChange := nil;
    SplitterWnd.Visible := false;
!   if not Assigned(FTableData[Fidx]) then
!     FTableData[Fidx] := TTblData.Create;
  
    if (FTableData[Fidx].Indexes.Count <= 0) or FRefreshList[FIdx] = true then
***************
*** 1158,1166 ****
    tbUnique.Down := true;
    reTriggerSource.Visible := false;
!   lvTableObjects.Align := alClient;  
    lvTableObjects.OnChange := nil;
    SplitterWnd.Visible := false;
!   if not Assigned (FTableData[Fidx].UniqueConst) then
!     FTableData[Fidx].UniqueConst := TStringList.Create;
  
    if (FTableData[Fidx].UniqueConst.Count <= 0) or FRefreshList[FIdx] = true then
--- 1173,1181 ----
    tbUnique.Down := true;
    reTriggerSource.Visible := false;
!   lvTableObjects.Align := alClient;
    lvTableObjects.OnChange := nil;
    SplitterWnd.Visible := false;
!   if not Assigned(FTableData[Fidx]) then
!     FTableData[Fidx] := TTblData.Create;
  
    if (FTableData[Fidx].UniqueConst.Count <= 0) or FRefreshList[FIdx] = true then
***************
*** 1183,1188 ****
    lvTableObjects.OnChange := nil;
    SplitterWnd.Visible := false;
!   if not Assigned (FTableData[Fidx].RefConst) then
!     FTableData[Fidx].RefConst := TStringList.Create;
  
    if (FTableData[Fidx].RefConst.Count <= 0) or FRefreshList[FIdx] = true then
--- 1198,1203 ----
    lvTableObjects.OnChange := nil;
    SplitterWnd.Visible := false;
!   if not Assigned(FTableData[Fidx]) then
!     FTableData[Fidx] := TTblData.Create;
  
    if (FTableData[Fidx].RefConst.Count <= 0) or FRefreshList[FIdx] = true then
***************
*** 1198,1206 ****
  procedure TfrmObjectView.GetProcedureProperties;
  begin
!   if not Assigned (FProcedureData[Fidx].Params) then
!   begin
!     FProcedureData[Fidx].Params := TStringList.Create;
!     FProcedureData[Fidx].Source := TStringList.Create;
!   end;
  
    if (FProcedureData[Fidx].Source.Count = 0) or FRefreshList[FIdx] = true then
--- 1213,1218 ----
  procedure TfrmObjectView.GetProcedureProperties;
  begin
!   if not Assigned(FProcedureData[Fidx]) then
!     FProcedureData[Fidx] := TProcedureData.Create;
  
    if (FProcedureData[Fidx].Source.Count = 0) or FRefreshList[FIdx] = true then
***************
*** 1230,1234 ****
    reProcSource.Lines.BeginUpdate;
    reProcSource.Lines.Clear;
!   reProcSource.Lines.AddStrings (FProcedureData[Fidx].Source);
    reProcSource.Lines.EndUpdate
  end;
--- 1242,1247 ----
    reProcSource.Lines.BeginUpdate;
    reProcSource.Lines.Clear;
!   if Assigned(FProcedureData[Fidx]) then
!     reProcSource.Lines.AddStrings(FProcedureData[Fidx].Source);
    reProcSource.Lines.EndUpdate
  end;
***************
*** 1236,1241 ****
  procedure TfrmObjectView.GetFunctionProperties;
  begin
!   if not Assigned(FFunctionData[FIdx].Params) then
!     FFunctionData[Fidx].Params := TStringList.Create;
  
    if (Length(FFunctionData[FIdx].ModuleName) = 0) or FRefreshList[FIdx] = true then
--- 1249,1254 ----
  procedure TfrmObjectView.GetFunctionProperties;
  begin
!   if not Assigned(FFunctionData[FIdx]) then
!     FFunctionData[Fidx] := TFunctionData.Create;
  
    if (Length(FFunctionData[FIdx].ModuleName) = 0) or FRefreshList[FIdx] = true then
***************
*** 1384,1391 ****
      end;
    Reg := TRegistry.Create;
!   with Reg do begin
      OpenKey(gRegSettingsKey,false);
      WriteBinaryData('ObjState', State, sizeof(State));
      CloseKey;
      Free;
    end;
--- 1397,1406 ----
      end;
    Reg := TRegistry.Create;
!   with Reg do
!   try
      OpenKey(gRegSettingsKey,false);
      WriteBinaryData('ObjState', State, sizeof(State));
      CloseKey;
+   finally
      Free;
    end;
***************
*** 1400,1403 ****
--- 1415,1469 ----
      FRefreshList[lCnt] := true;
    pgcPropertiesChange(pgcProperties);
+ end;
+ 
+ { TTblData }
+ 
+ constructor TTblData.Create;
+ begin
+   Columns := TStringList.Create;
+   Indexes := TStringList.Create;
+   Triggers := TStringList.Create;
+   CheckConst := TStringList.Create;
+   UniqueConst := TStringList.Create;
+   RefConst := TStringList.Create;
+ end;
+ 
+ destructor TTblData.Destroy;
+ begin
+   Columns.Free;
+   Indexes.Free;
+   Triggers.Free;
+   CheckConst.Free;
+   UniqueConst.Free;
+   RefConst.Free;
+   inherited Destroy;
+ end;
+ 
+ { TProcedureData }
+ 
+ constructor TProcedureData.Create;
+ begin
+   Params := TStringList.Create;
+   Source := TStringList.Create;
+ end;
+ 
+ destructor TProcedureData.Destroy;
+ begin
+   Params.Free;
+   Source.Free;
+   inherited;
+ end;
+ 
+ { TFunctionData }
+ 
+ constructor TFunctionData.Create;
+ begin
+   Params := TStringList.Create;
+ end;
+ 
+ destructor TFunctionData.Destroy;
+ begin
+   Params.Free;
+   inherited;
  end;
  

Index: wisql.dfm
===================================================================
RCS file: /cvsroot/firebird/ibconsole/wisql.dfm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** wisql.dfm	2000/09/04 14:18:41	1.3
--- wisql.dfm	2000/09/21 14:57:20	1.4
***************
*** 44,48 ****
      Width = 634
      Height = 226
!     ActivePage = TabResults
      Align = alClient
      DockSite = True
--- 44,48 ----
      Width = 634
      Height = 226
!     ActivePage = TabData
      Align = alClient
      DockSite = True
***************
*** 144,148 ****
        WordWrap = False
        OnEnter = UpdateCursor
-       OnKeyDown = reSqlInputKeyDown
        OnKeyPress = reSqlInputKeyPress
        OnSelectionChange = UpdateCursor
--- 144,147 ----

Index: wisql.pas
===================================================================
RCS file: /cvsroot/firebird/ibconsole/wisql.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** wisql.pas	2000/09/04 14:18:41	1.3
--- wisql.pas	2000/09/21 14:57:20	1.4
***************
*** 179,184 ****
      procedure UpdateCursor(Sender: TObject);
      procedure reSqlInputKeyPress(Sender: TObject; var Key: Char);
-     procedure reSqlInputKeyDown(Sender: TObject; var Key: Word;
-       Shift: TShiftState);
      procedure TransactionExecute(Sender: TObject);
      procedure cbServersChange(Sender: TObject);
--- 179,182 ----
***************
*** 271,275 ****
  
  type
!   TWinState = record
      _Top,
      _Left,
--- 269,273 ----
  
  type
!   TWinState = packed record
      _Top,
      _Left,
***************
*** 284,288 ****
  {$R *.DFM}
  
- ///////////////////////////////////////////////////////////////
  procedure TdlgWisql.UpdateTransactionStatus(const active: boolean);
  begin
--- 282,285 ----
***************
*** 291,304 ****
      stbISQL.Panels[3].Text := 'Transaction is ACTIVE.';
      TransactionCommit.Enabled := true;
!     TransactionRollback.Enabled := true;    
    end
    else begin
      stbISQL.Panels[3].Text := 'No active transaction.';
      TransactionCommit.Enabled := false;
!     TransactionRollback.Enabled := false;    
    end
  end;
  
- ////////////////////////////////////////////////////////////
  procedure TdlgWisql.QuerySaveOutputExecute(Sender: TObject);
  begin
--- 288,300 ----
      stbISQL.Panels[3].Text := 'Transaction is ACTIVE.';
      TransactionCommit.Enabled := true;
!     TransactionRollback.Enabled := true;
    end
    else begin
      stbISQL.Panels[3].Text := 'No active transaction.';
      TransactionCommit.Enabled := false;
!     TransactionRollback.Enabled := false;
    end
  end;
  
  procedure TdlgWisql.QuerySaveOutputExecute(Sender: TObject);
  begin
***************
*** 306,310 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.QueryNextExecute(Sender: TObject);
  begin
--- 302,305 ----
***************
*** 316,320 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.QueryPreviousExecute(Sender: TObject);
  begin
--- 311,314 ----
***************
*** 326,330 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.QuerySaveScriptExecute(Sender: TObject);
  var
--- 320,323 ----
***************
*** 353,357 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.QueryLoadScriptExecute(Sender: TObject);
  var
--- 346,349 ----
***************
*** 389,393 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.QueryExecuteExecute(Sender: TObject);
  var
--- 381,384 ----
***************
*** 496,500 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.UpdateOutputWindow(const Data: String);
  begin
--- 487,490 ----
***************
*** 502,506 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.DialectChange(Sender: TObject);
  var
--- 492,495 ----
***************
*** 527,531 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.DialectUpdate(Sender: TObject);
  begin
--- 516,519 ----
***************
*** 534,538 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.ShowDialog;
  begin
--- 522,525 ----
***************
*** 573,577 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.UpdateCursor(Sender: TObject);
  const
--- 560,563 ----
***************
*** 589,599 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.reSqlInputKeyPress(Sender: TObject; var Key: Char);
  begin
!   UpdateCursor(Sender);
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.ProcessISQLEvent(const ISQLEvent: TSQLEvent;
    const SubEvent: TSQLSubEvent; const Data: Variant; const Database: TIBDatabase);
--- 575,589 ----
  end;
  
  procedure TdlgWisql.reSqlInputKeyPress(Sender: TObject; var Key: Char);
  begin
!   if (Key = #10) and (GetKeyState(VK_CONTROL) < 0) then
!   begin
!     QueryExecuteExecute(Sender);
!     Key := #0;
!   end
!   else
!     UpdateCursor(Sender);
  end;
  
  procedure TdlgWisql.ProcessISQLEvent(const ISQLEvent: TSQLEvent;
    const SubEvent: TSQLSubEvent; const Data: Variant; const Database: TIBDatabase);
***************
*** 648,652 ****
          FCurrSQLDialect := FDatabase.SQLDialect;
          FConnected := true;
!         UpdateConnectStatus(true);        
        end
        else
--- 638,642 ----
          FCurrSQLDialect := FDatabase.SQLDialect;
          FConnected := true;
!         UpdateConnectStatus(true);
        end
        else
***************
*** 713,725 ****
  end;
  
- /////////////////////////////////////////////////////////////
- procedure TdlgWisql.reSqlInputKeyDown(Sender: TObject; var Key: Word;
-   Shift: TShiftState);
- begin
-   if (Key = VK_RETURN) and (ssCtrl in Shift) then
-     QueryExecuteExecute (Sender);
- end;
- 
- ////////////////////////////////////////////////////////////////
  procedure TdlgWisql.TransactionExecute(Sender: TObject);
  begin
--- 703,706 ----
***************
*** 753,757 ****
  end;
  
- //////////////////////////////////////////////////////////
  constructor TdlgWisql.Create(AOwner: TComponent);
  begin
--- 734,737 ----
***************
*** 768,772 ****
  end;
  
- //////////////////////////////////////////////////////////
  destructor TdlgWisql.Destroy;
  begin
--- 748,751 ----
***************
*** 776,780 ****
  end;
  
- //////////////////////////////////////////////////////////
  procedure TdlgWisql.cbServersChange(Sender: TObject);
  
--- 755,758 ----
***************
*** 787,791 ****
  end;
  
- //////////////////////////////////////////////////////////
  procedure TdlgWisql.FileOptionsExecute(Sender: TObject);
  var
--- 765,768 ----
***************
*** 807,811 ****
  end;
  
- //////////////////////////////////////////////////////////
  procedure TdlgWisql.EditFindExecute(Sender: TObject);
  begin
--- 784,787 ----
***************
*** 813,817 ****
  end;
  
- //////////////////////////////////////////////////////////
  procedure TdlgWisql.EditFindUpdate(Sender: TObject);
  begin
--- 789,792 ----
***************
*** 819,823 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.QueryUpdate(Sender: TObject);
  begin
--- 794,797 ----
***************
*** 829,833 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.QueryPrepareExecute(Sender: TObject);
  var
--- 803,806 ----
***************
*** 865,869 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.dbgSQLResultsCellClick(Column: TColumn);
  begin
--- 838,841 ----
***************
*** 872,876 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.dbgSQLResultsDrawColumnCell(Sender: TObject;
    const Rect: TRect; DataCol: Integer; Column: TColumn;
--- 844,847 ----
***************
*** 878,882 ****
  var
    DisplayStr:  String;
!   
  begin
    with Sender as TDBGrid do begin
--- 849,853 ----
  var
    DisplayStr:  String;
! 
  begin
    with Sender as TDBGrid do begin
***************
*** 915,919 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.dbgSQLResultsEditButtonClick(Sender: TObject);
  var
--- 886,889 ----
***************
*** 938,942 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.EditFontExecute(Sender: TObject);
  begin
--- 908,911 ----
***************
*** 951,955 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.SetAutoDDL(const Value: boolean);
  begin
--- 920,923 ----
***************
*** 961,965 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.SQLReference1Click(Sender: TObject);
  var
--- 929,932 ----
***************
*** 967,975 ****
  begin
    inherited;
!   hlpPath := Format('%s\%s',[ExtractFilePath(Application.ExeName), SQL_REFERENCE]);
    WinHelp(WindowHandle, PChar(hlpPath),HELP_FINDER,0);
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.FormClose(Sender: TObject; var Action: TCloseAction);
  var
--- 934,941 ----
  begin
    inherited;
!   hlpPath := Format('%s%s',[ExtractFilePath(Application.ExeName), SQL_REFERENCE]);
    WinHelp(WindowHandle, PChar(hlpPath),HELP_FINDER,0);
  end;
  
  procedure TdlgWisql.FormClose(Sender: TObject; var Action: TCloseAction);
  var
***************
*** 1002,1006 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.FileCloseExecute(Sender: TObject);
  begin
--- 968,971 ----
***************
*** 1008,1012 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.Print1Click(Sender: TObject);
  var
--- 973,976 ----
***************
*** 1039,1043 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.Drop1Click(Sender: TObject);
  begin
--- 1003,1006 ----
***************
*** 1061,1065 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.Disconnect1Click(Sender: TObject);
  begin
--- 1024,1027 ----
***************
*** 1081,1085 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.Connect1Click(Sender: TObject);
  begin
--- 1043,1046 ----
***************
*** 1098,1102 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.Create1Click(Sender: TObject);
  begin
--- 1059,1062 ----
***************
*** 1115,1119 ****
  end;
  
- /////////////////////////////////////////////////////////////
  function TdlgWisql.CheckTransactionStatus (const Closing: boolean): boolean;
  var
--- 1075,1078 ----
***************
*** 1200,1204 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.FormResize(Sender: TObject);
  begin
--- 1159,1162 ----
***************
*** 1208,1212 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.UpdateConnectStatus(const Connected: boolean);
  var
--- 1166,1169 ----
***************
*** 1233,1237 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.Windows1Click(Sender: TObject);
  begin
--- 1190,1193 ----
***************
*** 1239,1243 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.SetClientDialect(const Value: integer);
  begin
--- 1195,1198 ----
***************
*** 1246,1250 ****
  end;
  
- /////////////////////////////////////////////////////////////
  { TQryList }
  
--- 1201,1204 ----
***************
*** 1263,1267 ****
  end;
  
- /////////////////////////////////////////////////////////////
  function TQryList.AtFirstQuery: boolean;
  begin
--- 1217,1220 ----
***************
*** 1269,1273 ****
  end;
  
- /////////////////////////////////////////////////////////////
  function TQryList.AtLastQuery: boolean;
  begin
--- 1222,1225 ----
***************
*** 1275,1279 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TQryList.ClearList;
  var
--- 1227,1230 ----
***************
*** 1289,1293 ****
  end;
  
- /////////////////////////////////////////////////////////////
  constructor TQryList.Create;
  begin
--- 1240,1243 ----
***************
*** 1297,1301 ****
  end;
  
- /////////////////////////////////////////////////////////////
  destructor TQryList.Destroy;
  var
--- 1247,1250 ----
***************
*** 1307,1311 ****
  end;
  
- /////////////////////////////////////////////////////////////
  function TQryList.GetNextQuery: TStrings;
  begin
--- 1256,1259 ----
***************
*** 1323,1327 ****
  end;
  
- /////////////////////////////////////////////////////////////
  function TQryList.GetPrevQuery: TStrings;
  begin
--- 1271,1274 ----
***************
*** 1339,1343 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.QueryPreviousUpdate(Sender: TObject);
  begin
--- 1286,1289 ----
***************
*** 1345,1349 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.QueryNextUpdate(Sender: TObject);
  begin
--- 1291,1294 ----
***************
*** 1351,1355 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.ShowStatistics(const Stats: TStringList);
  var
--- 1296,1299 ----
***************
*** 1377,1381 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.FormShow(Sender: TObject);
  begin
--- 1321,1324 ----
***************
*** 1383,1387 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.CheckDisconnect(Sender: TObject);
  begin
--- 1326,1329 ----
***************
*** 1391,1395 ****
  end;
  
- /////////////////////////////////////////////////////////////
  procedure TdlgWisql.SaveOutput;
  var
--- 1333,1336 ----

[Firebird-checkins] CVS: interbase/builds/original prefix.linux,1.4,1.5

[Frank Schlottmann-G. <fs...@us...>]

Update of /cvsroot/firebird/interbase/builds/original
In directory slayer.i.sourceforge.net:/tmp/cvs-serv25935/interbase/builds/original

Modified Files:
	prefix.linux 
Log Message:
Added a link to super/jrd/isc.gdb and removed -lbsd from prefix.linux


Index: prefix.linux
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/prefix.linux,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** prefix.linux	2000/08/26 01:44:23	1.4
--- prefix.linux	2000/09/15 07:19:04	1.5
***************
*** 63,67 ****
  BRIDGE_MISC=		head5.o allp.o
  CHMOD_VAL=		666
! CURSES_LIB=             -lbsd
  DSQL_P_OBJS=		dsql_p_objects
  FORM_OBJECTS=		form.o
--- 63,72 ----
  BRIDGE_MISC=		head5.o allp.o
  CHMOD_VAL=		666
! 
! #NOTE: I removed CURSES_LIB=  -lbsd because it breaks the build on SuSE systems
! #      and isn't necessary anymore. 
! #FSG  091500    
! 
! CURSES_LIB=             
  DSQL_P_OBJS=		dsql_p_objects
  FORM_OBJECTS=		form.o

[Firebird-checkins] CVS: interbase setup_dirs,1.9,1.10

[Frank Schlottmann-G. <fs...@us...>]

Update of /cvsroot/firebird/interbase
In directory slayer.i.sourceforge.net:/tmp/cvs-serv25935/interbase

Modified Files:
	setup_dirs 
Log Message:
Added a link to super/jrd/isc.gdb and removed -lbsd from prefix.linux


Index: setup_dirs
===================================================================
RCS file: /cvsroot/firebird/interbase/setup_dirs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** setup_dirs	2000/08/21 21:02:59	1.9
--- setup_dirs	2000/09/15 07:19:03	1.10
***************
*** 310,313 ****
--- 310,314 ----
          cd super/jrd                                  # TMC 081100
          refreshLink ../../jrd/yachts.gdb yachts.gdb   # TMC 081100
+         refreshLink ../../jrd/isc.gdb    isc.gdb      # FSG 090800
          cd ../..                                      # TMC 081100 
  

[Firebird-checkins] CVS: interbase/jrd pwd.h,1.2,1.3 pwd.c,1.2,1.3

[Tom C. <tm...@us...>]

Update of /cvsroot/firebird/interbase/jrd
In directory slayer.i.sourceforge.net:/tmp/cvs-serv30527

Modified Files:
	pwd.h pwd.c 
Log Message:
security db path for AIX_PPC

Index: pwd.h
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/pwd.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** pwd.h	2000/08/16 23:30:38	1.2
--- pwd.h	2000/09/08 21:27:59	1.3
***************
*** 21,24 ****
--- 21,27 ----
   * Contributor(s): ______________________________________.
   */
+ /*
+ $Id$
+ */
  
  #ifndef _JRD_PWD_H_
***************
*** 60,63 ****
--- 63,70 ----
  
  #ifdef FREEBSD
+ #define USER_INFO_NAME	"isc4.gdb"
+ #endif
+ 
+ #ifdef AIX_PPC
  #define USER_INFO_NAME	"isc4.gdb"
  #endif

Index: pwd.c
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/pwd.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** pwd.c	2000/08/16 23:30:38	1.2
--- pwd.c	2000/09/08 21:27:59	1.3
***************
*** 21,24 ****
--- 21,27 ----
   * Contributor(s): ______________________________________.
   */
+ /*
+ $Id$
+ */
  
  #include <string.h>
***************
*** 131,135 ****
   **************************************/
  
! #if (defined VMS || defined WINDOWS_ONLY || defined WIN_NT || defined LINUX || defined FREEBSD || defined SUPERSERVER)
  gds__prefix (path_buffer, USER_INFO_NAME);
  #else
--- 134,138 ----
   **************************************/
  
! #if (defined VMS || defined WINDOWS_ONLY || defined WIN_NT || defined LINUX || defined FREEBSD || defined SUPERSERVER || defined AIX_PPC)
  gds__prefix (path_buffer, USER_INFO_NAME);
  #else

[Firebird-checkins] CVS: interbase/example5 build_make,1.2,1.3

[Tom C. <tm...@us...>]

Update of /cvsroot/firebird/interbase/example5
In directory slayer.i.sourceforge.net:/tmp/cvs-serv23932

Modified Files:
	build_make 
Log Message:
oops! - it was fine the way it was

Index: build_make
===================================================================
RCS file: /cvsroot/firebird/interbase/example5/build_make,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** build_make	2000/09/07 18:58:36	1.2
--- build_make	2000/09/07 19:50:58	1.3
***************
*** 23,25 ****
  BASE=`echo $BASE | $TR`
  rm -f makefile.example
! cat ../builds/original/prefix.$BASE sfx.unix_makefile > makefile.example
--- 23,25 ----
  BASE=`echo $BASE | $TR`
  rm -f makefile.example
! cat prefix.$BASE sfx.unix_makefile > makefile.example

[Firebird-checkins] CVS: interbase/example5 build_make,1.1.1.1,1.2

[Tom C. <tm...@us...>]

Update of /cvsroot/firebird/interbase/example5
In directory slayer.i.sourceforge.net:/tmp/cvs-serv9714

Modified Files:
	build_make 
Log Message:
fix path for prefix

Index: build_make
===================================================================
RCS file: /cvsroot/firebird/interbase/example5/build_make,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** build_make	2000/08/03 20:43:36	1.1.1.1
--- build_make	2000/09/07 18:58:36	1.2
***************
*** 17,23 ****
  # Contributor(s): ______________________________________.
  #
  BASE=`cat ../builds/original/.platform_type`
  TR='tr "[A-Z]" "[a-z]"'
  BASE=`echo $BASE | $TR`
  rm -f makefile.example
! cat prefix.$BASE sfx.unix_makefile > makefile.example
--- 17,25 ----
  # Contributor(s): ______________________________________.
  #
+ # $Id$
+ #
  BASE=`cat ../builds/original/.platform_type`
  TR='tr "[A-Z]" "[a-z]"'
  BASE=`echo $BASE | $TR`
  rm -f makefile.example
! cat ../builds/original/prefix.$BASE sfx.unix_makefile > makefile.example

[Firebird-checkins] CVS: interbase/lock lock.c,1.3,1.4

[Tom C. <tm...@us...>]

Update of /cvsroot/firebird/interbase/lock
In directory slayer.i.sourceforge.net:/tmp/cvs-serv30891

Modified Files:
	lock.c 
Log Message:
Avoid lock manager error for AIX_PPC


Index: lock.c
===================================================================
RCS file: /cvsroot/firebird/interbase/lock/lock.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** lock.c	2000/08/16 23:30:38	1.3
--- lock.c	2000/09/07 18:24:10	1.4
***************
*** 873,877 ****
  
  #ifndef  SUPERSERVER
! #if defined(SCO_EV) || defined(LINUX) || defined(FREEBSD)
  /* 5.5 SCO port: might also help other classic ports, but not sure. This
     and a few subsequent pieces of code later, solve problem of gds_drop 
--- 873,877 ----
  
  #ifndef  SUPERSERVER
! #if defined(SCO_EV) || defined(LINUX) || defined(FREEBSD) || defined(AIX_PPC)
  /* 5.5 SCO port: might also help other classic ports, but not sure. This
     and a few subsequent pieces of code later, solve problem of gds_drop 
***************
*** 889,893 ****
  
  #if !(defined NETWARE_386 || defined WIN_NT || defined OS2_ONLY || defined SOLARIS_MT || POSIX_THREADS)
! #if defined(SCO_EV) || defined(LINUX) || defined(FREEBSD)
  if (LOCK_owner_offset )   /* 5.5 SCO port: gds_drop */
  #endif
--- 889,893 ----
  
  #if !(defined NETWARE_386 || defined WIN_NT || defined OS2_ONLY || defined SOLARIS_MT || POSIX_THREADS)
! #if defined(SCO_EV) || defined(LINUX) || defined(FREEBSD) || defined(AIX_PPC)
  if (LOCK_owner_offset )   /* 5.5 SCO port: gds_drop */
  #endif
***************
*** 989,993 ****
      }
  #else
! #if defined(SCO_EV) || defined(LINUX) || defined(FREEBSD)
  if ( LOCK_owner_offset ) /* 5.5 SCO Port: gds_drop */
  #endif
--- 989,993 ----
      }
  #else
! #if defined(SCO_EV) || defined(LINUX) || defined(FREEBSD) || defined(AIX_PPC)
  if ( LOCK_owner_offset ) /* 5.5 SCO Port: gds_drop */
  #endif