instantobjects-cvscommit — Generates a message for every commit made on CVS

[Instantobjects-cvscommit] Source/Brokers/ADO/D5 IOADO_D5.dpk,1.3,1.4

[Joao M. <jcm...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/ADO/D5
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24335/Brokers/ADO/D5

Modified Files:
	IOADO_D5.dpk 
Log Message:
Added suffix _D5 to Delphi 5 version of IOCore and DclIOCore packages;
Fixed all Delphi 5 packages and package group to find IOCore_D5

Index: IOADO_D5.dpk
===================================================================
RCS file: /cvsroot/instantobjects/Source/Brokers/ADO/D5/IOADO_D5.dpk,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IOADO_D5.dpk	31 Oct 2005 13:49:56 -0000	1.3
--- IOADO_D5.dpk	12 Nov 2005 00:34:06 -0000	1.4
***************
*** 29,35 ****
  
  requires
!   IOCore,
!   IOMSSqlCatalog_D5,
!   vclado50;
  
  contains
--- 29,35 ----
  
  requires
!   vclado50,
!   IOCore_D5,
!   IOMSSqlCatalog_D5;
  
  contains

[Instantobjects-cvscommit] MPL-1.1.html,NONE,1.1 MPL-1.1.txt,NONE,1.1

[Nando D. <na...@us...>]

Update of /cvsroot/instantobjects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26151

Added Files:
	MPL-1.1.html MPL-1.1.txt 
Log Message:
MPL license files added

--- NEW FILE: MPL-1.1.txt ---
                          MOZILLA PUBLIC LICENSE
                                Version 1.1

                              ---------------

1. Definitions.

     1.0.1. "Commercial Use" means distribution or otherwise making the
     Covered Code available to a third party.

     1.1. "Contributor" means each entity that creates or contributes to
     the creation of Modifications.

     1.2. "Contributor Version" means the combination of the Original
     Code, prior Modifications used by a Contributor, and the Modifications
     made by that particular Contributor.

     1.3. "Covered Code" means the Original Code or Modifications or the
     combination of the Original Code and Modifications, in each case
     including portions thereof.

     1.4. "Electronic Distribution Mechanism" means a mechanism generally
     accepted in the software development community for the electronic
     transfer of data.

     1.5. "Executable" means Covered Code in any form other than Source
     Code.

     1.6. "Initial Developer" means the individual or entity identified
     as the Initial Developer in the Source Code notice required by Exhibit
     A.

     1.7. "Larger Work" means a work which combines Covered Code or
     portions thereof with code not governed by the terms of this License.

     1.8. "License" means this document.

     1.8.1. "Licensable" means having the right to grant, to the maximum
     extent possible, whether at the time of the initial grant or
     subsequently acquired, any and all of the rights conveyed herein.

     1.9. "Modifications" means any addition to or deletion from the
     substance or structure of either the Original Code or any previous
     Modifications. When Covered Code is released as a series of files, a
     Modification is:
          A. Any addition to or deletion from the contents of a file
          containing Original Code or previous Modifications.

          B. Any new file that contains any part of the Original Code or
          previous Modifications.

     1.10. "Original Code" means Source Code of computer software code
     which is described in the Source Code notice required by Exhibit A as
     Original Code, and which, at the time of its release under this
     License is not already Covered Code governed by this License.

     1.10.1. "Patent Claims" means any patent claim(s), now owned or
     hereafter acquired, including without limitation,  method, process,
     and apparatus claims, in any patent Licensable by grantor.

     1.11. "Source Code" means the preferred form of the Covered Code for
     making modifications to it, including all modules it contains, plus
     any associated interface definition files, scripts used to control
     compilation and installation of an Executable, or source code
     differential comparisons against either the Original Code or another
     well known, available Covered Code of the Contributor's choice. The
     Source Code can be in a compressed or archival form, provided the
     appropriate decompression or de-archiving software is widely available
     for no charge.

     1.12. "You" (or "Your")  means an individual or a legal entity
     exercising rights under, and complying with all of the terms of, this
     License or a future version of this License issued under Section 6.1.
     For legal entities, "You" includes any entity which controls, is
     controlled by, or is under common control with You. For purposes of
     this definition, "control" means (a) the power, direct or indirect,
     to cause the direction or management of such entity, whether by
     contract or otherwise, or (b) ownership of more than fifty percent
     (50%) of the outstanding shares or beneficial ownership of such
     entity.

2. Source Code License.

     2.1. The Initial Developer Grant.
     The Initial Developer hereby grants You a world-wide, royalty-free,
     non-exclusive license, subject to third party intellectual property
     claims:
          (a)  under intellectual property rights (other than patent or
          trademark) Licensable by Initial Developer to use, reproduce,
          modify, display, perform, sublicense and distribute the Original
          Code (or portions thereof) with or without Modifications, and/or
          as part of a Larger Work; and

          (b) under Patents Claims infringed by the making, using or
          selling of Original Code, to make, have made, use, practice,
          sell, and offer for sale, and/or otherwise dispose of the
          Original Code (or portions thereof).

          (c) the licenses granted in this Section 2.1(a) and (b) are
          effective on the date Initial Developer first distributes
          Original Code under the terms of this License.

          (d) Notwithstanding Section 2.1(b) above, no patent license is
          granted: 1) for code that You delete from the Original Code; 2)
          separate from the Original Code;  or 3) for infringements caused
          by: i) the modification of the Original Code or ii) the
          combination of the Original Code with other software or devices.

     2.2. Contributor Grant.
     Subject to third party intellectual property claims, each Contributor
     hereby grants You a world-wide, royalty-free, non-exclusive license

          (a)  under intellectual property rights (other than patent or
          trademark) Licensable by Contributor, to use, reproduce, modify,
          display, perform, sublicense and distribute the Modifications
          created by such Contributor (or portions thereof) either on an
          unmodified basis, with other Modifications, as Covered Code
          and/or as part of a Larger Work; and

          (b) under Patent Claims infringed by the making, using, or
          selling of  Modifications made by that Contributor either alone
          and/or in combination with its Contributor Version (or portions
          of such combination), to make, use, sell, offer for sale, have
          made, and/or otherwise dispose of: 1) Modifications made by that
          Contributor (or portions thereof); and 2) the combination of
          Modifications made by that Contributor with its Contributor
          Version (or portions of such combination).

          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
          effective on the date Contributor first makes Commercial Use of
          the Covered Code.

          (d)    Notwithstanding Section 2.2(b) above, no patent license is
          granted: 1) for any code that Contributor has deleted from the
          Contributor Version; 2)  separate from the Contributor Version;
          3)  for infringements caused by: i) third party modifications of
          Contributor Version or ii)  the combination of Modifications made
          by that Contributor with other software  (except as part of the
          Contributor Version) or other devices; or 4) under Patent Claims
          infringed by Covered Code in the absence of Modifications made by
          that Contributor.

3. Distribution Obligations.

     3.1. Application of License.
     The Modifications which You create or to which You contribute are
     governed by the terms of this License, including without limitation
     Section 2.2. The Source Code version of Covered Code may be
     distributed only under the terms of this License or a future version
     of this License released under Section 6.1, and You must include a
     copy of this License with every copy of the Source Code You
     distribute. You may not offer or impose any terms on any Source Code
     version that alters or restricts the applicable version of this
     License or the recipients' rights hereunder. However, You may include
     an additional document offering the additional rights described in
     Section 3.5.

     3.2. Availability of Source Code.
     Any Modification which You create or to which You contribute must be
     made available in Source Code form under the terms of this License
     either on the same media as an Executable version or via an accepted
     Electronic Distribution Mechanism to anyone to whom you made an
     Executable version available; and if made available via Electronic
     Distribution Mechanism, must remain available for at least twelve (12)
     months after the date it initially became available, or at least six
     (6) months after a subsequent version of that particular Modification
     has been made available to such recipients. You are responsible for
     ensuring that the Source Code version remains available even if the
     Electronic Distribution Mechanism is maintained by a third party.

     3.3. Description of Modifications.
     You must cause all Covered Code to which You contribute to contain a
     file documenting the changes You made to create that Covered Code and
     the date of any change. You must include a prominent statement that
     the Modification is derived, directly or indirectly, from Original
     Code provided by the Initial Developer and including the name of the
     Initial Developer in (a) the Source Code, and (b) in any notice in an
     Executable version or related documentation in which You describe the
     origin or ownership of the Covered Code.

     3.4. Intellectual Property Matters
          (a) Third Party Claims.
          If Contributor has knowledge that a license under a third party's
          intellectual property rights is required to exercise the rights
          granted by such Contributor under Sections 2.1 or 2.2,
          Contributor must include a text file with the Source Code
          distribution titled "LEGAL" which describes the claim and the
          party making the claim in sufficient detail that a recipient will
          know whom to contact. If Contributor obtains such knowledge after
          the Modification is made available as described in Section 3.2,
          Contributor shall promptly modify the LEGAL file in all copies
          Contributor makes available thereafter and shall take other steps
          (such as notifying appropriate mailing lists or newsgroups)
          reasonably calculated to inform those who received the Covered
          Code that new knowledge has been obtained.

          (b) Contributor APIs.
          If Contributor's Modifications include an application programming
          interface and Contributor has knowledge of patent licenses which
          are reasonably necessary to implement that API, Contributor must
          also include this information in the LEGAL file.

               (c)    Representations.
          Contributor represents that, except as disclosed pursuant to
          Section 3.4(a) above, Contributor believes that Contributor's
          Modifications are Contributor's original creation(s) and/or
          Contributor has sufficient rights to grant the rights conveyed by
          this License.

     3.5. Required Notices.
     You must duplicate the notice in Exhibit A in each file of the Source
     Code.  If it is not possible to put such notice in a particular Source
     Code file due to its structure, then You must include such notice in a
     location (such as a relevant directory) where a user would be likely
     to look for such a notice.  If You created one or more Modification(s)
     You may add your name as a Contributor to the notice described in
     Exhibit A.  You must also duplicate this License in any documentation
     for the Source Code where You describe recipients' rights or ownership
     rights relating to Covered Code.  You may choose to offer, and to
     charge a fee for, warranty, support, indemnity or liability
     obligations to one or more recipients of Covered Code. However, You
     may do so only on Your own behalf, and not on behalf of the Initial
     Developer or any Contributor. You must make it absolutely clear than
     any such warranty, support, indemnity or liability obligation is
     offered by You alone, and You hereby agree to indemnify the Initial
     Developer and every Contributor for any liability incurred by the
     Initial Developer or such Contributor as a result of warranty,
     support, indemnity or liability terms You offer.

     3.6. Distribution of Executable Versions.
     You may distribute Covered Code in Executable form only if the
     requirements of Section 3.1-3.5 have been met for that Covered Code,
     and if You include a notice stating that the Source Code version of
     the Covered Code is available under the terms of this License,
     including a description of how and where You have fulfilled the
     obligations of Section 3.2. The notice must be conspicuously included
     in any notice in an Executable version, related documentation or
     collateral in which You describe recipients' rights relating to the
     Covered Code. You may distribute the Executable version of Covered
     Code or ownership rights under a license of Your choice, which may
     contain terms different from this License, provided that You are in
     compliance with the terms of this License and that the license for the
     Executable version does not attempt to limit or alter the recipient's
     rights in the Source Code version from the rights set forth in this
     License. If You distribute the Executable version under a different
     license You must make it absolutely clear that any terms which differ
     from this License are offered by You alone, not by the Initial
     Developer or any Contributor. You hereby agree to indemnify the
     Initial Developer and every Contributor for any liability incurred by
     the Initial Developer or such Contributor as a result of any such
     terms You offer.

     3.7. Larger Works.
     You may create a Larger Work by combining Covered Code with other code
     not governed by the terms of this License and distribute the Larger
     Work as a single product. In such a case, You must make sure the
     requirements of this License are fulfilled for the Covered Code.

4. Inability to Comply Due to Statute or Regulation.

     If it is impossible for You to comply with any of the terms of this
     License with respect to some or all of the Covered Code due to
     statute, judicial order, or regulation then You must: (a) comply with
     the terms of this License to the maximum extent possible; and (b)
     describe the limitations and the code they affect. Such description
     must be included in the LEGAL file described in Section 3.4 and must
     be included with all distributions of the Source Code. Except to the
     extent prohibited by statute or regulation, such description must be
     sufficiently detailed for a recipient of ordinary skill to be able to
     understand it.

5. Application of this License.

     This License applies to code to which the Initial Developer has
     attached the notice in Exhibit A and to related Covered Code.

6. Versions of the License.

     6.1. New Versions.
     Netscape Communications Corporation ("Netscape") may publish revised
     and/or new versions of the License from time to time. Each version
     will be given a distinguishing version number.

     6.2. Effect of New Versions.
     Once Covered Code has been published under a particular version of the
     License, You may always continue to use it under the terms of that
     version. You may also choose to use such Covered Code under the terms
     of any subsequent version of the License published by Netscape. No one
     other than Netscape has the right to modify the terms applicable to
     Covered Code created under this License.

     6.3. Derivative Works.
     If You create or use a modified version of this License (which you may
     only do in order to apply it to code which is not already Covered Code
     governed by this License), You must (a) rename Your license so that
     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
     "MPL", "NPL" or any confusingly similar phrase do not appear in your
     license (except to note that your license differs from this License)
     and (b) otherwise make it clear that Your version of the license
     contains terms which differ from the Mozilla Public License and
     Netscape Public License. (Filling in the name of the Initial
     Developer, Original Code or Contributor in the notice described in
     Exhibit A shall not of themselves be deemed to be modifications of
     this License.)

7. DISCLAIMER OF WARRANTY.

     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.

8. TERMINATION.

     8.1.  This License and the rights granted hereunder will terminate
     automatically if You fail to comply with terms herein and fail to cure
     such breach within 30 days of becoming aware of the breach. All
     sublicenses to the Covered Code which are properly granted shall
     survive any termination of this License. Provisions which, by their
     nature, must remain in effect beyond the termination of this License
     shall survive.

     8.2.  If You initiate litigation by asserting a patent infringement
     claim (excluding declatory judgment actions) against Initial Developer
     or a Contributor (the Initial Developer or Contributor against whom
     You file such action is referred to as "Participant")  alleging that:

     (a)  such Participant's Contributor Version directly or indirectly
     infringes any patent, then any and all rights granted by such
     Participant to You under Sections 2.1 and/or 2.2 of this License
     shall, upon 60 days notice from Participant terminate prospectively,
     unless if within 60 days after receipt of notice You either: (i)
     agree in writing to pay Participant a mutually agreeable reasonable
     royalty for Your past and future use of Modifications made by such
     Participant, or (ii) withdraw Your litigation claim with respect to
     the Contributor Version against such Participant.  If within 60 days
     of notice, a reasonable royalty and payment arrangement are not
     mutually agreed upon in writing by the parties or the litigation claim
     is not withdrawn, the rights granted by Participant to You under
     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
     the 60 day notice period specified above.

     (b)  any software, hardware, or device, other than such Participant's
     Contributor Version, directly or indirectly infringes any patent, then
     any rights granted to You by such Participant under Sections 2.1(b)
     and 2.2(b) are revoked effective as of the date You first made, used,
     sold, distributed, or had made, Modifications made by that
     Participant.

     8.3.  If You assert a patent infringement claim against Participant
     alleging that such Participant's Contributor Version directly or
     indirectly infringes any patent where such claim is resolved (such as
     by license or settlement) prior to the initiation of patent
     infringement litigation, then the reasonable value of the licenses
     granted by such Participant under Sections 2.1 or 2.2 shall be taken
     into account in determining the amount or value of any payment or
     license.

     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
     all end user license agreements (excluding distributors and resellers)
     which have been validly granted by You or any distributor hereunder
     prior to termination shall survive termination.

9. LIMITATION OF LIABILITY.

     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.

10. U.S. GOVERNMENT END USERS.

     The Covered Code is a "commercial item," as that term is defined in
     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
     software" and "commercial computer software documentation," as such
     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
     all U.S. Government End Users acquire Covered Code with only those
     rights set forth herein.

11. MISCELLANEOUS.

     This License represents the complete agreement concerning subject
     matter hereof. If any provision of this License is held to be
     unenforceable, such provision shall be reformed only to the extent
     necessary to make it enforceable. This License shall be governed by
     California law provisions (except to the extent applicable law, if
     any, provides otherwise), excluding its conflict-of-law provisions.
     With respect to disputes in which at least one party is a citizen of,
     or an entity chartered or registered to do business in the United
     States of America, any litigation relating to this License shall be
     subject to the jurisdiction of the Federal Courts of the Northern
     District of California, with venue lying in Santa Clara County,
     California, with the losing party responsible for costs, including
     without limitation, court costs and reasonable attorneys' fees and
     expenses. The application of the United Nations Convention on
     Contracts for the International Sale of Goods is expressly excluded.
     Any law or regulation which provides that the language of a contract
     shall be construed against the drafter shall not apply to this
     License.

12. RESPONSIBILITY FOR CLAIMS.

     As between Initial Developer and the Contributors, each party is
     responsible for claims and damages arising, directly or indirectly,
     out of its utilization of rights under this License and You agree to
     work with Initial Developer and Contributors to distribute such
     responsibility on an equitable basis. Nothing herein is intended or
     shall be deemed to constitute any admission of liability.

13. MULTIPLE-LICENSED CODE.

     Initial Developer may designate portions of the Covered Code as
     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
     Developer permits you to utilize portions of the Covered Code under
     Your choice of the NPL or the alternative licenses, if any, specified
     by the Initial Developer in the file described in Exhibit A.

EXHIBIT A -Mozilla Public License.

     ``The contents of this file are subject to the Mozilla Public License
     Version 1.1 (the "License"); you may not use this file except in
     compliance with the License. You may obtain a copy of the License at
     http://www.mozilla.org/MPL/

     Software distributed under the License is distributed on an "AS IS"
     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
     License for the specific language governing rights and limitations
     under the License.

     The Original Code is ______________________________________.

     The Initial Developer of the Original Code is ________________________.
     Portions created by ______________________ are Copyright (C) ______
     _______________________. All Rights Reserved.

     Contributor(s): ______________________________________.

     Alternatively, the contents of this file may be used under the terms
     of the _____ license (the  "[___] License"), in which case the
     provisions of [______] License are applicable instead of those
     above.  If you wish to allow use of your version of this file only
     under the terms of the [____] License and not to allow others to use
     your version of this file under the MPL, indicate your decision by
     deleting  the provisions above and replace  them with the notice and
     other provisions required by the [___] License.  If you do not delete
     the provisions above, a recipient may use your version of this file
     under either the MPL or the [___] License."

     [NOTE: The text of this Exhibit A may differ slightly from the text of
     the notices in the Source Code files of the Original Code. You should
     use the text of this Exhibit A rather than the text found in the
     Original Code Source Code for Your Modifications.]


--- NEW FILE: MPL-1.1.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html lang="en">
<head>
 <title>Mozilla Public License version 1.1</title>
 <style type="text/css">
  .very-strong{
   text-transform:uppercase;
  }
  dt{
   font-weight:bold;
  }
  dd p{
   margin:0;
  }
 </style>
</head>
<body>
 <h1>Mozilla Public License Version 1.1</h1>
 <h2 id="section-1">1. Definitions.</h2>
 <dl>
  <dt id="section-1.0.1">1.0.1. "Commercial Use"
  <dd>means distribution or otherwise making the Covered Code available to a third party.
  <dt id="section-1.1">1.1. "Contributor"
  <dd>means each entity that creates or contributes to the creation of Modifications.
  <dt id="section-1.2">1.2. "Contributor Version"
  <dd>means the combination of the Original Code, prior Modifications used by a Contributor,
   and the Modifications made by that particular Contributor.
  <dt id="section-1.3">1.3. "Covered Code"
  <dd>means the Original Code or Modifications or the combination of the Original Code and
   Modifications, in each case including portions thereof.
  <dt id="section-1.4">1.4. "Electronic Distribution Mechanism"
  <dd>means a mechanism generally accepted in the software development community for the
   electronic transfer of data.
  <dt id="section-1.5">1.5. "Executable"
  <dd>means Covered Code in any form other than Source Code.
  <dt id="section-1.6">1.6. "Initial Developer"
  <dd>means the individual or entity identified as the Initial Developer in the Source Code
   notice required by <a href="#exhibit-a">Exhibit A</a>.
  <dt id="section-1.7">1.7. "Larger Work"
  <dd>means a work which combines Covered Code or portions thereof with code not governed
   by the terms of this License.
  <dt id="section-1.8">1.8. "License"
  <dd>means this document.
  <dt id="section-1.8.1">1.8.1. "Licensable"
  <dd>means having the right to grant, to the maximum extent possible, whether at the
   time of the initial grant or subsequently acquired, any and all of the rights
   conveyed herein.
  <dt id="section-1.9">1.9. "Modifications"
  <dd>
   <p>means any addition to or deletion from the substance or structure of either the
    Original Code or any previous Modifications. When Covered Code is released as a
    series of files, a Modification is:
   <ol type="a">
    <li id="section-1.9-a">Any addition to or deletion from the contents of a file
     containing Original Code or previous Modifications.
    <li id="section-1.9-b">Any new file that contains any part of the Original Code or
     previous Modifications.
   </ol>
  <dt id="section-1.10">1.10. "Original Code"
  <dd>means Source Code of computer software code which is described in the Source Code
   notice required by <a href="#exhibit-a">Exhibit A</a> as Original Code, and which,
   at the time of its release under this License is not already Covered Code governed
   by this License.
  <dt id="section-1.10.1">1.10.1. "Patent Claims"
  <dd>means any patent claim(s), now owned or hereafter acquired, including without
   limitation, method, process, and apparatus claims, in any patent Licensable by
   grantor.
  <dt id="section-1.11">1.11. "Source Code"
  <dd>means the preferred form of the Covered Code for making modifications to it,
   including all modules it contains, plus any associated interface definition files,
   scripts used to control compilation and installation of an Executable, or source
   code differential comparisons against either the Original Code or another well known,
   available Covered Code of the Contributor's choice. The Source Code can be in a
   compressed or archival form, provided the appropriate decompression or de-archiving
   software is widely available for no charge.
  <dt id="section-1.12">1.12. "You" (or "Your")
  <dd>means an individual or a legal entity exercising rights under, and complying with
   all of the terms of, this License or a future version of this License issued under
   <a href="#section-6.1">Section 6.1.</a> For legal entities, "You" includes any entity
   which controls, is controlled by, or is under common control with You. For purposes of
   this definition, "control" means (a) the power, direct or indirect, to cause the
   direction or management of such entity, whether by contract or otherwise, or (b)
   ownership of more than fifty percent (50%) of the outstanding shares or beneficial
   ownership of such entity.
 </dl>
 <h2 id="section-2">2. Source Code License.</h2>
 <h3 id="section-2.1">2.1. The Initial Developer Grant.</h3>
 <p>The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive
  license, subject to third party intellectual property claims:
 <ol type="a">
  <li id="section-2.1-a">under intellectual property rights (other than patent or
   trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform,
   sublicense and distribute the Original Code (or portions thereof) with or without
   Modifications, and/or as part of a Larger Work; and
  <li id="section-2.1-b">under Patents Claims infringed by the making, using or selling
   of Original Code, to make, have made, use, practice, sell, and offer for sale, and/or
   otherwise dispose of the Original Code (or portions thereof).
  <li id="section-2.1-c">the licenses granted in this Section 2.1
   (<a href="#section-2.1-a">a</a>) and (<a href="#section-2.1-b">b</a>) are effective on
   the date Initial Developer first distributes Original Code under the terms of this
   License.
  <li id="section-2.1-d">Notwithstanding Section 2.1 (<a href="#section-2.1-b">b</a>)
   above, no patent license is granted: 1) for code that You delete from the Original Code;
   2) separate from the Original Code; or 3) for infringements caused by: i) the
   modification of the Original Code or ii) the combination of the Original Code with other
   software or devices.
 </ol>
 <h3 id="section-2.2">2.2. Contributor Grant.</h3>
 <p>Subject to third party intellectual property claims, each Contributor hereby grants You
  a world-wide, royalty-free, non-exclusive license
 <ol type="a">
  <li id="section-2.2-a">under intellectual property rights (other than patent or trademark)
   Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and
   distribute the Modifications created by such Contributor (or portions thereof) either on
   an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger
   Work; and
  <li id="section-2.2-b">under Patent Claims infringed by the making, using, or selling of
   Modifications made by that Contributor either alone and/or in combination with its
   Contributor Version (or portions of such combination), to make, use, sell, offer for
   sale, have made, and/or otherwise dispose of: 1) Modifications made by that Contributor
   (or portions thereof); and 2) the combination of Modifications made by that Contributor
   with its Contributor Version (or portions of such combination).
  <li id="section-2.2-c">the licenses granted in Sections 2.2
   (<a href="#section-2.2-a">a</a>) and 2.2 (<a href="#section-2.2-b">b</a>) are effective
   on the date Contributor first makes Commercial Use of the Covered Code.
  <li id="section-2.2-d">Notwithstanding Section 2.2 (<a href="#section-2.2-b">b</a>)
   above, no patent license is granted: 1) for any code that Contributor has deleted from
   the Contributor Version; 2) separate from the Contributor Version; 3) for infringements
   caused by: i) third party modifications of Contributor Version or ii) the combination of
   Modifications made by that Contributor with other software (except as part of the
   Contributor Version) or other devices; or 4) under Patent Claims infringed by Covered Code
   in the absence of Modifications made by that Contributor.
 </ol>
 <h2 id="section-3">3. Distribution Obligations.</h2>
 <h3 id="section-3.1">3.1. Application of License.</h3>
 <p>The Modifications which You create or to which You contribute are governed by the terms
  of this License, including without limitation Section <a href="#section-2.2">2.2</a>. The
  Source Code version of Covered Code may be distributed only under the terms of this License
  or a future version of this License released under Section <a href="#section-6.1">6.1</a>,
  and You must include a copy of this License with every copy of the Source Code You
  distribute. You may not offer or impose any terms on any Source Code version that alters or
  restricts the applicable version of this License or the recipients' rights hereunder.
  However, You may include an additional document offering the additional rights described in
  Section <a href="#section-3.5">3.5</a>.
 <h3 id="section-3.2">3.2. Availability of Source Code.</h3>
 <p>Any Modification which You create or to which You contribute must be made available in
  Source Code form under the terms of this License either on the same media as an Executable
  version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an
  Executable version available; and if made available via Electronic Distribution Mechanism,
  must remain available for at least twelve (12) months after the date it initially became
  available, or at least six (6) months after a subsequent version of that particular
  Modification has been made available to such recipients. You are responsible for ensuring
  that the Source Code version remains available even if the Electronic Distribution
  Mechanism is maintained by a third party.
 <h3 id="section-3.3">3.3. Description of Modifications.</h3>
 <p>You must cause all Covered Code to which You contribute to contain a file documenting the
  changes You made to create that Covered Code and the date of any change. You must include a
  prominent statement that the Modification is derived, directly or indirectly, from Original
  Code provided by the Initial Developer and including the name of the Initial Developer in
  (a) the Source Code, and (b) in any notice in an Executable version or related documentation
  in which You describe the origin or ownership of the Covered Code.
 <h3 id="section-3.4">3.4. Intellectual Property Matters</h3>
 <h4 id="section-3.4-a">(a) Third Party Claims</h4>
 <p>If Contributor has knowledge that a license under a third party's intellectual property
  rights is required to exercise the rights granted by such Contributor under Sections
  <a href="#section-2.1">2.1</a> or <a href="#section-2.2">2.2</a>, Contributor must include a
  text file with the Source Code distribution titled "LEGAL" which describes the claim and the
  party making the claim in sufficient detail that a recipient will know whom to contact. If
  Contributor obtains such knowledge after the Modification is made available as described in
  Section <a href="#section-3.2">3.2</a>, Contributor shall promptly modify the LEGAL file in
  all copies Contributor makes available thereafter and shall take other steps (such as
  notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who
  received the Covered Code that new knowledge has been obtained.
 <h4 id="section-3.4-b">(b) Contributor APIs</h4>
 <p>If Contributor's Modifications include an application programming interface and Contributor
  has knowledge of patent licenses which are reasonably necessary to implement that
  <abbr>API</abbr>, Contributor must also include this information in the
  <strong class="very-strong">legal</strong> file.
 <h4 id="section-3.4-c">(c) Representations.</h4>
 <p>Contributor represents that, except as disclosed pursuant to Section 3.4
  (<a href="#section-3.4-a">a</a>) above, Contributor believes that Contributor's Modifications
  are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the
  rights conveyed by this License.
 <h3 id="section-3.5">3.5. Required Notices.</h3>
 <p>You must duplicate the notice in <a href="#exhibit-a">Exhibit A</a> in each file of the
  Source Code. If it is not possible to put such notice in a particular Source Code file due to
  its structure, then You must include such notice in a location (such as a relevant directory)
  where a user would be likely to look for such a notice. If You created one or more
  Modification(s) You may add your name as a Contributor to the notice described in
  <a href="#exhibit-a">Exhibit A</a>. You must also duplicate this License in any documentation
  for the Source Code where You describe recipients' rights or ownership rights relating to
  Covered Code. You may choose to offer, and to charge a fee for, warranty, support, indemnity
  or liability obligations to one or more recipients of Covered Code. However, You may do so
  only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You
  must make it absolutely clear than any such warranty, support, indemnity or liability
  obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer
  and every Contributor for any liability incurred by the Initial Developer or such Contributor
  as a result of warranty, support, indemnity or liability terms You offer.
 <h3 id="section-3.6">3.6. Distribution of Executable Versions.</h3>
 <p>You may distribute Covered Code in Executable form only if the requirements of Sections
  <a href="#section-3.1">3.1</a>, <a href="#section-3.2">3.2</a>,
  <a href="#section-3.3">3.3</a>, <a href="#section-3.4">3.4</a> and
  <a href="#section-3.5">3.5</a> have been met for that Covered Code, and if You include a
  notice stating that the Source Code version of the Covered Code is available under the terms
  of this License, including a description of how and where You have fulfilled the obligations
  of Section <a href="#section-3.2">3.2</a>. The notice must be conspicuously included in any
  notice in an Executable version, related documentation or collateral in which You describe
  recipients' rights relating to the Covered Code. You may distribute the Executable version of
  Covered Code or ownership rights under a license of Your choice, which may contain terms
  different from this License, provided that You are in compliance with the terms of this
  License and that the license for the Executable version does not attempt to limit or alter the
  recipient's rights in the Source Code version from the rights set forth in this License. If
  You distribute the Executable version under a different license You must make it absolutely
  clear that any terms which differ from this License are offered by You alone, not by the
  Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and
  every Contributor for any liability incurred by the Initial Developer or such Contributor as
  a result of any such terms You offer.
 <h3 id="section-3.7">3.7. Larger Works.</h3>
 <p>You may create a Larger Work by combining Covered Code with other code not governed by the
  terms of this License and distribute the Larger Work as a single product. In such a case,
  You must make sure the requirements of this License are fulfilled for the Covered Code.
 <h2 id="section-4">4. Inability to Comply Due to Statute or Regulation.</h2>
 <p>If it is impossible for You to comply with any of the terms of this License with respect to
  some or all of the Covered Code due to statute, judicial order, or regulation then You must:
  (a) comply with the terms of this License to the maximum extent possible; and (b) describe
  the limitations and the code they affect. Such description must be included in the
  <strong class="very-strong">legal</strong> file described in Section
  <a href="#section-3.4">3.4</a> and must be included with all distributions of the Source Code.
  Except to the extent prohibited by statute or regulation, such description must be
  sufficiently detailed for a recipient of ordinary skill to be able to understand it.
 <h2 id="section-5">5. Application of this License.</h2>
 <p>This License applies to code to which the Initial Developer has attached the notice in
  <a href="#exhibit-a">Exhibit A</a> and to related Covered Code.
 <h2 id="section-6">6. Versions of the License.</h2>
 <h3 id="section-6.1">6.1. New Versions</h3>
 <p>Netscape Communications Corporation ("Netscape") may publish revised and/or new versions
  of the License from time to time. Each version will be given a distinguishing version number.
 <h3 id="section-6.2">6.2. Effect of New Versions</h3>
 <p>Once Covered Code has been published under a particular version of the License, You may
  always continue to use it under the terms of that version. You may also choose to use such
  Covered Code under the terms of any subsequent version of the License published by Netscape.
  No one other than Netscape has the right to modify the terms applicable to Covered Code
  created under this License.
 <h3 id="section-6.3">6.3. Derivative Works</h3>
 <p>If You create or use a modified version of this License (which you may only do in order to
 apply it to code which is not already Covered Code governed by this License), You must (a)
 rename Your license so that the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", "MPL",
 "NPL" or any confusingly similar phrase do not appear in your license (except to note that
 your license differs from this License) and (b) otherwise make it clear that Your version of
 the license contains terms which differ from the Mozilla Public License and Netscape Public
 License. (Filling in the name of the Initial Developer, Original Code or Contributor in the
 notice described in <a href="#exhibit-a">Exhibit A</a> shall not of themselves be deemed to
 be modifications of this License.)
 <h2 id="section-7">7. <strong class="very-strong">Disclaimer of warranty</strong></h2>
 <p><strong class="very-strong">Covered code is provided under this license on an "as is"
  basis, without warranty of any kind, either expressed or implied, including, without
  limitation, warranties that the covered code is free of defects, merchantable, fit for a
  particular purpose or non-infringing. The entire risk as to the quality and performance of
  the covered code is with you. Should any covered code prove defective in any respect, you
  (not the initial developer or any other contributor) assume the cost of any necessary
  servicing, repair or correction. This disclaimer of warranty constitutes an essential part
  of this license. No use of any covered code is authorized hereunder except under this
  disclaimer.</strong>
 <h2 id="section-8">8. Termination</h2>
 <p id="section-8.1">8.1. This License and the rights granted hereunder will terminate
  automatically if You fail to comply with terms herein and fail to cure such breach
  within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which
  are properly granted shall survive any termination of this License. Provisions which, by
  their nature, must remain in effect beyond the termination of this License shall survive.
 <p id="section-8.2">8.2. If You initiate litigation by asserting a patent infringement
  claim (excluding declatory judgment actions) against Initial Developer or a Contributor
  (the Initial Developer or Contributor against whom You file such action is referred to
  as "Participant") alleging that:
 <ol type="a">
  <li id="section-8.2-a">such Participant's Contributor Version directly or indirectly
   infringes any patent, then any and all rights granted by such Participant to You under
   Sections <a href="#section-2.1">2.1</a> and/or <a href="#section-2.2">2.2</a> of this
   License shall, upon 60 days notice from Participant terminate prospectively, unless if
   within 60 days after receipt of notice You either: (i) agree in writing to pay
   Participant a mutually agreeable reasonable royalty for Your past and future use of
   Modifications made by such Participant, or (ii) withdraw Your litigation claim with
   respect to the Contributor Version against such Participant. If within 60 days of
   notice, a reasonable royalty and payment arrangement are not mutually agreed upon in
   writing by the parties or the litigation claim is not withdrawn, the rights granted by
   Participant to You under Sections <a href="#section-2.1">2.1</a> and/or
   <a href="#section-2.2">2.2</a> automatically terminate at the expiration of the 60 day
   notice period specified above.
  <li id="section-8.2-b">any software, hardware, or device, other than such Participant's
   Contributor Version, directly or indirectly infringes any patent, then any rights
   granted to You by such Participant under Sections 2.1(<a href="#section-2.1-b">b</a>)
   and 2.2(<a href="#section-2.2-b">b</a>) are revoked effective as of the date You first
   made, used, sold, distributed, or had made, Modifications made by that Participant.
 </ol>
 <p id="section-8.3">8.3. If You assert a patent infringement claim against Participant
  alleging that such Participant's Contributor Version directly or indirectly infringes
  any patent where such claim is resolved (such as by license or settlement) prior to the
  initiation of patent infringement litigation, then the reasonable value of the licenses
  granted by such Participant under Sections <a href="#section-2.1">2.1</a> or
  <a href="#section-2.2">2.2</a> shall be taken into account in determining the amount or
  value of any payment or license.
 <p id="section-8.4">8.4. In the event of termination under Sections
  <a href="#section-8.1">8.1</a> or <a href="#section-8.2">8.2</a> above, all end user
  license agreements (excluding distributors and resellers) which have been validly
  granted by You or any distributor hereunder prior to termination shall survive
  termination.
 <h2 id="section-9">9. <strong class="very-strong">Limitation of liability</strong></h2>
 <p><strong class="very-strong">Under no circumstances and under no legal theory, whether
  tort (including negligence), contract, or otherwise, shall you, the initial developer,
  any other contributor, or any distributor of covered code, or any supplier of any of
  such parties, be liable to any person for any indirect, special, incidental, or
  consequential damages of any character including, without limitation, damages for loss
  of goodwill, work stoppage, computer failure or malfunction, or any and all other
  commercial damages or losses, even if such party shall have been informed of the
  possibility of such damages. This limitation of liability shall not apply to liability
  for death or personal injury resulting from such party's negligence to the extent
  applicable law prohibits such limitation. Some jurisdictions do not allow the exclusion
  or limitation of incidental or consequential damages, so this exclusion and limitation
  may not apply to you.</strong>
 <h2 id="section-10">10. <abbr title="United States">U.S.</abbr> government end users</h2>
 <p>The Covered Code is a "commercial item," as that term is defined in 48
  <abbr>C.F.R.</abbr> 2.101 (<abbr title="October">Oct.</abbr> 1995), consisting of
  "commercial computer software" and "commercial computer software documentation," as such
  terms are used in 48 <abbr>C.F.R.</abbr> 12.212 (<abbr title="September">Sept.</abbr>
  1995). Consistent with 48 <abbr>C.F.R.</abbr> 12.212 and 48 <abbr>C.F.R.</abbr>
  227.7202-1 through 227.7202-4 (June 1995), all <abbr>U.S.</abbr> Government End Users
  acquire Covered Code with only those rights set forth herein.
 <h2 id="section-11">11. Miscellaneous</h2>
 <p>This License represents the complete agreement concerning subject matter hereof. If
  any provision of this License is held to be unenforceable, such provision shall be
  reformed only to the extent necessary to make it enforceable. This License shall be
  governed by California law provisions (except to the extent applicable law, if any,
  provides otherwise), excluding its conflict-of-law provisions. With respect to
  disputes in which at least one party is a citizen of, or an entity chartered or
  registered to do business in the United States of America, any litigation relating to
  this License shall be subject to the jurisdiction of the Federal Courts of the
  Northern District of California, with venue lying in Santa Clara County, California,
  with the losing party responsible for costs, including without limitation, court
  costs and reasonable attorneys' fees and expenses. The application of the United
  Nations Convention on Contracts for the International Sale of Goods is expressly
  excluded. Any law or regulation which provides that the language of a contract
  shall be construed against the drafter shall not apply to this License.
 <h2 id="section-12">12. Responsibility for claims</h2>
 <p>As between Initial Developer and the Contributors, each party is responsible for
  claims and damages arising, directly or indirectly, out of its utilization of rights
  under this License and You agree to work with Initial Developer and Contributors to
  distribute such responsibility on an equitable basis. Nothing herein is intended or
  shall be deemed to constitute any admission of liability.
 <h2 id="section-13">13. Multiple-licensed code</h2>
 <p>Initial Developer may designate portions of the Covered Code as
  "Multiple-Licensed". "Multiple-Licensed" means that the Initial Developer permits
  you to utilize portions of the Covered Code under Your choice of the <abbr>MPL</abbr>
  or the alternative licenses, if any, specified by the Initial Developer in the file
  described in <a href="#exhibit-a">Exhibit A</a>.
 <h2 id="exhibit-a">Exhibit A - Mozilla Public License.</h2>
 <pre>"The contents of this file are subject to the Mozilla Public License
Version 1.1 (the "License"); you may not use this file except in
compliance with the License. You may obtain a copy of the License at
http://www.mozilla.org/MPL/

Software distributed under the License is distributed on an "AS IS"
basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
License for the specific language governing rights and limitations
under the License.

The Original Code is ______________________________________.

The Initial Developer of the Original Code is ________________________.
Portions created by ______________________ are Copyright (C) ______
_______________________. All Rights Reserved.

Contributor(s): ______________________________________.

Alternatively, the contents of this file may be used under the terms
of the _____ license (the  "[___] License"), in which case the
provisions of [______] License are applicable instead of those
above. If you wish to allow use of your version of this file only
under the terms of the [____] License and not to allow others to use
your version of this file under the MPL, indicate your decision by
deleting the provisions above and replace them with the notice and
other provisions required by the [___] License. If you do not delete
the provisions above, a recipient may use your version of this file
under either the MPL or the [___] License."</pre>
 <p>NOTE: The text of this Exhibit A may differ slightly from the text of
  the notices in the Source Code files of the Original Code. You should
  use the text of this Exhibit A rather than the text found in the
  Original Code Source Code for Your Modifications.
</body>
</html>

[Instantobjects-cvscommit] Source/Brokers/ZeosDBO InstantZeosDBOCatalog.pas,1.2,1.3

[Enrique E. <the...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/ZeosDBO
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30773/Brokers/ZeosDBO

Modified Files:
	InstantZeosDBOCatalog.pas 
Log Message:
Backward compatibility with Zeos 6.1.5 stable

Index: InstantZeosDBOCatalog.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Brokers/ZeosDBO/InstantZeosDBOCatalog.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InstantZeosDBOCatalog.pas	6 Nov 2005 20:51:53 -0000	1.2
--- InstantZeosDBOCatalog.pas	10 Nov 2005 19:35:30 -0000	1.3
***************
*** 160,174 ****
    TableMetadatas: TInstantTableMetadatas);
  var
-   TableType: TStringDynArray;
    TableMetadata: TInstantTableMetadata;
    Tables: IZResultSet;
  begin
-   SetLength(TableType, 1);
-   TableType[0] := 'TABLE';
    with Broker as TInstantZeosDBOBroker, Connector.Connection do
    begin
      if not Connector.Connected then Connector.Connect;
      DbcConnection.GetMetadata.ClearCache;
!     Tables := DbcConnection.GetMetadata.GetTables(Catalog, '', '', TableType);
    end;
  
--- 160,171 ----
    TableMetadatas: TInstantTableMetadatas);
  var
    TableMetadata: TInstantTableMetadata;
    Tables: IZResultSet;
  begin
    with Broker as TInstantZeosDBOBroker, Connector.Connection do
    begin
      if not Connector.Connected then Connector.Connect;
      DbcConnection.GetMetadata.ClearCache;
!     Tables := DbcConnection.GetMetadata.GetTables(Catalog, '', '', nil);
    end;
  
***************
*** 176,185 ****
    while Tables.Next do
    begin
!     TableMetadata := TableMetadatas.Add;
!     TableMetadata.Name := Tables.GetStringByName('TABLE_NAME');
!     // Call AddIndexMetadatas first, so that AddFieldMetadatas can see what
!     // indexes are defined to correctly set the foIndexed option.
!     AddIndexMetadatas(TableMetadata);
!     AddFieldMetadatas(TableMetadata);
    end;
  end;
--- 173,185 ----
    while Tables.Next do
    begin
!     if AnsiSameStr(Tables.GetStringByName('TABLE_TYPE'), 'TABLE') then
!     begin
!       TableMetadata := TableMetadatas.Add;
!       TableMetadata.Name := Tables.GetStringByName('TABLE_NAME');
!       // Call AddIndexMetadatas first, so that AddFieldMetadatas can see what
!       // indexes are defined to correctly set the foIndexed option.
!       AddIndexMetadatas(TableMetadata);
!       AddFieldMetadatas(TableMetadata);
!     end;
    end;
  end;

[Instantobjects-cvscommit] Source/Brokers/IBX InstantIBX.pas,1.14,1.15 InstantIBXConnectionDefEdit.dfm,1.7,1.8 InstantIBXConnectionDefEdit.pas,1.6,1.7

[Joao M. <jcm...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/IBX
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6685/Brokers/IBX

Modified Files:
	InstantIBX.pas InstantIBXConnectionDefEdit.dfm 
	InstantIBXConnectionDefEdit.pas 
Log Message:
Removed connection settings, now IBX Connector has only a
connection string field to locate database.

Index: InstantIBX.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Brokers/IBX/InstantIBX.pas,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** InstantIBX.pas	13 Oct 2005 10:48:56 -0000	1.14
--- InstantIBX.pas	10 Nov 2005 00:22:15 -0000	1.15
***************
*** 25,29 ****
   *
   * Contributor(s):
!  * Carlo Barazzetta, Nando Dessena
   *
   * ***** END LICENSE BLOCK ***** *)
--- 25,29 ----
   *
   * Contributor(s):
!  * Carlo Barazzetta, Nando Dessena, Joao Morais
   *
   * ***** END LICENSE BLOCK ***** *)
***************
*** 44,49 ****
  
  type
-   TIBXNetType = (ntLocal, ntTCP, ntNetBEUI, ntSPX);
- 
    TInstantIBXOption = (ibxUseDelimitedIdents);
    TInstantIBXOptions = set of TInstantIBXOption;
--- 44,47 ----
***************
*** 55,65 ****
    TInstantIBXConnectionDef = class(TInstantConnectionBasedConnectionDef)
    private
!     FPath: string;
!     FServerName: string;
!     FNetType: TIBXNetType;
      FOptions: TInstantIBXOptions;
      FParams: string;
-     function GetDatabaseName: string;
-     function GetServerName: string;
    protected
      function CreateConnection(AOwner: TComponent): TCustomConnection; override;
--- 53,59 ----
    TInstantIBXConnectionDef = class(TInstantConnectionBasedConnectionDef)
    private
!     FConnectionString: string;
      FOptions: TInstantIBXOptions;
      FParams: string;
    protected
      function CreateConnection(AOwner: TComponent): TCustomConnection; override;
***************
*** 70,78 ****
      constructor Create(Collection: TCollection); override;
      function Edit: Boolean; override;
-     property DatabaseName: string read GetDatabaseName;
    published
!     property Path: string read FPath write FPath;
!     property NetType: TIBXNetType read FNetType write FNetType;
!     property ServerName: string read GetServerName write FServerName;
      property Options: TInstantIBXOptions read FOptions write FOptions;
      property Params: string read FParams write FParams;
--- 64,69 ----
      constructor Create(Collection: TCollection); override;
      function Edit: Boolean; override;
    published
!     property ConnectionString: string read FConnectionString write FConnectionString;
      property Options: TInstantIBXOptions read FOptions write FOptions;
      property Params: string read FParams write FParams;
***************
*** 177,181 ****
    Connection := TIBDatabase.Create(AOwner);
    try
!     Connection.DatabaseName := DatabaseName;
      Connection.SQLDialect := 3;
      Connection.Params.Text := Params;
--- 168,172 ----
    Connection := TIBDatabase.Create(AOwner);
    try
!     Connection.DatabaseName := ConnectionString;
      Connection.SQLDialect := 3;
      Connection.Params.Text := Params;
***************
*** 200,227 ****
  end;
  
- function TInstantIBXConnectionDef.GetDatabaseName: string;
- var
-   Fmt: string;
- begin
-   if NetType = ntLocal then
-     Result := Path
-   else begin
-     case NetType of
-       ntTCP: Fmt := '%s:%s';
-       ntNetBEUI: Fmt := '\\%s\%s';
-       ntSPX: Fmt := '%s@%s';
-     end;
-     Result := Format(Fmt, [ServerName, Path]);
-   end;
- end;
- 
- function TInstantIBXConnectionDef.GetServerName: string;
- begin
-   if NetType = ntLocal then
-     Result := ''
-   else
-     Result := FServerName;
- end;
- 
  procedure TInstantIBXConnectionDef.InitConnector(Connector: TInstantConnector);
  begin
--- 191,194 ----
***************
*** 565,566 ****
--- 532,534 ----
  
  end.
+ 

Index: InstantIBXConnectionDefEdit.dfm
===================================================================
RCS file: /cvsroot/instantobjects/Source/Brokers/IBX/InstantIBXConnectionDefEdit.dfm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** InstantIBXConnectionDefEdit.dfm	16 Sep 2005 08:59:02 -0000	1.7
--- InstantIBXConnectionDefEdit.dfm	10 Nov 2005 00:22:15 -0000	1.8
***************
*** 4,8 ****
    BorderStyle = bsDialog
    Caption = 'IBX Connection'
!   ClientHeight = 399
    ClientWidth = 362
    Color = clBtnFace
--- 4,8 ----
    BorderStyle = bsDialog
    Caption = 'IBX Connection'
!   ClientHeight = 339
    ClientWidth = 362
    Color = clBtnFace
***************
*** 19,23 ****
    object BottomBevel: TBevel
      Left = 0
!     Top = 362
      Width = 362
      Height = 2
--- 19,23 ----
    object BottomBevel: TBevel
      Left = 0
!     Top = 302
      Width = 362
      Height = 2
***************
*** 29,63 ****
      Top = 0
      Width = 362
!     Height = 362
      Align = alClient
      BevelOuter = bvNone
      TabOrder = 0
!     object ServerLabel: TLabel
!       Left = 16
!       Top = 36
!       Width = 31
!       Height = 13
!       Caption = '&Server'
!       FocusControl = ServerEdit
!     end
!     object ProtocolLabel: TLabel
!       Left = 235
!       Top = 36
!       Width = 39
!       Height = 13
!       Caption = '&Protocol'
!       FocusControl = ProtocolEdit
!     end
!     object DatabaseLabel: TLabel
        Left = 16
!       Top = 76
!       Width = 46
        Height = 13
!       Caption = '&Database'
!       FocusControl = DatabaseEdit
      end
      object StreamFormatLabel: TLabel
        Left = 16
!       Top = 312
        Width = 53
        Height = 13
--- 29,47 ----
      Top = 0
      Width = 362
!     Height = 302
      Align = alClient
      BevelOuter = bvNone
      TabOrder = 0
!     object ConnectionStringLabel: TLabel
        Left = 16
!       Top = 12
!       Width = 84
        Height = 13
!       Caption = '&Connection String'
!       FocusControl = ConnectionStringEdit
      end
      object StreamFormatLabel: TLabel
        Left = 16
!       Top = 248
        Width = 53
        Height = 13
***************
*** 67,71 ****
      object ParamsLabel: TLabel
        Left = 16
!       Top = 140
        Width = 95
        Height = 13
--- 51,55 ----
      object ParamsLabel: TLabel
        Left = 16
!       Top = 76
        Width = 95
        Height = 13
***************
*** 73,79 ****
        FocusControl = ParamsEditor
      end
!     object Label1: TLabel
        Left = 136
!       Top = 312
        Width = 62
        Height = 13
--- 57,63 ----
        FocusControl = ParamsEditor
      end
!     object IdDataTypeLabel: TLabel
        Left = 136
!       Top = 248
        Width = 62
        Height = 13
***************
*** 81,87 ****
        FocusControl = IdDataTypeComboBox
      end
!     object Label2: TLabel
        Left = 256
!       Top = 312
        Width = 32
        Height = 13
--- 65,71 ----
        FocusControl = IdDataTypeComboBox
      end
!     object IdSizeLabel: TLabel
        Left = 256
!       Top = 248
        Width = 32
        Height = 13
***************
*** 89,151 ****
        FocusControl = IdDataTypeComboBox
      end
!     object LocalRadioButton: TRadioButton
!       Left = 16
!       Top = 16
!       Width = 57
!       Height = 17
!       Caption = '&Local'
!       Checked = True
!       TabOrder = 0
!       TabStop = True
!       OnClick = LocalRemoteChange
!     end
!     object RemoteRadioButton: TRadioButton
!       Left = 86
!       Top = 16
!       Width = 65
!       Height = 17
!       Caption = '&Remote'
!       TabOrder = 1
!       OnClick = LocalRemoteChange
!     end
!     object ServerEdit: TEdit
!       Left = 16
!       Top = 52
!       Width = 209
!       Height = 21
!       TabOrder = 2
!     end
!     object ProtocolEdit: TComboBox
!       Left = 235
!       Top = 52
!       Width = 110
!       Height = 21
!       Style = csDropDownList
!       ItemHeight = 13
!       TabOrder = 3
!       Items.Strings = (
!         'TCP/IP'
!         'NetBEUI'
!         'SPX')
!     end
!     object DatabaseEdit: TEdit
        Left = 16
!       Top = 92
!       Width = 305
        Height = 21
!       TabOrder = 4
      end
!     object DatabaseButton: TButton
        Left = 321
!       Top = 92
        Width = 21
        Height = 21
        Caption = '...'
!       TabOrder = 5
!       OnClick = DatabaseButtonClick
      end
      object StreamFormatComboBox: TComboBox
        Left = 16
!       Top = 328
        Width = 113
        Height = 21
--- 73,95 ----
        FocusControl = IdDataTypeComboBox
      end
!     object ConnectionStringEdit: TEdit
        Left = 16
!       Top = 28
!       Width = 301
        Height = 21
!       TabOrder = 0
      end
!     object ConnectionStringButton: TButton
        Left = 321
!       Top = 28
        Width = 21
        Height = 21
        Caption = '...'
!       TabOrder = 1
!       OnClick = ConnectionStringButtonClick
      end
      object StreamFormatComboBox: TComboBox
        Left = 16
!       Top = 264
        Width = 113
        Height = 21
***************
*** 153,201 ****
        ItemHeight = 13
        Sorted = True
!       TabOrder = 9
      end
      object UseDelimitedIdentsCheckBox: TCheckBox
        Left = 16
!       Top = 118
        Width = 150
        Height = 17
        Caption = '&Use delimited identifiers'
!       TabOrder = 6
      end
      object LoginPromptCheckBox: TCheckBox
        Left = 196
!       Top = 118
        Width = 150
        Height = 17
        Caption = '&Login Prompt'
!       TabOrder = 7
      end
      object ParamsEditor: TMemo
        Left = 17
!       Top = 160
        Width = 328
        Height = 149
!       TabOrder = 8
      end
      object IdDataTypeComboBox: TComboBox
        Left = 136
!       Top = 328
        Width = 113
        Height = 21
        Style = csDropDownList
        ItemHeight = 13
!       TabOrder = 10
      end
      object IdSizeEdit: TEdit
        Left = 256
!       Top = 328
        Width = 89
        Height = 21
!       TabOrder = 11
      end
    end
    object BottomPanel: TPanel
      Left = 0
!     Top = 364
      Width = 362
      Height = 35
--- 97,145 ----
        ItemHeight = 13
        Sorted = True
!       TabOrder = 5
      end
      object UseDelimitedIdentsCheckBox: TCheckBox
        Left = 16
!       Top = 54
        Width = 150
        Height = 17
        Caption = '&Use delimited identifiers'
!       TabOrder = 2
      end
      object LoginPromptCheckBox: TCheckBox
        Left = 196
!       Top = 54
        Width = 150
        Height = 17
        Caption = '&Login Prompt'
!       TabOrder = 3
      end
      object ParamsEditor: TMemo
        Left = 17
!       Top = 96
        Width = 328
        Height = 149
!       TabOrder = 4
      end
      object IdDataTypeComboBox: TComboBox
        Left = 136
!       Top = 264
        Width = 113
        Height = 21
        Style = csDropDownList
        ItemHeight = 13
!       TabOrder = 6
      end
      object IdSizeEdit: TEdit
        Left = 256
!       Top = 264
        Width = 89
        Height = 21
!       TabOrder = 7
      end
    end
    object BottomPanel: TPanel
      Left = 0
!     Top = 304
      Width = 362
      Height = 35

Index: InstantIBXConnectionDefEdit.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Brokers/IBX/InstantIBXConnectionDefEdit.pas,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** InstantIBXConnectionDefEdit.pas	4 Sep 2005 23:15:53 -0000	1.6
--- InstantIBXConnectionDefEdit.pas	10 Nov 2005 00:22:15 -0000	1.7
***************
*** 25,29 ****
   *
   * Contributor(s):
!  * Carlo Barazzetta, Nando Dessena
   *
   * ***** END LICENSE BLOCK ***** *)
--- 25,29 ----
   *
   * Contributor(s):
!  * Carlo Barazzetta, Nando Dessena, Joao Morais
   *
   * ***** END LICENSE BLOCK ***** *)
***************
*** 46,58 ****
    TInstantIBXConnectionDefEditForm = class(TForm)
      ClientPanel: TPanel;
!     ServerLabel: TLabel;
!     ProtocolLabel: TLabel;
!     DatabaseLabel: TLabel;
!     LocalRadioButton: TRadioButton;
!     RemoteRadioButton: TRadioButton;
!     ServerEdit: TEdit;
!     ProtocolEdit: TComboBox;
!     DatabaseEdit: TEdit;
!     DatabaseButton: TButton;
      BottomPanel: TPanel;
      OkButton: TButton;
--- 46,52 ----
    TInstantIBXConnectionDefEditForm = class(TForm)
      ClientPanel: TPanel;
!     ConnectionStringLabel: TLabel;
!     ConnectionStringEdit: TEdit;
!     ConnectionStringButton: TButton;
      BottomPanel: TPanel;
      OkButton: TButton;
***************
*** 66,78 ****
      ParamsEditor: TMemo;
      IdDataTypeComboBox: TComboBox;
!     Label1: TLabel;
      IdSizeEdit: TEdit;
!     Label2: TLabel;
!     procedure LocalRemoteChange(Sender: TObject);
!     procedure DatabaseButtonClick(Sender: TObject);
      procedure FormCreate(Sender: TObject);
    private
      function GetIsValid: Boolean;
-     procedure UpdateControls;
    public
      procedure LoadData(ConnectionDef: TInstantIBXConnectionDef);
--- 60,70 ----
      ParamsEditor: TMemo;
      IdDataTypeComboBox: TComboBox;
!     IdDataTypeLabel: TLabel;
      IdSizeEdit: TEdit;
!     IdSizeLabel: TLabel;
!     procedure ConnectionStringButtonClick(Sender: TObject);
      procedure FormCreate(Sender: TObject);
    private
      function GetIsValid: Boolean;
    public
      procedure LoadData(ConnectionDef: TInstantIBXConnectionDef);
***************
*** 90,94 ****
  { TInstantIBXConnectionDefEditForm }
  
! procedure TInstantIBXConnectionDefEditForm.DatabaseButtonClick(
    Sender: TObject);
  begin
--- 82,86 ----
  { TInstantIBXConnectionDefEditForm }
  
! procedure TInstantIBXConnectionDefEditForm.ConnectionStringButtonClick(
    Sender: TObject);
  begin
***************
*** 96,104 ****
    try
      Filter :=
-       'FireBird Database (*.fdb)|*.fdb|' +
        'InterBase Database (*.gdb)|*.gdb|' +
        'All Files (*.*)|*.*';
      if Execute then
!       DatabaseEdit.Text := FileName;
    finally
      Free;
--- 88,96 ----
    try
      Filter :=
        'InterBase Database (*.gdb)|*.gdb|' +
+       'FireBird Database (*.fdb)|*.fdb|' +
        'All Files (*.*)|*.*';
      if Execute then
!       ConnectionStringEdit.Text := FileName;
    finally
      Free;
***************
*** 112,123 ****
    IdDataTypeComboBox.ItemIndex := Ord(dtString);
    IdSizeEdit.Text := IntToStr(InstantDefaultFieldSize);
-   UpdateControls;
  end;
  
  function TInstantIBXConnectionDefEditForm.GetIsValid: Boolean;
  begin
!   Result :=
!     (LocalRadioButton.Checked or (ServerEdit.Text <> '')) and
!     (DatabaseEdit.Text <> '');
  end;
  
--- 104,112 ----
    IdDataTypeComboBox.ItemIndex := Ord(dtString);
    IdSizeEdit.Text := IntToStr(InstantDefaultFieldSize);
  end;
  
  function TInstantIBXConnectionDefEditForm.GetIsValid: Boolean;
  begin
!   Result := ConnectionStringEdit.Text <> '';
  end;
  
***************
*** 127,135 ****
    with ConnectionDef do
    begin
!     LocalRadioButton.Checked := NetType = ntLocal;
!     RemoteRadioButton.Checked := NetType <> ntLocal;
!     ProtocolEdit.ItemIndex := Ord(NetType) - 1;
!     ServerEdit.Text := ServerName;
!     DatabaseEdit.Text := Path;
      StreamFormatComboBox.ItemIndex := Ord(BlobStreamFormat);
      UseDelimitedIdentsCheckBox.Checked := ibxUseDelimitedIdents in Options;
--- 116,120 ----
    with ConnectionDef do
    begin
!     ConnectionStringEdit.Text := ConnectionString;
      StreamFormatComboBox.ItemIndex := Ord(BlobStreamFormat);
      UseDelimitedIdentsCheckBox.Checked := ibxUseDelimitedIdents in Options;
***************
*** 139,149 ****
      IdSizeEdit.Text := IntToStr(IdSize);
    end;
-   UpdateControls;
- end;
- 
- procedure TInstantIBXConnectionDefEditForm.LocalRemoteChange(
-   Sender: TObject);
- begin
-   UpdateControls;
  end;
  
--- 124,127 ----
***************
*** 153,170 ****
    with ConnectionDef do
    begin
!     if LocalRadioButton.Checked then
!       NetType := ntLocal
!     else
!       NetType := TIBXNetType(ProtocolEdit.ItemIndex + 1);
!     ServerName := ServerEdit.Text;
!     Path := DatabaseEdit.Text;
      BlobStreamFormat := TInstantStreamFormat(StreamFormatComboBox.ItemIndex);
      Options := [];
      if UseDelimitedIdentsCheckBox.Checked then
!       Options := Options + [ibxUseDelimitedIdents]
!     else
!       Options := Options - [ibxUseDelimitedIdents];
      LoginPrompt := LoginPromptCheckBox.Checked;
!     ConnectionDef.Params := ParamsEditor.Lines.Text;
      IdDataType := TInstantDataType(IdDataTypeComboBox.ItemIndex);
      IdSize := StrToInt(IdSizeEdit.Text);
--- 131,141 ----
    with ConnectionDef do
    begin
!     ConnectionString := ConnectionStringEdit.Text;
      BlobStreamFormat := TInstantStreamFormat(StreamFormatComboBox.ItemIndex);
      Options := [];
      if UseDelimitedIdentsCheckBox.Checked then
!       Options := Options + [ibxUseDelimitedIdents];
      LoginPrompt := LoginPromptCheckBox.Checked;
!     Params := ParamsEditor.Lines.Text;
      IdDataType := TInstantDataType(IdDataTypeComboBox.ItemIndex);
      IdSize := StrToInt(IdSizeEdit.Text);
***************
*** 172,193 ****
  end;
  
- procedure TInstantIBXConnectionDefEditForm.UpdateControls;
- const
-   Colors: array[Boolean] of TColor = (clBtnFace, clWindow);
- var
-   UseRemote: Boolean;
- begin
-   UseRemote := RemoteRadioButton.Checked;
-   ServerLabel.Enabled := UseRemote;
-   ServerEdit.Enabled := UseRemote;
-   ServerEdit.Color := Colors[UseRemote];
-   ProtocolLabel.Enabled := UseRemote;
-   ProtocolEdit.Enabled := UseRemote;
-   ProtocolEdit.Color := Colors[UseRemote];
-   DatabaseButton.Enabled := not UseRemote;
-   with ProtocolEdit do
-     if ItemIndex = -1 then
-       ItemIndex := 0;
- end;
- 
  end.
--- 143,146 ----
  end;
  
  end.
+ 

[Instantobjects-cvscommit] Source/Catalogs/IBFb/D2006 IOIBFbCatalog.dpk,NONE,1.1

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Catalogs/IBFb/D2006
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27640/Source/Catalogs/IBFb/D2006

Added Files:
	IOIBFbCatalog.dpk 
Log Message:
IBFB catalog package added for D2006

--- NEW FILE: IOIBFbCatalog.dpk ---
package IOIBFbCatalog;

{$I '..\..\..\InstantVersion.inc'}

{$ALIGN 8}
{$ASSERTIONS ON}
{$BOOLEVAL OFF}
{$DEBUGINFO ON}
{$EXTENDEDSYNTAX ON}
{$IMPORTEDDATA ON}
{$IOCHECKS ON}
{$LOCALSYMBOLS ON}
{$LONGSTRINGS ON}
{$OPENSTRINGS ON}
{$OPTIMIZATION ON}
{$OVERFLOWCHECKS OFF}
{$RANGECHECKS OFF}
{$REFERENCEINFO ON}
{$SAFEDIVIDE OFF}
{$STACKFRAMES OFF}
{$TYPEDADDRESS ON}
{$VARSTRINGCHECKS ON}
{$WRITEABLECONST OFF}
{$MINENUMSIZE 1}
{$IMAGEBASE $400000}
{$DESCRIPTION 'InstantObjects Catalog for InterBase and Firebird (Delphi 2006)'}
{$LIBSUFFIX '_D10'}
{$RUNONLY}
{$IMPLICITBUILD OFF}

requires
  rtl,
  IOCore;

contains
  InstantIBFbCatalog in '..\InstantIBFbCatalog.pas';

end.

[Instantobjects-cvscommit] Source/Design InstantAttributeEditor.pas,1.26,1.27

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Design
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27582/Source/Design

Modified Files:
	InstantAttributeEditor.pas 
Log Message:
Changes to resolve missing values from edit components pressing enter.

Index: InstantAttributeEditor.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/InstantAttributeEditor.pas,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** InstantAttributeEditor.pas	27 Oct 2005 15:19:58 -0000	1.26
--- InstantAttributeEditor.pas	8 Nov 2005 08:49:02 -0000	1.27
***************
*** 340,343 ****
--- 340,345 ----
    I: Integer;
  begin
+   if OKButton.CanFocus then
+     OKButton.SetFocus;
    if Assigned(Subject.Owner) then
      for I := 0 to Pred(Subject.Owner.AttributeCount) do

[Instantobjects-cvscommit] Docs InstantConnectionManagerForm.txt,1.1,1.2

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27336/Docs

Modified Files:
	InstantConnectionManagerForm.txt 
Log Message:
changed InstantConnectionManagerForm to InstantConnectionManagerFormUnit

Index: InstantConnectionManagerForm.txt
===================================================================
RCS file: /cvsroot/instantobjects/Docs/InstantConnectionManagerForm.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InstantConnectionManagerForm.txt	22 Feb 2005 14:25:19 -0000	1.1
--- InstantConnectionManagerForm.txt	8 Nov 2005 08:47:41 -0000	1.2
***************
*** 1,12 ****
! New InstantConnectionManager and InstantConnectionManagerForm
! -------------------------------------------------------------
  
  TInstantConnectionManagerForm was extracted from InstantConnectionManager.pas unit so the TInstantConnectionManager component is Forms independent.
  Now the InstantConnectionManager.Execute method launch a procedure registered by a calling to RegisterConnectionManagerExecutor.
! In the initialization section of InstantConnectionManagerForm.pas unit this procedure is called automatically.
  
  Know problems and backward compatibility
  ----------------------------------------
! for applications that uses the default manager (like the Primer demo) you must add InstantConnectionManagerForm in a uses section.
  
  More flexibility
--- 1,12 ----
! New InstantConnectionManager and InstantConnectionManagerFormUnit
! -----------------------------------------------------------------
  
  TInstantConnectionManagerForm was extracted from InstantConnectionManager.pas unit so the TInstantConnectionManager component is Forms independent.
  Now the InstantConnectionManager.Execute method launch a procedure registered by a calling to RegisterConnectionManagerExecutor.
! In the initialization section of InstantConnectionManagerFormUnit.pas unit this procedure is called automatically.
  
  Know problems and backward compatibility
  ----------------------------------------
! for applications that uses the default manager (like the Primer demo) you must add InstantConnectionManagerFormUnit in a uses section.
  
  More flexibility

[Instantobjects-cvscommit] Docs Install.txt,1.2,1.3

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27229/Docs

Modified Files:
	Install.txt 
Log Message:
Changed notes for D2006 users also for D2005 users

Index: Install.txt
===================================================================
RCS file: /cvsroot/instantobjects/Docs/Install.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Install.txt	4 Nov 2005 12:40:31 -0000	1.2
--- Install.txt	8 Nov 2005 08:46:49 -0000	1.3
***************
*** 66,70 ****
     FPC. Examples: D5, D6, D7, K3, D2005, D2006, etc.
  
!    NOTE TO DELPHI 2006 USERS:
     We don't provide the .bdsproj files (as we don't provide
     .dof and .cfg files for older versions of Delphi), so the
--- 66,70 ----
     FPC. Examples: D5, D6, D7, K3, D2005, D2006, etc.
  
!    NOTE TO DELPHI 2005 AND 2006 USERS:
     We don't provide the .bdsproj files (as we don't provide
     .dof and .cfg files for older versions of Delphi), so the

[Instantobjects-cvscommit] Source/PackageGroups Install.txt,1.1,1.2

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/PackageGroups
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27229/Source/PackageGroups

Modified Files:
	Install.txt 
Log Message:
Changed notes for D2006 users also for D2005 users

Index: Install.txt
===================================================================
RCS file: /cvsroot/instantobjects/Source/PackageGroups/Install.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Install.txt	31 Oct 2005 15:10:53 -0000	1.1
--- Install.txt	8 Nov 2005 08:46:49 -0000	1.2
***************
*** 53,56 ****
--- 53,63 ----
  please refer to the installation section of \Doc\Readme.txt file.
  
+ NOTE TO DELPHI 2005 AND 2006 USERS:
+ We don't provide the .bdsproj files (as we don't provide
+ .dof and .cfg files for older versions of Delphi), so the
+ IDE will prompt you to create one of these files the first
+ time you open a package. At the prompt that asks whether to
+ make the package a Win32 or a .NET one, please answer Win32.
+ 
  For example RunTimePackages.bpg for Delphi 7 contains:
  --------------------------------

[Instantobjects-cvscommit] Source/Brokers/ZeosDBO InstantZeosDBO.pas,1.4,1.5 InstantZeosDBOCatalog.pas,1.1,1.2

[Enrique E. <the...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/ZeosDBO
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28692/Brokers/ZeosDBO

Modified Files:
	InstantZeosDBO.pas InstantZeosDBOCatalog.pas 
Log Message:
Evolution support for SQLite of ZeosDBO broker

Index: InstantZeosDBOCatalog.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Brokers/ZeosDBO/InstantZeosDBOCatalog.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InstantZeosDBOCatalog.pas	18 Oct 2005 22:55:18 -0000	1.1
--- InstantZeosDBOCatalog.pas	6 Nov 2005 20:51:53 -0000	1.2
***************
*** 59,63 ****
  
  uses
!   SysUtils, Classes, ZConnection, InstantConsts, InstantZeosDBO, TypInfo;
  
  procedure TInstantZeosDBOCatalog.AddFieldMetadatas(
--- 59,63 ----
  
  uses
!   Types, SysUtils, Classes, ZConnection, InstantConsts, InstantZeosDBO, TypInfo;
  
  procedure TInstantZeosDBOCatalog.AddFieldMetadatas(
***************
*** 72,77 ****
        TableMetadata.Name, '');
  
!   Fields.First;
!   while not Fields.IsAfterLast do
    begin
      FieldMetadata := TableMetadata.FieldMetadatas.Add;
--- 72,77 ----
        TableMetadata.Name, '');
  
!   Fields.BeforeFirst;
!   while Fields.Next do
    begin
      FieldMetadata := TableMetadata.FieldMetadatas.Add;
***************
*** 82,86 ****
      FieldMetadata.AlternateDataTypes := AlternateDataTypes;
      FieldMetadata.Options := [];
!     if Fields.GetBooleanByName('IS_NULLABLE') then
        FieldMetadata.Options := FieldMetadata.Options + [foRequired];
      if TableMetadata.IndexMetadatas.IsFieldIndexed(FieldMetadata) then
--- 82,86 ----
      FieldMetadata.AlternateDataTypes := AlternateDataTypes;
      FieldMetadata.Options := [];
!     if not Fields.GetBooleanByName('IS_NULLABLE') then
        FieldMetadata.Options := FieldMetadata.Options + [foRequired];
      if TableMetadata.IndexMetadatas.IsFieldIndexed(FieldMetadata) then
***************
*** 92,96 ****
      else
        FieldMetadata.Size := Fields.GetIntByName('COLUMN_SIZE');
-     Fields.Next;
    end;
  end;
--- 92,95 ----
***************
*** 108,128 ****
        TableMetadata.Name);
  
!   PrimaryKeys.First;
!   while not PrimaryKeys.IsAfterLast do
    begin
!     IndexMetadata := TableMetadata.IndexMetadatas.Add;
!     IndexMetadata.Name := PrimaryKeys.GetStringByName('PK_NAME');
!     IndexMetadata.Fields := PrimaryKeys.GetStringByName('COLUMN_NAME');
!     IndexMetadata.Options := [ixPrimary, ixUnique];
!     if PrimaryKeys.Next then
!       while AnsiSameStr(IndexMetadata.Name,
!         PrimaryKeys.GetStringByName('COLUMN_NAME')) do
!       begin
!         IndexMetadata.Fields := ';' + IndexMetadata.Fields +
!           PrimaryKeys.GetStringByName('COLUMN_NAME');
!         PrimaryKeys.Next;
!       end;
    end;
-   PrimaryKeys := nil;
  
    with Broker as TInstantZeosDBOBroker, Connector.Connection as TZConnection do
--- 107,127 ----
        TableMetadata.Name);
  
!   IndexMetadata := nil;
!   PrimaryKeys.BeforeFirst;
!   while PrimaryKeys.Next do
    begin
!     IndexName := PrimaryKeys.GetStringByName('PK_NAME');
!     if Assigned(IndexMetadata) and
!       AnsiSameStr(IndexMetadata.Name, IndexName) then
!       IndexMetadata.Fields := ';' + IndexMetadata.Fields +
!         PrimaryKeys.GetStringByName('COLUMN_NAME')
!     else
!     begin
!       IndexMetadata := TableMetadata.IndexMetadatas.Add;
!       IndexMetadata.Name := IndexName;
!       IndexMetadata.Fields := PrimaryKeys.GetStringByName('COLUMN_NAME');
!       IndexMetadata.Options := [ixPrimary, ixUnique];
!     end;
    end;
  
    with Broker as TInstantZeosDBOBroker, Connector.Connection as TZConnection do
***************
*** 130,135 ****
        TableMetadata.Name, False, False);
  
!   IndexInfo.First;
!   while not IndexInfo.IsAfterLast do
    begin
      //Exclude primary keys
--- 129,135 ----
        TableMetadata.Name, False, False);
  
!   IndexMetadata := nil;
!   IndexInfo.BeforeFirst;
!   while IndexInfo.Next do
    begin
      //Exclude primary keys
***************
*** 139,161 ****
      (AnsiPos('PRI', IndexName) = 0) then
      begin
!       IndexMetadata := TableMetadata.IndexMetadatas.Add;
!       IndexMetadata.Name := IndexName;
!       IndexMetadata.Fields := IndexInfo.GetStringByName('COLUMN_NAME');
!       IndexMetadata.Options := [];
!       if not IndexInfo.GetBooleanByName('NON_UNIQUE') then
!         IndexMetadata.Options := IndexMetadata.Options + [ixUnique];
!       if IndexInfo.GetStringByName('ASC_OR_DESC') = 'D' then
!         IndexMetadata.Options := IndexMetadata.Options + [ixDescending];
!       if IndexInfo.Next then
!         while AnsiSameStr(IndexMetadata.Name,
!           IndexInfo.GetStringByName('COLUMN_NAME')) do
!         begin
!           IndexMetadata.Fields := ';' + IndexMetadata.Fields +
!             IndexInfo.GetStringByName('COLUMN_NAME');
!           IndexInfo.Next;
!         end;
!     end
!     else
!       IndexInfo.Next;
    end;
  end;
--- 139,157 ----
      (AnsiPos('PRI', IndexName) = 0) then
      begin
!       if Assigned(IndexMetadata) and
!         AnsiSameStr(IndexMetadata.Name, IndexName) then
!         IndexMetadata.Fields := ';' + IndexMetadata.Fields +
!           IndexInfo.GetStringByName('COLUMN_NAME');
!       begin
!         IndexMetadata := TableMetadata.IndexMetadatas.Add;
!         IndexMetadata.Name := IndexName;
!         IndexMetadata.Fields := IndexInfo.GetStringByName('COLUMN_NAME');
!         IndexMetadata.Options := [];
!         if not IndexInfo.GetBooleanByName('NON_UNIQUE') then
!           IndexMetadata.Options := IndexMetadata.Options + [ixUnique];
!         if IndexInfo.GetStringByName('ASC_OR_DESC') = 'D' then
!           IndexMetadata.Options := IndexMetadata.Options + [ixDescending];
!       end;
!     end;
    end;
  end;
***************
*** 164,189 ****
    TableMetadatas: TInstantTableMetadatas);
  var
    TableMetadata: TInstantTableMetadata;
    Tables: IZResultSet;
  begin
    with Broker as TInstantZeosDBOBroker, Connector.Connection do
    begin
      if not Connector.Connected then Connector.Connect;
!     Tables := DbcConnection.GetMetadata.GetTables(Catalog, '', '', nil);
    end;
  
!   Tables.First;
!   while not Tables.IsAfterLast do
    begin
!     if AnsiSameStr(Tables.GetStringByName('TABLE_TYPE'), 'TABLE') then
!     begin
!       TableMetadata := TableMetadatas.Add;
!       TableMetadata.Name := Tables.GetStringByName('TABLE_NAME');
!       // Call AddIndexMetadatas first, so that AddFieldMetadatas can see what
!       // indexes are defined to correctly set the foIndexed option.
!       AddIndexMetadatas(TableMetadata);
!       AddFieldMetadatas(TableMetadata);
!     end;
!     Tables.Next;
    end;
  end;
--- 160,185 ----
    TableMetadatas: TInstantTableMetadatas);
  var
+   TableType: TStringDynArray;
    TableMetadata: TInstantTableMetadata;
    Tables: IZResultSet;
  begin
+   SetLength(TableType, 1);
+   TableType[0] := 'TABLE';
    with Broker as TInstantZeosDBOBroker, Connector.Connection do
    begin
      if not Connector.Connected then Connector.Connect;
!     DbcConnection.GetMetadata.ClearCache;
!     Tables := DbcConnection.GetMetadata.GetTables(Catalog, '', '', TableType);
    end;
  
!   Tables.BeforeFirst;
!   while Tables.Next do
    begin
!     TableMetadata := TableMetadatas.Add;
!     TableMetadata.Name := Tables.GetStringByName('TABLE_NAME');
!     // Call AddIndexMetadatas first, so that AddFieldMetadatas can see what
!     // indexes are defined to correctly set the foIndexed option.
!     AddIndexMetadatas(TableMetadata);
!     AddFieldMetadatas(TableMetadata);
    end;
  end;

Index: InstantZeosDBO.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Brokers/ZeosDBO/InstantZeosDBO.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** InstantZeosDBO.pas	23 Oct 2005 17:05:28 -0000	1.4
--- InstantZeosDBO.pas	6 Nov 2005 20:51:53 -0000	1.5
***************
*** 50,54 ****
  
  uses
!   Classes, Db, InstantPersistence, InstantCommand, ZConnection;
  
  type
--- 50,54 ----
  
  uses
!   Classes, Db, InstantPersistence, InstantCommand, InstantDBBuild, ZConnection;
  
  type
***************
*** 147,151 ****
  
    TInstantZeosDBOResolver = class(TInstantSQLResolver)
!   // Read an integer field and convert it to boolean expression
    protected
      function ReadBooleanField(DataSet: TDataSet; const FieldName: string): Boolean; override;
--- 147,151 ----
  
    TInstantZeosDBOResolver = class(TInstantSQLResolver)
!     // Read an integer field and convert it to boolean expression
    protected
      function ReadBooleanField(DataSet: TDataSet; const FieldName: string): Boolean; override;
***************
*** 153,157 ****
  
    TInstantZeosDBOTranslator = class(TInstantRelationalTranslator)
!   // Translate boolean expressions to '0' or '1'
    protected
      function TranslateConstant(Constant: TInstantIQLConstant; Writer: TInstantIQLWriter): Boolean; override;
--- 153,157 ----
  
    TInstantZeosDBOTranslator = class(TInstantRelationalTranslator)
!     // Translate boolean expressions to '0' or '1'
    protected
      function TranslateConstant(Constant: TInstantIQLConstant; Writer: TInstantIQLWriter): Boolean; override;
***************
*** 218,222 ****
    TInstantZeosDBOMySQLBroker = class(TInstantZeosDBOBroker)
    protected
!     function InternalDataTypeToColumnType(DataType: TInstantDataType): string; override;
      function UseBooleanFields: Boolean; override;
    end;
--- 218,223 ----
    TInstantZeosDBOMySQLBroker = class(TInstantZeosDBOBroker)
    protected
!     function InternalDataTypeToColumnType(DataType: TInstantDataType): string;
!       override;
      function UseBooleanFields: Boolean; override;
    end;
***************
*** 226,233 ****
--- 227,270 ----
  
    {$IFDEF SQLITE_SUPPORT}
+ 
+   //SQLite doesn´t support ALTER TABLE for supports ADD COLUMN, ALTER COLUMN and
+   //DROP COLUMN, is emulated with a couple of CREATE TEMP TABLE, INSERT INTO,
+   //DROP TABLE, CREATE TABLE, INSERT INTO and finally DROP TABLE
+   TInstantDBBuildSQLiteAlterTableSQLCommand = class(TInstantDBBuildSQLCommand)
+   private
+     FTmpTableMD: TInstantTableMetadata;
+     FOldTableMetadata: TInstantTableMetadata;
+     FNewTableMetadata: TInstantTableMetadata;
+     FScheme : TInstantScheme;
+     function GetNewTableMetadata: TInstantTableMetadata;
+     function GetOldTableMetadata: TInstantTableMetadata;
+   protected
+     procedure Rollback; virtual;
+     function GetDescription: string; override;
+     function GetSQLStatement(const Index: Integer): string; override;
+     function GetSQLStatementCount: Integer; override;
+     procedure InternalExecute; override;
+   public
+     destructor Destroy; override;
+     property OldTableMetadata: TInstantTableMetadata read GetOldTableMetadata;
+     property NewTableMetadata: TInstantTableMetadata read GetNewTableMetadata;
+   end;
+ 
+   TInstantSQLiteGenerator = class(TInstantSQLGenerator)
+   protected
+     function InternalGenerateInsertFromSelectSQL(const SourceMetadata, TargetMetadata: TInstantTableMetadata): string; virtual;
+     function InternalGenerateCreateTempTableSQL(Metadata: TInstantTableMetadata): string; virtual;
+   public
+     function GenerateCreateTempTableSQL(Metadata: TInstantTableMetadata): string;
+     function GenerateInsertFromSelectSQL(const SourceMetadata, TargetMetadata: TInstantTableMetadata): string;
+   end;
+ 
    TInstantZeosDBOSQLiteBroker = class(TInstantZeosDBOBroker)
    protected
      function InternalDataTypeToColumnType(DataType: TInstantDataType): string; override;
      function UseBooleanFields: Boolean; override;
+   public
+     class function GeneratorClass: TInstantSQLGeneratorClass; override;
+     function CreateDBBuildCommand(const CommandType: TInstantDBBuildCommandType): TInstantDBBuildCommand; override;
    end;
    {$ENDIF}
***************
*** 238,246 ****
  
  uses
!   SysUtils, {$IFDEF D7+}Types,{$ENDIF} Controls, InstantConsts, InstantClasses,
!   InstantDBBuild, InstantZeosDBOConnectionDefEdit, InstantZeosDBOCatalog,
!   InstantUtils, ZClasses, ZCompatibility, ZDbcIntfs, ZDataset;
  
! { Global routines }
  
  procedure AssignZeosDBOProtocols(Strings: TStrings);
--- 275,288 ----
  
  uses
!   SysUtils, {$IFDEF D7+}Types, {$ENDIF}Controls, InstantConsts, InstantClasses,
!   InstantZeosDBOConnectionDefEdit, InstantZeosDBOCatalog, InstantUtils, ZClasses,
!   ZCompatibility, ZDbcIntfs, ZDataset;
  
! {$IFDEF SQLITE_SUPPORT}
! const
!   STmpTableSuffix = '_XYZ_';
!   {$ENDIF}
! 
!   { Global routines }
  
  procedure AssignZeosDBOProtocols(Strings: TStrings);
***************
*** 268,272 ****
  end;
  
! class function TInstantZeosDBOConnectionDef.ConnectorClass: TInstantConnectorClass;
  begin
    Result := TInstantZeosDBOConnector;
--- 310,315 ----
  end;
  
! class function TInstantZeosDBOConnectionDef.ConnectorClass:
!   TInstantConnectorClass;
  begin
    Result := TInstantZeosDBOConnector;
***************
*** 348,352 ****
  end;
  
! class function TInstantZeosDBOConnector.ConnectionDefClass: TInstantConnectionDefClass;
  begin
    Result := TInstantZeosDBOConnectionDef;
--- 391,396 ----
  end;
  
! class function TInstantZeosDBOConnector.ConnectionDefClass:
!   TInstantConnectionDefClass;
  begin
    Result := TInstantZeosDBOConnectionDef;
***************
*** 378,384 ****
    {$IFDEF IBFB_SUPPORT}
    if SameText(FConnection.Protocol, 'interbase-5') or
!    SameText(FConnection.Protocol, 'interbase-6') or
!    SameText(FConnection.Protocol, 'firebird-1.0') or
!    SameText(FConnection.Protocol, 'firebird-1.5') then
      Result := TInstantZeosDBOIbFbBroker.Create(Self);
    {$ENDIF}
--- 422,428 ----
    {$IFDEF IBFB_SUPPORT}
    if SameText(FConnection.Protocol, 'interbase-5') or
!     SameText(FConnection.Protocol, 'interbase-6') or
!     SameText(FConnection.Protocol, 'firebird-1.0') or
!     SameText(FConnection.Protocol, 'firebird-1.5') then
      Result := TInstantZeosDBOIbFbBroker.Create(Self);
    {$ENDIF}
***************
*** 386,390 ****
    {$IFDEF ORACLE_SUPPORT}
    if SameText(FConnection.Protocol, 'oracle') or
!    SameText(FConnection.Protocol, 'oracle-9i') then
      Result := TInstantZeosDBOOracleBroker.Create(Self);
    {$ENDIF}
--- 430,434 ----
    {$IFDEF ORACLE_SUPPORT}
    if SameText(FConnection.Protocol, 'oracle') or
!     SameText(FConnection.Protocol, 'oracle-9i') then
      Result := TInstantZeosDBOOracleBroker.Create(Self);
    {$ENDIF}
***************
*** 392,399 ****
    {$IFDEF PGSQL_SUPPORT}
    if SameText(FConnection.Protocol, 'postgresql') or
!    SameText(FConnection.Protocol, 'postgresql-6.5') or
!    SameText(FConnection.Protocol, 'postgresql-7.2') or
!    SameText(FConnection.Protocol, 'postgresql-7.3') or
!    SameText(FConnection.Protocol, 'postgresql-7.4') then
      Result := TInstantZeosDBOPgSQLBroker.Create(Self);
    {$ENDIF}
--- 436,443 ----
    {$IFDEF PGSQL_SUPPORT}
    if SameText(FConnection.Protocol, 'postgresql') or
!     SameText(FConnection.Protocol, 'postgresql-6.5') or
!     SameText(FConnection.Protocol, 'postgresql-7.2') or
!     SameText(FConnection.Protocol, 'postgresql-7.3') or
!     SameText(FConnection.Protocol, 'postgresql-7.4') then
      Result := TInstantZeosDBOPgSQLBroker.Create(Self);
    {$ENDIF}
***************
*** 401,408 ****
    {$IFDEF MYSQL_SUPPORT}
    if SameText(FConnection.Protocol, 'mysql') or
!    SameText(FConnection.Protocol, 'mysql-3.20') or
!    SameText(FConnection.Protocol, 'mysql-3.23') or
!    SameText(FConnection.Protocol, 'mysql-4.0') or
!    SameText(FConnection.Protocol, 'mysql-4.1') then
      Result := TInstantZeosDBOMySQLBroker.Create(Self);
    {$ENDIF}
--- 445,452 ----
    {$IFDEF MYSQL_SUPPORT}
    if SameText(FConnection.Protocol, 'mysql') or
!     SameText(FConnection.Protocol, 'mysql-3.20') or
!     SameText(FConnection.Protocol, 'mysql-3.23') or
!     SameText(FConnection.Protocol, 'mysql-4.0') or
!     SameText(FConnection.Protocol, 'mysql-4.1') then
      Result := TInstantZeosDBOMySQLBroker.Create(Self);
    {$ENDIF}
***************
*** 410,414 ****
    {$IFDEF SQLITE_SUPPORT}
    if SameText(FConnection.Protocol, 'sqlite') or
!    SameText(FConnection.Protocol, 'sqlite-2.8') then
      Result := TInstantZeosDBOSQLiteBroker.Create(Self);
    {$ENDIF}
--- 454,458 ----
    {$IFDEF SQLITE_SUPPORT}
    if SameText(FConnection.Protocol, 'sqlite') or
!     SameText(FConnection.Protocol, 'sqlite-2.8') then
      Result := TInstantZeosDBOSQLiteBroker.Create(Self);
    {$ENDIF}
***************
*** 416,420 ****
    if Result = nil then
      raise EInstantError.CreateFmt('ZeosDBO protocol "%s" not supported',
!      [FConnection.Protocol]);
  end;
  
--- 460,464 ----
    if Result = nil then
      raise EInstantError.CreateFmt('ZeosDBO protocol "%s" not supported',
!       [FConnection.Protocol]);
  end;
  
***************
*** 448,452 ****
    if not (csDesigning in ComponentState) then
      CheckConnection;
!   Result := FConnection; 
  end;
  
--- 492,496 ----
    if not (csDesigning in ComponentState) then
      CheckConnection;
!   Result := FConnection;
  end;
  
***************
*** 580,585 ****
      end;
      *)
!     else
!       TargetParam.Assign(SourceParam);
    end;
  end;
--- 624,629 ----
      end;
      *)
!   else
!     TargetParam.Assign(SourceParam);
    end;
  end;
***************
*** 644,648 ****
  begin
    if Connector.Connected then
!     Result := Connector.Connection.DbcConnection.GetMetadata.GetIdentifierQuoteString;
    { TODO : else? }
  end;
--- 688,693 ----
  begin
    if Connector.Connected then
!     Result :=
!       Connector.Connection.DbcConnection.GetMetadata.GetIdentifierQuoteString;
    { TODO : else? }
  end;
***************
*** 683,687 ****
  begin
    if Connector.Connected then
!     Result := Connector.Connection.DbcConnection.GetMetadata.GetDatabaseProductName;
    { TODO : else? }
  end;
--- 728,733 ----
  begin
    if Connector.Connected then
!     Result :=
!       Connector.Connection.DbcConnection.GetMetadata.GetDatabaseProductName;
    { TODO : else? }
  end;
***************
*** 724,733 ****
      Writer.WriteChar('1');
      Result := True;
!   end else
!   if SameText(Constant.Value, InstantFalseString) then
    begin
      Writer.WriteChar('0');
      Result := True;
!   end else
      Result := inherited TranslateConstant(Constant, Writer);
  end;
--- 770,780 ----
      Writer.WriteChar('1');
      Result := True;
!   end
!   else if SameText(Constant.Value, InstantFalseString) then
    begin
      Writer.WriteChar('0');
      Result := True;
!   end
!   else
      Result := inherited TranslateConstant(Constant, Writer);
  end;
***************
*** 735,739 ****
  { TInstantZeosDBOQuery }
  
! class function TInstantZeosDBOQuery.TranslatorClass: TInstantRelationalTranslatorClass;
  begin
    Result := TInstantZeosDBOTranslator;
--- 782,787 ----
  { TInstantZeosDBOQuery }
  
! class function TInstantZeosDBOQuery.TranslatorClass:
!   TInstantRelationalTranslatorClass;
  begin
    Result := TInstantZeosDBOTranslator;
***************
*** 743,758 ****
  
  {$IFDEF SYBASE_SUPPORT}
  function TInstantZeosDBOSybaseBroker.InternalDataTypeToColumnType(
    DataType: TInstantDataType): string;
  const
    Types: array[TInstantDataType] of string = (
!    'INTEGER',
!    'DOUBLE PRECISION',
!    'MONEY',
!    'TINYINT',
!    'VARCHAR',
!    'TEXT',
!    'DATETIME',
!    'IMAGE');
  begin
    Result := Types[DataType];
--- 791,807 ----
  
  {$IFDEF SYBASE_SUPPORT}
+ 
  function TInstantZeosDBOSybaseBroker.InternalDataTypeToColumnType(
    DataType: TInstantDataType): string;
  const
    Types: array[TInstantDataType] of string = (
!     'INTEGER',
!     'DOUBLE PRECISION',
!     'MONEY',
!     'TINYINT',
!     'VARCHAR',
!     'TEXT',
!     'DATETIME',
!     'IMAGE');
  begin
    Result := Types[DataType];
***************
*** 768,783 ****
  
  {$IFDEF MSSQL_SUPPORT}
  function TInstantZeosDBOMSSQLBroker.InternalDataTypeToColumnType(
    DataType: TInstantDataType): string;
  const
    Types: array[TInstantDataType] of string = (
!    'INTEGER',
!    'FLOAT',
!    'MONEY',
!    'BIT',
!    'VARCHAR',
!    'TEXT',
!    'DATETIME',
!    'IMAGE');
  begin
    Result := Types[DataType];
--- 817,833 ----
  
  {$IFDEF MSSQL_SUPPORT}
+ 
  function TInstantZeosDBOMSSQLBroker.InternalDataTypeToColumnType(
    DataType: TInstantDataType): string;
  const
    Types: array[TInstantDataType] of string = (
!     'INTEGER',
!     'FLOAT',
!     'MONEY',
!     'BIT',
!     'VARCHAR',
!     'TEXT',
!     'DATETIME',
!     'IMAGE');
  begin
    Result := Types[DataType];
***************
*** 793,808 ****
  
  {$IFDEF IBFB_SUPPORT}
  function TInstantZeosDBOIbFbBroker.InternalDataTypeToColumnType(
    DataType: TInstantDataType): string;
  const
    Types: array[TInstantDataType] of string = (
!    'INTEGER',
!    'DOUBLE PRECISION',
!    'DECIMAL(14,4)',
!    'SMALLINT',
!    'VARCHAR',
!    'BLOB SUB_TYPE 1',
!    'TIMESTAMP',
!    'BLOB');
  begin
    Result := Types[DataType];
--- 843,859 ----
  
  {$IFDEF IBFB_SUPPORT}
+ 
  function TInstantZeosDBOIbFbBroker.InternalDataTypeToColumnType(
    DataType: TInstantDataType): string;
  const
    Types: array[TInstantDataType] of string = (
!     'INTEGER',
!     'DOUBLE PRECISION',
!     'DECIMAL(14,4)',
!     'SMALLINT',
!     'VARCHAR',
!     'BLOB SUB_TYPE 1',
!     'TIMESTAMP',
!     'BLOB');
  begin
    Result := Types[DataType];
***************
*** 818,833 ****
  
  {$IFDEF ORACLE_SUPPORT}
  function TInstantZeosDBOOracleBroker.InternalDataTypeToColumnType(
    DataType: TInstantDataType): string;
  const
    Types: array[TInstantDataType] of string = (
!    'NUMBER(10)',
!    'FLOAT',
!    'NUMBER(14,4)',
!    'NUMBER(1)',
!    'VARCHAR2',
!    'CLOB',
!    'DATE',
!    'BLOB');
  begin
    Result := Types[DataType];
--- 869,885 ----
  
  {$IFDEF ORACLE_SUPPORT}
+ 
  function TInstantZeosDBOOracleBroker.InternalDataTypeToColumnType(
    DataType: TInstantDataType): string;
  const
    Types: array[TInstantDataType] of string = (
!     'NUMBER(10)',
!     'FLOAT',
!     'NUMBER(14,4)',
!     'NUMBER(1)',
!     'VARCHAR2',
!     'CLOB',
!     'DATE',
!     'BLOB');
  begin
    Result := Types[DataType];
***************
*** 843,858 ****
  
  {$IFDEF PGSQL_SUPPORT}
  function TInstantZeosDBOPgSQLBroker.InternalDataTypeToColumnType(
    DataType: TInstantDataType): string;
  const
    Types: array[TInstantDataType] of string = (
!    'INTEGER',
!    'FLOAT8',
!    'DECIMAL(14,4)',
!    'BOOLEAN',
!    'VARCHAR',
!    'TEXT',
!    'TIMESTAMP',
!    'BYTEA');
  begin
    Result := Types[DataType];
--- 895,911 ----
  
  {$IFDEF PGSQL_SUPPORT}
+ 
  function TInstantZeosDBOPgSQLBroker.InternalDataTypeToColumnType(
    DataType: TInstantDataType): string;
  const
    Types: array[TInstantDataType] of string = (
!     'INTEGER',
!     'FLOAT8',
!     'DECIMAL(14,4)',
!     'BOOLEAN',
!     'VARCHAR',
!     'TEXT',
!     'TIMESTAMP',
!     'BYTEA');
  begin
    Result := Types[DataType];
***************
*** 868,883 ****
  
  {$IFDEF MYSQL_SUPPORT}
  function TInstantZeosDBOMySQLBroker.InternalDataTypeToColumnType(
    DataType: TInstantDataType): string;
  const
    Types: array[TInstantDataType] of string = (
!    'INTEGER',
!    'FLOAT',
!    'DECIMAL(14,4)',
!    'BOOL',
!    'VARCHAR',
!    'TEXT',
!    'DATETIME',
!    'BLOB');
  begin
    Result := Types[DataType];
--- 921,937 ----
  
  {$IFDEF MYSQL_SUPPORT}
+ 
  function TInstantZeosDBOMySQLBroker.InternalDataTypeToColumnType(
    DataType: TInstantDataType): string;
  const
    Types: array[TInstantDataType] of string = (
!     'INTEGER',
!     'FLOAT',
!     'DECIMAL(14,4)',
!     'BOOL',
!     'VARCHAR',
!     'TEXT',
!     'DATETIME',
!     'BLOB');
  begin
    Result := Types[DataType];
***************
*** 890,908 ****
  {$ENDIF}
  
  { TInstantZeosDBOSQLiteBroker }
  
! {$IFDEF SQLITE_SUPPORT}
  function TInstantZeosDBOSQLiteBroker.InternalDataTypeToColumnType(
    DataType: TInstantDataType): string;
  const
    Types: array[TInstantDataType] of string = (
!    'INTEGER',
!    'FLOAT',
!    'NUMERIC(14,4)',
!    'BOOLEAN',
!    'VARCHAR',
!    'TEXT',
!    'TIMESTAMP',
!    'BLOB');
  begin
    Result := Types[DataType];
--- 944,1164 ----
  {$ENDIF}
  
+ {$IFDEF SQLITE_SUPPORT}
+ 
+ { TInstantDBBuildAlterTableSQLCommand }
+ 
+ destructor TInstantDBBuildSQLiteAlterTableSQLCommand.Destroy;
+ begin
+   FNewTableMetadata.Free;
+   FTmpTableMD.Free;
+   FScheme.Free;
+   inherited;
+ end;
+ 
+ function TInstantDBBuildSQLiteAlterTableSQLCommand.GetDescription: string;
+ begin
+   with Broker.Generator do
+     case CommandType of
+       ctAddField:
+         Result := GenerateAddFieldSQL(NewMetadata as TInstantFieldMetadata);
+       ctAlterField:
+         Result := GenerateAlterFieldSQL(OldMetadata as TInstantFieldMetadata,
+           NewMetadata as TInstantFieldMetadata);
+       ctDropField:
+         Result := GenerateDropFieldSQL(OldMetadata as TInstantFieldMetadata);
+     end;
+     Result := Result + ' - emulated with multi-statement SQL.';
+ end;
+ 
+ function TInstantDBBuildSQLiteAlterTableSQLCommand.GetNewTableMetadata: TInstantTableMetadata;
+ begin
+   if not Assigned(FNewTableMetadata) then
+   begin
+     FNewTableMetadata := TInstantTableMetadata.Create(OldTableMetadata.Collection);
+     FNewTableMetadata.Assign(OldTableMetadata);
+     case CommandType of
+       ctAddField:
+         FNewTableMetadata.FieldMetadatas.Add.Assign(NewMetadata);
+       ctAlterField:
+       begin
+         with FNewTableMetadata.FieldMetadatas do
+           Remove(Find(OldMetadata.Name));
+         FNewTableMetadata.FieldMetadatas.Add.Assign(NewMetadata);
+       end;
+       ctDropField:
+         with FNewTableMetadata.FieldMetadatas do
+           Remove(Find(OldMetadata.Name));
+     end;
+   end;
+   Result := FNewTableMetadata;
+ end;
+ 
+ function TInstantDBBuildSQLiteAlterTableSQLCommand.GetOldTableMetadata: TInstantTableMetadata;
+ var
+   FieldMetadata : TInstantFieldMetadata;
+ begin
+   if not Assigned(FOldTableMetadata) then
+   begin
+     //Force to read the table from database
+     FScheme := Broker.ReadDatabaseScheme;
+ 
+     FieldMetadata := nil;
+     case CommandType of
+       ctDropField, ctAlterField:
+         FieldMetadata := TInstantFieldMetadata(OldMetadata);
+       ctAddField:
+         FieldMetadata := TInstantFieldMetadata(NewMetadata);
+     end;
+ 
+     { TODO : This only works for case-insensitive object names! }
+     FOldTableMetadata :=
+       FScheme.FindTableMetadata(AnsiUpperCase(FieldMetadata.TableMetadata.Name));
+   end;
+   Result := FOldTableMetadata;
+ end;
+ 
+ function TInstantDBBuildSQLiteAlterTableSQLCommand.GetSQLStatement(
+   const Index: Integer): string;
+ 
+   function CreateTmpTableMetadata(TableMetadata: TInstantTableMetadata):
+       TInstantTableMetadata;
+   begin
+     Result := TInstantTableMetadata.Create(TableMetadata.Collection);
+     Result.Assign(TableMetadata);
+     Result.Name := TableMetadata.Name + STmpTableSuffix;
+   end;
+ 
+ begin
+   Result := inherited GetSQLStatement(Index);
+ 
+   if not Assigned(FTmpTableMD) then
+     FTmpTableMD := CreateTmpTableMetadata(OldTableMetadata);
+ 
+   with TInstantSQLiteGenerator(Broker.Generator) do
+     case Index of
+       0: Result := GenerateCreateTempTableSQL(FTmpTableMD);
+ 
+       1: Result := GenerateInsertFromSelectSQL(OldTableMetadata, FTmpTableMD);
+ 
+       2: Result := GenerateDropTableSQL(OldTableMetadata);
+ 
+       3: Result := GenerateCreateTableSQL(NewTableMetadata);
+ 
+       4: Result := GenerateInsertFromSelectSQL(FTmpTableMD, NewTableMetadata);
+ 
+       5: Result := GenerateDropTableSQL(FTmpTableMD);
+     end;
+ end;
+ 
+ function TInstantDBBuildSQLiteAlterTableSQLCommand.GetSQLStatementCount: Integer;
+ begin
+   Result := 6;
+ end;
+ 
+ procedure TInstantDBBuildSQLiteAlterTableSQLCommand.InternalExecute;
+ var
+   iStatement: Integer;
+   InTransaction: Boolean;
+ begin
+   InTransaction := false;
+   try
+     for iStatement := 0 to Pred(GetSQLStatementCount) do
+     begin
+       Broker.Execute(GetSQLStatement(iStatement));
+       InTransaction := (iStatement > 2) and (iStatement < 5);
+     end;
+   except
+     if InTransaction then Rollback;
+     raise;
+   end;
+ end;
+ 
+ procedure TInstantDBBuildSQLiteAlterTableSQLCommand.Rollback;
+ begin
+   { TODO : Some DBMS supports data definition within transactions, ZEOS known that and then the follow code are unnecessary! }
+   with Broker, TInstantSQLiteGenerator(Broker.Generator) do
+   begin
+     try
+       Execute(GenerateDropTableSQL(NewTableMetadata));
+     except
+       //Safe if NewTable doesn´t exist
+     end;
+     Execute(GenerateCreateTableSQL(OldTableMetadata));
+     Execute(GenerateInsertFromSelectSQL(FTmpTableMD, OldTableMetadata));
+     Execute(GenerateDropTableSQL(FTmpTableMD));
+   end;
+ end;
+ 
+ { TInstantSQLiteGenerator }
+ 
+ function TInstantSQLiteGenerator.GenerateCreateTempTableSQL(
+   Metadata: TInstantTableMetadata): string;
+ begin
+   Result := InternalGenerateCreateTempTableSQL(Metadata);
+ end;
+ 
+ function TInstantSQLiteGenerator.GenerateInsertFromSelectSQL(
+   const SourceMetadata, TargetMetadata: TInstantTableMetadata): string;
+ begin
+   Result := InternalGenerateInsertFromSelectSQL(SourceMetadata, TargetMetadata);
+ end;
+ 
+ function TInstantSQLiteGenerator.InternalGenerateCreateTempTableSQL(
+   Metadata: TInstantTableMetadata): string;
+ begin
+   Result := InternalGenerateCreateTableSQL(Metadata);
+   Insert('TEMP ', Result, Pos('TABLE', Result));
+ end;
+ 
+ function TInstantSQLiteGenerator.InternalGenerateInsertFromSelectSQL(
+   const SourceMetadata, TargetMetadata: TInstantTableMetadata): string;
+ var
+   i: Integer;
+   TargetField : TInstantFieldMetadata;
+   FieldList : string;
+ begin
+   for i := 0 to Pred(TargetMetadata.FieldMetadatas.Count) do
+   begin
+     TargetField := TargetMetadata.FieldMetadatas[i];
+     { TODO : This only works for case-insensitive object names! }
+     if SourceMetadata.FieldMetadatas.IndexOf(AnsiUpperCase(TargetField.Name)) > -1 then
+       FieldList := FieldList + EmbraceField(TargetField.Name) + ', ';
+   end;
+   Delete(FieldList, Length(FieldList) - 1, 2);
+   Result := Format('INSERT INTO %s(%s) SELECT %s FROM %s',
+     [TargetMetadata.Name, FieldList, FieldList, SourceMetadata.Name]);
+ end;
+ 
  { TInstantZeosDBOSQLiteBroker }
  
! function TInstantZeosDBOSQLiteBroker.CreateDBBuildCommand(
!   const CommandType: TInstantDBBuildCommandType): TInstantDBBuildCommand;
! begin
!   case CommandType of
!     ctAddField, ctAlterField, ctDropField:
!       Result := TInstantDBBuildSQLiteAlterTableSQLCommand.Create(CommandType, Connector)
!     else
!       Result := inherited CreateDBBuildCommand(CommandType);
!   end;
! end;
! 
! class function TInstantZeosDBOSQLiteBroker.GeneratorClass:
!   TInstantSQLGeneratorClass;
! begin
!   Result := TInstantSQLiteGenerator;
! end;
! 
  function TInstantZeosDBOSQLiteBroker.InternalDataTypeToColumnType(
    DataType: TInstantDataType): string;
  const
    Types: array[TInstantDataType] of string = (
!     'INTEGER',
!     'FLOAT',
!     'NUMERIC(14,4)',
!     'BOOLEAN',
!     'VARCHAR',
!     'TEXT',
!     'TIMESTAMP',
!     'BLOB');
  begin
    Result := Types[DataType];

[Instantobjects-cvscommit] Source/Tests TestInstantFieldMetadata.pas,1.5,1.6 TestInstantIndexMetadata.pas,1.4,1.5 TestInstantTableMetadata.pas,1.7,1.8

[Enrique E. <the...@us...>]

Update of /cvsroot/instantobjects/Source/Tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24701/Tests

Modified Files:
	TestInstantFieldMetadata.pas TestInstantIndexMetadata.pas 
	TestInstantTableMetadata.pas 
Log Message:
Added Assign method to metadata classes and test support to that methods

Index: TestInstantTableMetadata.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Tests/TestInstantTableMetadata.pas,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TestInstantTableMetadata.pas	18 Oct 2005 03:10:19 -0000	1.7
--- TestInstantTableMetadata.pas	6 Nov 2005 20:37:11 -0000	1.8
***************
*** 46,49 ****
--- 46,50 ----
      procedure TearDown; override;
    published
+     procedure TestAssign;
      procedure TestFieldMetadatas;
      procedure TestIndexMetadatas;
***************
*** 101,104 ****
--- 102,125 ----
  end;
  
+ procedure TestTInstantTableMetadata.TestAssign;
+ var
+   vDest: TInstantTableMetadata;
+ begin
+   vDest := TInstantTableMetadata.Create(nil);
+   try
+     AssertTrue(VDest.FieldMetadatas.Count = 0);
+     AssertTrue(VDest.IndexMetadatas.Count = 0);
+     vDest.Assign(FInstantTableMetadata);
+     AssertNotNull(VDest.FieldMetadatas);
+     AssertTrue(VDest.FieldMetadatas.Count > 0);
+     AssertTrue(VDest.FieldMetadatas[0].Equals(FInstantTableMetadata.FieldMetadatas[0]));
+     AssertNotNull(VDest.IndexMetadatas);
+     AssertTrue(VDest.IndexMetadatas.Count > 0);
+     AssertTrue(VDest.IndexMetadatas[0].Equals(FInstantTableMetadata.IndexMetadatas[0]));
+   finally
+     vDest.Free;
+   end;
+ end;
+ 
  { TestTInstantTableMetadatas }
  

Index: TestInstantFieldMetadata.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Tests/TestInstantFieldMetadata.pas,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TestInstantFieldMetadata.pas	15 Jul 2005 10:32:35 -0000	1.5
--- TestInstantFieldMetadata.pas	6 Nov 2005 20:37:11 -0000	1.6
***************
*** 46,53 ****
--- 46,55 ----
      procedure TearDown; override;
    published
+     procedure TestAssign;
      procedure TestCollection;
      procedure TestDataType;
      procedure TestOptions;
      procedure TestSize;
+     procedure TestAlternateDataTypes;
    end;
  
***************
*** 78,81 ****
--- 80,84 ----
    FInstantFieldMetadata.Size := 10;
    FInstantFieldMetadata.Options := [foRequired];
+   FInstantFieldMetadata.AlternateDataTypes := [dtBoolean]
  end;
  
***************
*** 105,109 ****
  procedure TestTInstantFieldMetadata.TestOptions;
  begin
!   AssertTrue(foRequired in FInstantFieldMetadata.Options);
  end;
  
--- 108,112 ----
  procedure TestTInstantFieldMetadata.TestOptions;
  begin
!   AssertTrue(FInstantFieldMetadata.Options = [foRequired]);
  end;
  
***************
*** 113,116 ****
--- 116,142 ----
  end;
  
+ procedure TestTInstantFieldMetadata.TestAlternateDataTypes;
+ begin
+   AssertTrue(FInstantFieldMetadata.AlternateDataTypes = [dtBoolean]);
+ end;
+ 
+ procedure TestTInstantFieldMetadata.TestAssign;
+ var
+   vDest: TInstantFieldMetadata;
+   vStr: string;
+ begin
+   vDest := TInstantFieldMetadata.Create(nil);
+   try
+     vDest.Assign(FInstantFieldMetadata);
+     AssertEquals(10, vDest.Size);
+     AssertTrue(vDest.Options = [foRequired]);
+     vStr := GetEnumName(TypeInfo(TInstantDataType), Ord(vDest.DataType));
+     AssertEquals('dtInteger', vStr);
+     AssertTrue(vDest.AlternateDataTypes = [dtBoolean]);
+   finally
+     vDest.Free;
+   end;
+ end;
+ 
  procedure TestTInstantFieldMetadatas.SetUp;
  begin

Index: TestInstantIndexMetadata.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Tests/TestInstantIndexMetadata.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestInstantIndexMetadata.pas	28 Jun 2005 03:45:51 -0000	1.4
--- TestInstantIndexMetadata.pas	6 Nov 2005 20:37:11 -0000	1.5
***************
*** 47,50 ****
--- 47,51 ----
      procedure TearDown; override;
    published
+     procedure TestAssign;
      procedure TestCollection;
      procedure TestFields;
***************
*** 110,113 ****
--- 111,128 ----
  end;
  
+ procedure TestTInstantIndexMetadata.TestAssign;
+ var
+   vDest: TInstantIndexMetadata;
+ begin
+   vDest := TInstantIndexMetadata.Create(nil);
+   try
+     vDest.Assign(FInstantIndexMetadata);
+     AssertEquals('IndexFields', vDest.Fields);
+     AssertTrue(vDest.Options = [ixPrimary, ixUnique]);
+   finally
+     vDest.Free;
+   end;
+ end;
+ 
  procedure TestTInstantIndexMetadatas.SetUp;
  begin

[Instantobjects-cvscommit] Source/Core InstantDBBuild.pas,1.11,1.12 InstantPersistence.pas,1.71,1.72

[Enrique E. <the...@us...>]

Update of /cvsroot/instantobjects/Source/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24701/Core

Modified Files:
	InstantDBBuild.pas InstantPersistence.pas 
Log Message:
Added Assign method to metadata classes and test support to that methods

Index: InstantPersistence.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantPersistence.pas,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** InstantPersistence.pas	31 Oct 2005 23:43:38 -0000	1.71
--- InstantPersistence.pas	6 Nov 2005 20:37:11 -0000	1.72
***************
*** 286,289 ****
--- 286,290 ----
    public
      constructor Create(ACollection: TInstantFieldMetadatas); reintroduce;
+     procedure Assign(Source: TPersistent); override;
      // Returns True if one of the data types of Other (Other.DataType and
      // Other.AlternateDataTypes) equals one of the data types of Self.
***************
*** 331,334 ****
--- 332,336 ----
    public
      constructor Create(ACollection: TInstantMetadatas); reintroduce;
+     procedure Assign(Source: TPersistent); override;
      property Collection: TInstantIndexMetadatas read GetCollection;
      // Returns True if the field identified by AFieldMetadata is part of this
***************
*** 371,374 ****
--- 373,377 ----
    public
      destructor Destroy; override;
+     procedure Assign(Source: TPersistent); override;
      property Scheme: TInstantScheme read GetScheme;
    published
***************
*** 3753,3756 ****
--- 3756,3772 ----
  { TInstantFieldMetadata }
  
+ procedure TInstantFieldMetadata.Assign(Source: TPersistent);
+ begin
+   inherited;
+   if Source is TInstantFieldMetadata then
+     with TInstantFieldMetadata(Source) do
+     begin
+       Self.FDataType := FDataType;
+       Self.FAlternateDataTypes := FAlternateDataTypes;
+       Self.FOptions := FOptions;
+       Self.FSize := FSize;
+     end;
+ end;
+ 
  constructor TInstantFieldMetadata.Create(ACollection: TInstantFieldMetadatas);
  begin
***************
*** 3836,3839 ****
--- 3852,3866 ----
  { TInstantIndexMetadata }
  
+ procedure TInstantIndexMetadata.Assign(Source: TPersistent);
+ begin
+   inherited;
+   if Source is TInstantIndexMetadata then
+     with TInstantIndexMetadata(Source) do
+     begin
+       Self.FFields := FFields;
+       Self.FOptions := FOptions;
+     end;
+ end;
+ 
  constructor TInstantIndexMetadata.Create(ACollection: TInstantMetadatas);
  begin
***************
*** 3945,3948 ****
--- 3972,3986 ----
  { TInstantTableMetadata }
  
+ procedure TInstantTableMetadata.Assign(Source: TPersistent);
+ begin
+   inherited;
+   if Source is TInstantTableMetadata then
+     with TInstantTableMetadata(Source) do
+     begin
+       Self.FieldMetadatas.Assign(FieldMetadatas);
+       Self.IndexMetadatas.Assign(IndexMetadatas);
+     end;
+ end;
+ 
  destructor TInstantTableMetadata.Destroy;
  begin

Index: InstantDBBuild.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantDBBuild.pas,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** InstantDBBuild.pas	2 Nov 2005 18:49:48 -0000	1.11
--- InstantDBBuild.pas	6 Nov 2005 20:37:11 -0000	1.12
***************
*** 1037,1045 ****
    begin
      Result := TInstantFieldMetadata.Create(FieldMetadata.Collection);
      Result.Name := FieldMetadata.Name + STmpFieldSuffix;
-     Result.DataType := FieldMetadata.DataType;
-     Result.AlternateDataTypes := FieldMetadata.AlternateDataTypes;
-     Result.Options := FieldMetadata.Options;
-     Result.Size := FieldMetadata.Size;
    end;
  
--- 1037,1042 ----
    begin
      Result := TInstantFieldMetadata.Create(FieldMetadata.Collection);
+     Result.Assign(FieldMetadata);
      Result.Name := FieldMetadata.Name + STmpFieldSuffix;
    end;
  

[Instantobjects-cvscommit] Docs Changes.txt,1.1,1.2 Install.txt,1.1,1.2

[Nando D. <na...@us...>]

Update of /cvsroot/instantobjects/Docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11071/Docs

Modified Files:
	Changes.txt Install.txt 
Log Message:
docs updated for 2.0 beta 1

Index: Install.txt
===================================================================
RCS file: /cvsroot/instantobjects/Docs/Install.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Install.txt	31 Oct 2005 15:10:52 -0000	1.1
--- Install.txt	4 Nov 2005 12:40:31 -0000	1.2
***************
*** 4,8 ****
  
    Mozilla Public License 1.1 Edition
!   October 2005 release
  
    Based on Seleqt InstantObjects.
--- 4,8 ----
  
    Mozilla Public License 1.1 Edition
!   November 2005 release
  
    Based on Seleqt InstantObjects.
***************
*** 17,22 ****
  
  This file contains detailed info about the first option to install
! InstantObjects, as per the Readme1st.txt file in the root of the
! project.
  
  If you inadvertently skipped reading it, it should be a good thing
--- 17,22 ----
  
  This file contains detailed info about the first option to install
! InstantObjects, as per the Readme1st.txt file located in the root
! folder of the project.
  
  If you inadvertently skipped reading it, it should be a good thing
***************
*** 66,69 ****
--- 66,76 ----
     FPC. Examples: D5, D6, D7, K3, D2005, D2006, etc.
  
+    NOTE TO DELPHI 2006 USERS:
+    We don't provide the .bdsproj files (as we don't provide
+    .dof and .cfg files for older versions of Delphi), so the
+    IDE will prompt you to create one of these files the first
+    time you open a package. At the prompt that asks whether to
+    make the package a Win32 or a .NET one, please answer Win32.
+ 
  
  4. Build and install the desired catalog and broker package(s):
***************
*** 86,93 ****
     then please contact us.
     
!    Note for Delphi 5 users: dpk files in Delphi 5 have an additional
!    suffix "_D5". This is because Delphi 5 does not support the LIBSUFFIX
!    compiler directive that InstantObjects uses in newer versions of
!    Delphi.
  
  ********************************************************************************
--- 93,100 ----
     then please contact us.
     
!    NOTE TO DELPHI 5 USERS:
!    dpk files in Delphi 5 have an additional suffix "_D5". This is
!    because Delphi 5 does not support the LIBSUFFIX compiler directive
!    that InstantObjects uses in newer versions of Delphi.
  
  ********************************************************************************

Index: Changes.txt
===================================================================
RCS file: /cvsroot/instantobjects/Docs/Changes.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Changes.txt	28 Oct 2005 03:47:54 -0000	1.1
--- Changes.txt	4 Nov 2005 12:40:31 -0000	1.2
***************
*** 2,6 ****
  ---------------
  
! Version 2.0 Beta 1 (1.9.1.1) (2005-10)
  
  - Several other bug fixes and small improvements.
--- 2,22 ----
  ---------------
  
! Version 2.0 Beta 1 (1.9.1.1) (2005-11)
! 
! - Added support for Delphi 2006/Win32 (experimental).
! 
! - Help file updated (Work In Progress).
! 
! - Added new BPGs for easier installation (Work In
!   Progress).
! 
! - Added support for UIB in Delphi 2005.
! 
! - Added MSSqlCatalog in Delphi 2005.
! 
! - Fixed infinite loop on application shutdown with
!   TInstantDBBuilder.
! 
! - Fixes for compatibility with Delphi 5 Professional.
  
  - Several other bug fixes and small improvements.

[Instantobjects-cvscommit] Readme1st.txt,1.1,1.2

[Nando D. <na...@us...>]

Update of /cvsroot/instantobjects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11071

Modified Files:
	Readme1st.txt 
Log Message:
docs updated for 2.0 beta 1

Index: Readme1st.txt
===================================================================
RCS file: /cvsroot/instantobjects/Readme1st.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Readme1st.txt	31 Oct 2005 15:10:53 -0000	1.1
--- Readme1st.txt	4 Nov 2005 12:40:31 -0000	1.2
***************
*** 4,8 ****
  
    Mozilla Public License 1.1 Edition
!   October 2005 release
  
    Based on Seleqt InstantObjects.
--- 4,8 ----
  
    Mozilla Public License 1.1 Edition
!   November 2005 release
  
    Based on Seleqt InstantObjects.

[Instantobjects-cvscommit] Source/Brokers/UIB/D2005 DclIOUIB.dpk,NONE,1.1 IOUIB.dpk,NONE,1.1

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/UIB/D2005
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26699/Source/Brokers/UIB/D2005

Added Files:
	DclIOUIB.dpk IOUIB.dpk 
Log Message:
UIB package for D2005

--- NEW FILE: IOUIB.dpk ---
package IOUIB;

{$I '..\..\..\InstantVersion.inc'}
{$ALIGN 8}
{$ASSERTIONS ON}
{$BOOLEVAL OFF}
{$DEBUGINFO ON}
{$EXTENDEDSYNTAX ON}
{$IMPORTEDDATA ON}
{$IOCHECKS ON}
{$LOCALSYMBOLS ON}
{$LONGSTRINGS ON}
{$OPENSTRINGS ON}
{$OPTIMIZATION ON}
{$OVERFLOWCHECKS OFF}
{$RANGECHECKS OFF}
{$REFERENCEINFO ON}
{$SAFEDIVIDE OFF}
{$STACKFRAMES OFF}
{$TYPEDADDRESS ON}
{$VARSTRINGCHECKS ON}
{$WRITEABLECONST OFF}
{$MINENUMSIZE 1}
{$IMAGEBASE $400000}
{$DESCRIPTION 'InstantObjects UIB Run-Time Support (Delphi 2005)'}
{$LIBSUFFIX '_D9'}
{$RUNONLY}
{$IMPLICITBUILD OFF}

requires
  vcl,
  vcldb,
  ibxpress,
  IOCore,
  IOIBFbCatalog,
  JvUIBD2005Win32R;

contains
  InstantUIBConnectionDefEdit in '..\InstantUIBConnectionDefEdit.pas' {InstantUIBConnectionDefEditForm},
  InstantUIB in '..\InstantUIB.pas',
  InstantUIBConnection in '..\InstantUIBConnection.pas';

end.

--- NEW FILE: DclIOUIB.dpk ---
package DclIOUIB;

{$I '..\..\..\InstantVersion.inc'}
{$R '..\InstantUIB.dcr'}
{$ALIGN 8}
{$ASSERTIONS ON}
{$BOOLEVAL OFF}
{$DEBUGINFO ON}
{$EXTENDEDSYNTAX ON}
{$IMPORTEDDATA ON}
{$IOCHECKS ON}
{$LOCALSYMBOLS ON}
{$LONGSTRINGS ON}
{$OPENSTRINGS ON}
{$OPTIMIZATION ON}
{$OVERFLOWCHECKS OFF}
{$RANGECHECKS OFF}
{$REFERENCEINFO ON}
{$SAFEDIVIDE OFF}
{$STACKFRAMES OFF}
{$TYPEDADDRESS ON}
{$VARSTRINGCHECKS ON}
{$WRITEABLECONST OFF}
{$MINENUMSIZE 1}
{$IMAGEBASE $400000}
{$DESCRIPTION 'InstantObjects UIB Design-Time Support (Delphi 2005)'}
{$LIBSUFFIX '_D9'}
{$DESIGNONLY}
{$IMPLICITBUILD OFF}

requires
  vcl,
  vcldb,
  IOCore,
  IOUIB;

contains
  InstantUIBReg in '..\InstantUIBReg.pas';

end.

[Instantobjects-cvscommit] Source/Catalogs/MSSql/D2006 IOMSSqlCatalog.dpk,NONE,1.1

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Catalogs/MSSql/D2006
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26570/Source/Catalogs/MSSql/D2006

Added Files:
	IOMSSqlCatalog.dpk 
Log Message:
MSSQL Catalog for D2006

--- NEW FILE: IOMSSqlCatalog.dpk ---
package IOMSSqlCatalog;

{$I '..\..\..\InstantVersion.inc'}
{$ALIGN 8}
{$ASSERTIONS ON}
{$BOOLEVAL OFF}
{$DEBUGINFO ON}
{$EXTENDEDSYNTAX ON}
{$IMPORTEDDATA ON}
{$IOCHECKS ON}
{$LOCALSYMBOLS ON}
{$LONGSTRINGS ON}
{$OPENSTRINGS ON}
{$OPTIMIZATION ON}
{$OVERFLOWCHECKS OFF}
{$RANGECHECKS OFF}
{$REFERENCEINFO ON}
{$SAFEDIVIDE OFF}
{$STACKFRAMES OFF}
{$TYPEDADDRESS ON}
{$VARSTRINGCHECKS ON}
{$WRITEABLECONST OFF}
{$MINENUMSIZE 1}
{$IMAGEBASE $400000}
{$DESCRIPTION 'InstantObjects Catalog for MS-Sql (Delphi 2006)'}
{$LIBSUFFIX '_D10'}
{$RUNONLY}
{$IMPLICITBUILD OFF}

requires
  rtl,
  IOCore;

contains
  InstantMSSqlCatalog in '..\InstantMSSqlCatalog.pas';

end.

[Instantobjects-cvscommit] Source/Brokers/XML/D2005 IOXML.dpk,1.6,1.7

[Steven M. <sr...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/XML/D2005
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3994

Modified Files:
	IOXML.dpk 
Log Message:
Correct $DESCRIPTION and $LIBSUFFIX entries.

Index: IOXML.dpk
===================================================================
RCS file: /cvsroot/instantobjects/Source/Brokers/XML/D2005/IOXML.dpk,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** IOXML.dpk	29 Oct 2005 11:10:07 -0000	1.6
--- IOXML.dpk	4 Nov 2005 03:24:42 -0000	1.7
***************
*** 24,29 ****
  {$MINENUMSIZE 1}
  {$IMAGEBASE $400000}
! {$DESCRIPTION 'InstantObjects XML Run-Time Support (Delphi 2006)'}
! {$LIBSUFFIX '_D10'}
  {$RUNONLY}
  {$IMPLICITBUILD OFF}
--- 24,29 ----
  {$MINENUMSIZE 1}
  {$IMAGEBASE $400000}
! {$DESCRIPTION 'InstantObjects XML Run-Time Support (Delphi 2005)'}
! {$LIBSUFFIX '_D9'}
  {$RUNONLY}
  {$IMPLICITBUILD OFF}

[Instantobjects-cvscommit] Source/Core InstantDBBuild.pas,1.10,1.11

[Nando D. <na...@us...>]

Update of /cvsroot/instantobjects/Source/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14834/Core

Modified Files:
	InstantDBBuild.pas 
Log Message:
Fixed infinite loop on application shutdown with TInstantDBBuilder

Index: InstantDBBuild.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantDBBuild.pas,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** InstantDBBuild.pas	31 Oct 2005 23:43:38 -0000	1.10
--- InstantDBBuild.pas	2 Nov 2005 18:49:48 -0000	1.11
***************
*** 800,803 ****
--- 800,804 ----
    Operation: TOperation);
  begin
+   inherited;
    if Operation = opRemove then
      if AComponent = FConnector then

[Instantobjects-cvscommit] Source/PackageGroups/D5 DesignTimePackages.bpg,1.1,1.2 RunTimePackages.bpg,1.1,1.2

[Joao M. <jcm...@us...>]

Update of /cvsroot/instantobjects/Source/PackageGroups/D5
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4226/Source/PackageGroups/D5

Modified Files:
	DesignTimePackages.bpg RunTimePackages.bpg 
Log Message:
Fix for Delphi 5 Professional compatibility

Index: DesignTimePackages.bpg
===================================================================
RCS file: /cvsroot/instantobjects/Source/PackageGroups/D5/DesignTimePackages.bpg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DesignTimePackages.bpg	31 Oct 2005 15:11:56 -0000	1.1
--- DesignTimePackages.bpg	2 Nov 2005 13:28:56 -0000	1.2
***************
*** 10,15 ****
  BRCC = $(ROOT)\bin\brcc32.exe $**
  #------------------------------------------------------------------------------
! PROJECTS = dclIOCore.bpl dclIOADO_D5.bpl dclIOBDE_D5.bpl dclIOIBX_D5.bpl \
!   dclIOXML_D5.bpl
  #------------------------------------------------------------------------------
  default: $(PROJECTS)
--- 10,14 ----
  BRCC = $(ROOT)\bin\brcc32.exe $**
  #------------------------------------------------------------------------------
! PROJECTS = dclIOCore.bpl dclIOBDE_D5.bpl dclIOIBX_D5.bpl dclIOXML_D5.bpl
  #------------------------------------------------------------------------------
  default: $(PROJECTS)
***************
*** 19,31 ****
    $(DCC)
  
- dclIOADO_D5.bpl: ..\..\Brokers\ADO\D5\dclIOADO_D5.dpk
-   $(DCC)
- 
  dclIOBDE_D5.bpl: ..\..\Brokers\BDE\D5\dclIOBDE_D5.dpk
    $(DCC)
  
- dclIODBX_D5.bpl: ..\..\Brokers\DBX\D5\dclIODBX_D5.dpk
-   $(DCC)
- 
  dclIOIBX_D5.bpl: ..\..\Brokers\IBX\D5\dclIOIBX_D5.dpk
    $(DCC)
--- 18,24 ----

Index: RunTimePackages.bpg
===================================================================
RCS file: /cvsroot/instantobjects/Source/PackageGroups/D5/RunTimePackages.bpg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RunTimePackages.bpg	31 Oct 2005 15:11:56 -0000	1.1
--- RunTimePackages.bpg	2 Nov 2005 13:28:56 -0000	1.2
***************
*** 10,15 ****
  BRCC = $(ROOT)\bin\brcc32.exe $**
  #------------------------------------------------------------------------------
! PROJECTS = IOCore.bpl IOMSSqlCatalog_D5.bpl IOIBFbCatalog_D5.bpl IOADO_D5.bpl IOBDE_D5.bpl \
!   IOIBX_D5.bpl IOXML_D5.bpl
  #------------------------------------------------------------------------------
  default: $(PROJECTS)
--- 10,14 ----
  BRCC = $(ROOT)\bin\brcc32.exe $**
  #------------------------------------------------------------------------------
! PROJECTS = IOCore.bpl IOIBFbCatalog_D5.bpl IOBDE_D5.bpl IOIBX_D5.bpl IOXML_D5.bpl
  #------------------------------------------------------------------------------
  default: $(PROJECTS)
***************
*** 19,23 ****
    $(DCC)
  
! IOADO_D5.bpl: ..\..\Brokers\ADO\D5\IOADO_D5.dpk
    $(DCC)
  
--- 18,22 ----
    $(DCC)
  
! IOIBFbCatalog_D5.bpl: ..\..\Catalogs\IBFb\D5\IOIBFbCatalog_D5.dpk
    $(DCC)
  
***************
*** 25,31 ****
    $(DCC)
  
- IODBX_D5.bpl: ..\..\Brokers\DBX\D5\IODBX_D5.dpk
-   $(DCC)
- 
  IOIBX_D5.bpl: ..\..\Brokers\IBX\D5\IOIBX_D5.dpk
    $(DCC)
--- 24,27 ----
***************
*** 33,40 ****
  IOXML_D5.bpl: ..\..\Brokers\XML\D5\IOXML_D5.dpk
    $(DCC)
- 
- IOMSSqlCatalog_D5.bpl: ..\..\Catalogs\MSSql\D5\IOMSSqlCatalog_D5.dpk
-   $(DCC)
- 
- IOIBFbCatalog_D5.bpl: ..\..\Catalogs\IBFb\D5\IOIBFbCatalog_D5.dpk
-   $(DCC)
--- 29,30 ----

[Instantobjects-cvscommit] Source/Brokers/NexusDb InstantNexusDB.pas,1.2,1.3

[Steven M. <sr...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/NexusDb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31808

Modified Files:
	InstantNexusDB.pas 
Log Message:
Updated to use the new IO core, generic 6 step statement SQL command class (TInstantDBBuildAlterFieldGenericSQLCommand) for evolving table fields.
Fix for SF Bug Tracker issue #1343250.

Index: InstantNexusDB.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Brokers/NexusDb/InstantNexusDB.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InstantNexusDB.pas	4 Sep 2005 23:15:53 -0000	1.2
--- InstantNexusDB.pas	31 Oct 2005 23:54:11 -0000	1.3
***************
*** 45,50 ****
  {$ENDIF}
    Classes, DB, InstantPersistence, InstantCommand,
!   nxllTransport, nxsdServerEngine, nxdb, nxsdDataDictionary
!   ;
  
  type
--- 45,49 ----
  {$ENDIF}
    Classes, DB, InstantPersistence, InstantCommand,
!   nxllTransport, nxsdServerEngine, nxdb, nxsdDataDictionary;
  
  type
***************
*** 204,207 ****
--- 203,207 ----
    InstantConsts,
    InstantUtils,
+   InstantDBBuild,
    InstantNexusDBConnectionDefEdit,
    nxllTypes,
***************
*** 211,216 ****
    nxtnNamedPipeTransport,
    nxreRemoteServerEngine,
!   InstantNexusDBCatalog, 
!   InstantDBBuild;
  
  const
--- 211,215 ----
    nxtnNamedPipeTransport,
    nxreRemoteServerEngine,
!   InstantNexusDBCatalog;
  
  const
***************
*** 777,781 ****
      Result := TInstantDBBuildAddFieldSQLCommand.Create(CommandType, Connector)
    else if CommandType = ctAlterField then
!     Result := TInstantDBBuildAlterFieldSQLCommand.Create(CommandType, Connector)
    else if CommandType = ctDropField then
      Result := TInstantDBBuildDropFieldSQLCommand.Create(CommandType, Connector)
--- 776,780 ----
      Result := TInstantDBBuildAddFieldSQLCommand.Create(CommandType, Connector)
    else if CommandType = ctAlterField then
!     Result := TInstantDBBuildAlterFieldGenericSQLCommand.Create(CommandType, Connector)
    else if CommandType = ctDropField then
      Result := TInstantDBBuildDropFieldSQLCommand.Create(CommandType, Connector)

[Instantobjects-cvscommit] Source/Core InstantPersistence.pas,1.70,1.71 InstantDBBuild.pas,1.9,1.10

[Steven M. <sr...@us...>]

Update of /cvsroot/instantobjects/Source/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30114

Modified Files:
	InstantPersistence.pas InstantDBBuild.pas 
Log Message:
Added a generic 6 step statement SQL command class (TInstantDBBuildAlterFieldGenericSQLCommand) for evolving table fields.

Index: InstantPersistence.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantPersistence.pas,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** InstantPersistence.pas	27 Oct 2005 12:52:01 -0000	1.70
--- InstantPersistence.pas	31 Oct 2005 23:43:38 -0000	1.71
***************
*** 2290,2293 ****
--- 2290,2295 ----
      function InternalGenerateSelectTablesSQL: string; virtual;
      function InternalGenerateUpdateConcurrentSQL(Map: TInstantAttributeMap): string; virtual;
+     function InternalGenerateUpdateFieldCopySQL(OldMetadata, NewMetadata:
+         TInstantFieldMetadata): string; virtual;
      function InternalGenerateUpdateSQL(Map: TInstantAttributeMap): string; virtual;
      property Delimiters: string read GetDelimiters;
***************
*** 2312,2315 ****
--- 2314,2319 ----
      function GenerateSelectTablesSQL: string;
      function GenerateUpdateConcurrentSQL(Map: TInstantAttributeMap): string;
+     function GenerateUpdateFieldCopySQL(OldMetadata, NewMetadata:
+         TInstantFieldMetadata): string;
      function GenerateUpdateSQL(Map: TInstantAttributeMap): string;
    end;
***************
*** 12873,12876 ****
--- 12877,12886 ----
  end;
  
+ function TInstantSQLGenerator.GenerateUpdateFieldCopySQL(OldMetadata,
+     NewMetadata: TInstantFieldMetadata): string;
+ begin
+   Result := InternalGenerateUpdateFieldCopySQL(OldMetadata, NewMetadata);
+ end;
+ 
  function TInstantSQLGenerator.GenerateUpdateSQL
    (Map: TInstantAttributeMap): string;
***************
*** 13090,13093 ****
--- 13100,13112 ----
  end;
  
+ function TInstantSQLGenerator.InternalGenerateUpdateFieldCopySQL(OldMetadata,
+     NewMetadata: TInstantFieldMetadata): string;
+ begin
+   Result := Format('UPDATE %s SET %s = %s',
+                     [EmbraceTable(OldMetadata.TableMetadata.Name),
+                      EmbraceField(NewMetadata.Name),
+                      EmbraceField(OldMetadata.Name)]);
+ end;
+ 
  function TInstantSQLGenerator.InternalGenerateUpdateSQL
    (Map: TInstantAttributeMap): string;

Index: InstantDBBuild.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantDBBuild.pas,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** InstantDBBuild.pas	7 Sep 2005 10:52:04 -0000	1.9
--- InstantDBBuild.pas	31 Oct 2005 23:43:38 -0000	1.10
***************
*** 358,361 ****
--- 358,374 ----
    end;
  
+   TInstantDBBuildAlterFieldGenericSQLCommand = class(
+       TInstantDBBuildAlterFieldSQLCommand)
+   private
+     FTmpFieldMD: TInstantFieldMetadata;
+   protected
+     function GetDescription: string; override;
+     function GetSQLStatement(const Index: Integer): string; override;
+     function GetSQLStatementCount: Integer; override;
+     procedure InternalExecute; override;
+   public
+     destructor Destroy; override;
+   end;
+ 
  implementation
  
***************
*** 363,366 ****
--- 376,382 ----
    DB;
    
+ const
+   STmpFieldSuffix = '_XYZ_';
+ 
  { TInstantCustomDBBuilder }
  
***************
*** 999,1001 ****
--- 1015,1086 ----
  end;
  
+ { TInstantDBBuildAlterFieldSQLCommand }
+ 
+ destructor TInstantDBBuildAlterFieldGenericSQLCommand.Destroy;
+ begin
+   FTmpFieldMD.Free;
+   inherited;
+ end;
+ 
+ function TInstantDBBuildAlterFieldGenericSQLCommand.GetDescription: string;
+ begin
+   Result := Format('ALTER TABLE %s evolve column %s - multi-statement SQL.',
+                   [NewFieldMetadata.TableMetadata.Name, NewFieldMetadata.Name]);
+ end;
+ 
+ function TInstantDBBuildAlterFieldGenericSQLCommand.GetSQLStatement(const
+     Index: Integer): string;
+ 
+   function CreateTmpFieldMetadata(FieldMetadata: TInstantFieldMetadata):
+     TInstantFieldMetadata;
+   begin
+     Result := TInstantFieldMetadata.Create(FieldMetadata.Collection);
+     Result.Name := FieldMetadata.Name + STmpFieldSuffix;
+     Result.DataType := FieldMetadata.DataType;
+     Result.AlternateDataTypes := FieldMetadata.AlternateDataTypes;
+     Result.Options := FieldMetadata.Options;
+     Result.Size := FieldMetadata.Size;
+   end;
+ 
+ begin
+   Result := inherited GetSQLStatement(Index);
+ 
+   FTmpFieldMD := CreateTmpFieldMetadata(NewFieldMetadata);
+ 
+   with Broker.Generator do
+     case Index of
+       0 : Result := GenerateAddFieldSQL(FTmpFieldMD);
+ 
+       1 : Result := GenerateUpdateFieldCopySQL(OldFieldMetadata, FTmpFieldMD);
+ 
+       2 : Result := GenerateDropFieldSQL(OldFieldMetadata);
+ 
+       3 : Result := GenerateAddFieldSQL(NewFieldMetadata);
+ 
+       4 : Result := GenerateUpdateFieldCopySQL(FTmpFieldMD, NewFieldMetadata);
+ 
+       5 : Result := GenerateDropFieldSQL(FTmpFieldMD);
+     end;
+ end;
+ 
+ function TInstantDBBuildAlterFieldGenericSQLCommand.GetSQLStatementCount:
+     Integer;
+ begin
+   Result := 6;
+ end;
+ 
+ procedure TInstantDBBuildAlterFieldGenericSQLCommand.InternalExecute;
+ var
+   iStatement: Integer;
+ begin
+   try
+     for iStatement := 0 to Pred(GetSQLStatementCount) do
+       Broker.Execute(GetSQLStatement(iStatement));
+   except
+     if Assigned(FTmpFieldMD) then
+       Broker.Execute(Broker.Generator.GenerateDropFieldSQL(FTmpFieldMD));
+     raise;
+   end;
+ end;
+ 
  end.

[Instantobjects-cvscommit] Source/Catalogs/MSSql/D2006 - New directory

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Catalogs/MSSql/D2006
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30975/D2006

Log Message:
Directory /cvsroot/instantobjects/Source/Catalogs/MSSql/D2006 added to the repository

[Instantobjects-cvscommit] Source/Catalogs/IBFb/D2006 - New directory

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Catalogs/IBFb/D2006
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30875/D2006

Log Message:
Directory /cvsroot/instantobjects/Source/Catalogs/IBFb/D2006 added to the repository

[Instantobjects-cvscommit] Help IOHelp.cnt,1.4,1.5 IOHelp.hlp,1.2,1.3 IOHelp.hsc,1.4,1.5

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Help
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18660/Help

Modified Files:
	IOHelp.cnt IOHelp.hlp IOHelp.hsc 
Log Message:
Help content aligned to new structure of install guidelines.

Index: IOHelp.cnt
===================================================================
RCS file: /cvsroot/instantobjects/Help/IOHelp.cnt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** IOHelp.cnt	28 Oct 2005 13:01:53 -0000	1.4
--- IOHelp.cnt	31 Oct 2005 16:00:57 -0000	1.5
***************
*** 1,4 ****
! ;This help file was created with HelpScribble 7.5.0
! ;Licensed to: Steven Mitchell
  
  :BASE IOHelp.hlp
--- 1,4 ----
! ;This help file was created with HelpScribble 7.5.1
! ;Licensed to: CiBiSoft.com
  
  :BASE IOHelp.hlp
***************
*** 106,110 ****
  3 InstantConstArrayToVariant=327SI9P>MAIN
  3 InstantDateTimeToStr=327SI9Q>MAIN
- 3 InstantDefaultConnector=InstantDefaultConnector>MAIN
  3 InstantDisableNotifiers=327SI9U>MAIN
  3 InstantEnableNotifiers=327SI9W>MAIN
--- 106,109 ----
***************
*** 120,124 ****
  3 InstantIsIdentifier=3OA4HS.>MAIN
  3 InstantIsValidObjectId=id_832>MAIN
- 3 InstantMatchObject=InstantMatchObject>MAIN
  3 InstantMatchObject=75DE_GZ>MAIN
  3 InstantNameToClassName=327SI8T>MAIN
--- 119,122 ----
***************
*** 189,193 ****
  3 InstantDateFormat=8DW2.DP>MAIN
  3 InstantDateTimeFormat=327SI9S>MAIN
- 3 InstantTimeFormat=InstantTimeFormat>MAIN
  2 Units
  3 InstantADO.pas=id_102>MAIN
--- 187,190 ----
***************
*** 204,206 ****
  3 InstantPersistence.pas=id_5>MAIN
  3 InstantPresentation.pas=id_413>MAIN
- 3 InstantUtils.pas=id_1057>MAIN
--- 201,202 ----

Index: IOHelp.hlp
===================================================================
RCS file: /cvsroot/instantobjects/Help/IOHelp.hlp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvslvG1Vr and /tmp/cvs7iPzed differ

Index: IOHelp.hsc
===================================================================
RCS file: /cvsroot/instantobjects/Help/IOHelp.hsc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** IOHelp.hsc	28 Oct 2005 13:01:53 -0000	1.4
--- IOHelp.hsc	31 Oct 2005 16:00:58 -0000	1.5
***************
*** 1,5 ****
  HelpScribble project file.
  13
! `grira Zvgpuryy-0Q4954
  0
  1
--- 1,5 ----
  HelpScribble project file.
  13
! PvOv`bsg.pbz-16O773
  0
  1
***************
*** 10,14 ****
  TRUE
  0x0409   English (U.S.)
! D:\L\InstantObjects\Help
  1
  BrowseButtons()
--- 10,14 ----
  TRUE
  0x0409   English (U.S.)
! D:\SELEQT\InstantObjectsCVS\Help
  1
  BrowseButtons()
***************
*** 50,56 ****
  
  FALSE
! 11
! {\rtf1\ansi\ansicpg1252\deff0{\fonttbl{\f0\fswiss Arial;}{\f1\fswiss\fcharset0 Arial;}}
! {\colortbl ;\red0\green0\blue0;\red128\green0\blue0;}
  \viewkind4\uc1\pard\sb25\sa25\cf1\lang1040\b\f0\fs24 InstantObjects Guide\f1  2.0\cf2\{keepn\}\cf1\f0 
  \par \b0\fs18 Welcome to InstantObjects, the integrated framework for developing object-oriented business solutions in Delphi.
--- 50,56 ----
  
  FALSE
! 13
! {\rtf1\ansi\ansicpg1252\deff0{\fonttbl{\f0\fswiss Arial;}{\f1\fswiss\fcharset0 Arial;}{\f2\fnil\fcharset0 Courier New;}{\f3\fnil Courier New;}}
! {\colortbl ;\red0\green0\blue0;\red128\green0\blue0;\red0\green0\blue255;}
  \viewkind4\uc1\pard\sb25\sa25\cf1\lang1040\b\f0\fs24 InstantObjects Guide\f1  2.0\cf2\{keepn\}\cf1\f0 
  \par \b0\fs18 Welcome to InstantObjects, the integrated framework for developing object-oriented business solutions in Delphi.
***************
*** 60,64 ****
  \par Even though it is still a bolted\lang1033\f1 -\lang1040\f0 on technology, InstantObjects integrates with the Delphi IDE and Object Pascal in a simple, flexible and intuitive manner. There are no sophisticated environments that have to be comprehended before application development can begin.
  \par 
! \par \cf2\{bmc instantobjects_logo.gif\}\cf1 
  \par }
  20
--- 60,66 ----
  \par Even though it is still a bolted\lang1033\f1 -\lang1040\f0 on technology, InstantObjects integrates with the Delphi IDE and Object Pascal in a simple, flexible and intuitive manner. There are no sophisticated environments that have to be comprehended before application development can begin.
  \par 
! \par \f1 You can find more information about this Open-Source project at:  \cf3\strike\f2\fs20 www.instantobjects.org\cf2\strike0\f3\{link=*! ExecFile("http://www.instantobjects.org/")\}\cf1\f0\fs18 
! \par \cf2 
! \par \{bmc instantobjects_logo.gif\}\cf1 
  \par }
  20
***************
*** 115,129 ****
  
  
! Done
  
  
  
  FALSE
! 7
  {\rtf1\ansi\ansicpg1252\deff0\deflang1040{\fonttbl{\f0\fswiss\fcharset0 Arial;}{\f1\fswiss Arial;}}
  {\colortbl ;\red0\green0\blue0;}
  \viewkind4\uc1\pard\b\f0\fs24 Installing \f1 InstantObjects\cf1\b0\fs16 
  \par \pard\sb25\tx1435\strike Group Topics\strike0\{linkID=25>nav\}\tab\strike Using InstantObjects\strike0\{linkID=20>main\}\f0  \f1\{keepn\} 
! \par \pard\f0\fs18 For installation information, please refer to the file Readme.txt provided in the Docs folder of the InstantObjects archive. Installation consists mainly of compiling and installing the appropriate packages in the Delphi IDE. The Readme file helps in determining the packages you need and their correct installation order.
  \par 
  \par }
--- 117,147 ----
  
  
! Testing
  
  
  
  FALSE
! 23
  {\rtf1\ansi\ansicpg1252\deff0\deflang1040{\fonttbl{\f0\fswiss\fcharset0 Arial;}{\f1\fswiss Arial;}}
  {\colortbl ;\red0\green0\blue0;}
  \viewkind4\uc1\pard\b\f0\fs24 Installing \f1 InstantObjects\cf1\b0\fs16 
  \par \pard\sb25\tx1435\strike Group Topics\strike0\{linkID=25>nav\}\tab\strike Using InstantObjects\strike0\{linkID=20>main\}\f0  \f1\{keepn\} 
! \par \f0\fs18 
! \par To cover the needs of most developers, we offer two different approaches to install InstantObjects.
! \par 
! \par The first one is oriented to proficient developers, and is the same method we use during the development of InstantObjects (that is, on the CVS materials).
! \par This method is very flexible, as you can choose which parts of InstantObjects you will install and when.
! \par It will require a good knowledge about package compile, build and install.
! \par 
! \par You will find detailed instructions in the \b Install.txt\b0  file located in:
! \par \b     <installdir>/Docs\b0 
! \par     
! \par The second one is more oriented to normal developers that would prefer installing some more features even if they know they will never use it, but by means of an easier procedure that does most of the job for them.
! \par 
! \par You will find detailed instructions in the \b Install.txt\b0  file located in:
! \par \b     <installdir>/Source/PackageGroups
! \par 
! \par \b0 One reminder though.
! \par The second option will be kept up to date only for official releases (that is Alpha, Beta, RC and final), so it will be unsupported for the real CVS stuff. If you foresee downloading the "bleeding edge" of IO from CVS quite often, we advice you to go for the first way and stay there for good.
  \par 
  \par }

[Instantobjects-cvscommit] Source/Install/D2006 DesignTimePackages.bdsgroup,1.1,NONE RunTimePackages.bdsgroup,1.1,NONE

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Install/D2006
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12993/Source/Install/D2006

Removed Files:
	DesignTimePackages.bdsgroup RunTimePackages.bdsgroup 
Log Message:
removed packagegroup files from install folder. moved to PackageGroups folder

--- RunTimePackages.bdsgroup DELETED ---

--- DesignTimePackages.bdsgroup DELETED ---