diff options
| author | Abdullah Sowayan <sowayan@users.noreply.github.com> | 2010-02-24 19:16:20 +0000 |
|---|---|---|
| committer | Abdullah Sowayan <sowayan@users.noreply.github.com> | 2010-02-24 19:16:20 +0000 |
| commit | 00ecf6d8b66ac487e1cc2250195db1de030eb336 (patch) | |
| tree | f9d3cfe52f4e3ff0a1f3f4ba5acb33096753f0e4 | |
| parent | b1b00b9574992e8260a3a16f964ca51eeb3f999d (diff) | |
| download | ATCD-00ecf6d8b66ac487e1cc2250195db1de030eb336.tar.gz | |
98 files changed, 0 insertions, 6759 deletions
diff --git a/ADBC/ADBC.mwc b/ADBC/ADBC.mwc deleted file mode 100644 index 85a72d6d24d..00000000000 --- a/ADBC/ADBC.mwc +++ /dev/null @@ -1,8 +0,0 @@ -// $Id$ - -workspace (ADBC) { - cmdline += -include $ADBC_ROOT/MPC/config \ - -feature_file $ADBC_ROOT/default.features - - ./adbc -} diff --git a/ADBC/AUTHORS b/ADBC/AUTHORS deleted file mode 100644 index 32ed90a061f..00000000000 --- a/ADBC/AUTHORS +++ /dev/null @@ -1,11 +0,0 @@ -James H. Hill, M.S., Ph.D. -hillj@cs.iupui.edu - -Assistant Professor of Computer Science -Department of Computer and Information Science -Indiana University-Purdue University Indianapolis -Indianapolis, IN 46202 - -www.cs.iupui.edu/~hillj -TEL: (317) 274-8527 -FAX: (317) 274-9742 diff --git a/ADBC/COPYING b/ADBC/COPYING deleted file mode 100644 index 0b4d139ae6e..00000000000 --- a/ADBC/COPYING +++ /dev/null @@ -1,110 +0,0 @@ - - _________________________________________________________________ - - Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM), and - CoSMIC(TM) - - [1]ACE(TM), [2]TAO(TM), [3]CIAO(TM), and [4]CoSMIC(TM) (henceforth - referred to as "DOC software") are copyrighted by [5]Douglas C. - Schmidt and his [6]research group at [7]Washington University, - [8]University of California, Irvine, and [9]Vanderbilt University, - Copyright (c) 1993-2009, all rights reserved. Since DOC software is - open-source, freely available software, you are free to use, modify, - copy, and distribute--perpetually and irrevocably--the DOC software - source code and object code produced from the source, as well as copy - and distribute modified versions of this software. You must, however, - include this copyright statement along with any code built using DOC - software that you release. No copyright statement needs to be provided - if you just ship binary executables of your software products. - - You can use DOC software in commercial and/or binary software releases - and are under no obligation to redistribute any of your source code - that is built using DOC software. Note, however, that you may not do - anything to the DOC software code, such as copyrighting it yourself or - claiming authorship of the DOC software code, that will prevent DOC - software from being distributed freely using an open-source - development model. You needn't inform anyone that you're using DOC - software in your software, though we encourage you to let [10]us know - so we can promote your project in the [11]DOC software success - stories. - - The [12]ACE, [13]TAO, [14]CIAO, and [15]CoSMIC web sites are - maintained by the [16]DOC Group at the [17]Institute for Software - Integrated Systems (ISIS) and the [18]Center for Distributed Object - Computing of Washington University, St. Louis for the development of - open-source software as part of the open-source software community. - Submissions are provided by the submitter ``as is'' with no warranties - whatsoever, including any warranty of merchantability, noninfringement - of third party intellectual property, or fitness for any particular - purpose. In no event shall the submitter be liable for any direct, - indirect, special, exemplary, punitive, or consequential damages, - including without limitation, lost profits, even if advised of the - possibility of such damages. Likewise, DOC software is provided as is - with no warranties of any kind, including the warranties of design, - merchantability, and fitness for a particular purpose, - noninfringement, or arising from a course of dealing, usage or trade - practice. Washington University, UC Irvine, Vanderbilt University, - their employees, and students shall have no liability with respect to - the infringement of copyrights, trade secrets or any patents by DOC - software or any part thereof. Moreover, in no event will Washington - University, UC Irvine, or Vanderbilt University, their employees, or - students be liable for any lost revenue or profits or other special, - indirect and consequential damages. - - DOC software is provided with no support and without any obligation on - the part of Washington University, UC Irvine, Vanderbilt University, - their employees, or students to assist in its use, correction, - modification, or enhancement. A [19]number of companies around the - world provide commercial support for DOC software, however. - - DOC software is Y2K-compliant, as long as the underlying OS platform - is Y2K-compliant. Likewise, DOC software is compliant with the new US - daylight savings rule passed by Congress as "The Energy Policy Act of - 2005," which established new daylight savings times (DST) rules for - the United States that expand DST as of March 2007. Since DOC software - obtains time/date and calendaring information from operating systems - users will not be affected by the new DST rules as long as they - upgrade their operating systems accordingly. - - The names ACE(TM), TAO(TM), CIAO(TM), CoSMIC(TM), Washington - University, UC Irvine, and Vanderbilt University, may not be used to - endorse or promote products or services derived from this source - without express written permission from Washington University, UC - Irvine, or Vanderbilt University. This license grants no permission to - call products or services derived from this source ACE(TM), TAO(TM), - CIAO(TM), or CoSMIC(TM), nor does it grant permission for the name - Washington University, UC Irvine, or Vanderbilt University to appear - in their names. - - If you have any suggestions, additions, comments, or questions, please - let [20]me know. - - [21]Douglas C. Schmidt - _________________________________________________________________ - - Back to the [22]ACE home page. - -References - - 1. http://www.cs.wustl.edu/~schmidt/ACE.html - 2. http://www.cs.wustl.edu/~schmidt/TAO.html - 3. http://www.dre.vanderbilt.edu/CIAO/ - 4. http://www.dre.vanderbilt.edu/cosmic/ - 5. http://www.dre.vanderbilt.edu/~schmidt/ - 6. http://www.cs.wustl.edu/~schmidt/ACE-members.html - 7. http://www.wustl.edu/ - 8. http://www.uci.edu/ - 9. http://www.vanderbilt.edu/ - 10. mailto:doc_group@cs.wustl.edu - 11. http://www.cs.wustl.edu/~schmidt/ACE-users.html - 12. http://www.cs.wustl.edu/~schmidt/ACE.html - 13. http://www.cs.wustl.edu/~schmidt/TAO.html - 14. http://www.dre.vanderbilt.edu/CIAO/ - 15. http://www.dre.vanderbilt.edu/cosmic/ - 16. http://www.dre.vanderbilt.edu/ - 17. http://www.isis.vanderbilt.edu/ - 18. http://www.cs.wustl.edu/~schmidt/doc-center.html - 19. http://www.cs.wustl.edu/~schmidt/commercial-support.html - 20. mailto:d.schmidt@vanderbilt.edu - 21. http://www.dre.vanderbilt.edu/~schmidt/ - 22. http://www.cs.wustl.edu/ACE.html diff --git a/ADBC/ChangeLog b/ADBC/ChangeLog deleted file mode 100644 index b04428a6c5e..00000000000 --- a/ADBC/ChangeLog +++ /dev/null @@ -1,261 +0,0 @@ -Mon Jan 4 16:51:31 UTC 2010 James H. Hill <hillj at cs dot iupui dot edu> - - * .: - - Added default.features to the ingore list. - -Mon Jan 4 16:49:24 UTC 2010 James H. Hill <hillj at cs dot iupui dot edu> - - * adbc/SQLite/Parameter.cpp: - - Fixed build errors on MacOS X platforms. - -Mon Jan 4 16:47:56 UTC 2010 James H. Hill <hillj at cs dot iupui dot edu> - - * adbc/ODBC/ODBC.h: - - Missing file. - -Mon Jan 4 16:46:22 UTC 2010 James H. Hill <hillj at cs dot iupui dot edu> - - * adbc/config.h: - - Missing file. - -Mon Jan 4 16:44:26 UTC 2010 James H. Hill <hillj at cs dot iupui dot edu> - - * default.features.tmpl: - - Fixed errors in the template file. - -Mon Jan 4 06:02:42 UTC 2010 James H. Hill <hillj at cs dot iupui dot edu> - - * adbc/ODBC: - * adbc/ODBC/ODBC.mpc: - * adbc/ODBC/ODBC_Connection.h: - * adbc/ODBC/ODBC_Connection.inl: - * adbc/ODBC/ODBC_Connection.cpp: - * adbc/ODBC/ODBC_Env.h: - * adbc/ODBC/ODBC_Env.inl: - * adbc/ODBC/ODBC_Env.cpp: - * adbc/ODBC/ODBC_Exception.h: - * adbc/ODBC/ODBC_Exception.inl: - * adbc/ODBC/ODBC_Exception.cpp: - * adbc/ODBC/ODBC_Parameter.h: - * adbc/ODBC/ODBC_Parameter.inl: - * adbc/ODBC/ODBC_Parameter.cpp: - * adbc/ODBC/ODBC_Parameter_List.h: - * adbc/ODBC/ODBC_Parameter_List.inl: - * adbc/ODBC/ODBC_Parameter_List.cpp: - * adbc/ODBC/ODBC_Query.h: - * adbc/ODBC/ODBC_Query.inl: - * adbc/ODBC/ODBC_Query.cpp: - * adbc/ODBC/ODBC_Record.h: - * adbc/ODBC/ODBC_Record.inl: - * adbc/ODBC/ODBC_Record.cpp: - * adbc/ODBC/ODBC_Types.h: - * adbc/ODBC/ODBC_Types.inl: - * adbc/ODBC/ODBC_Types.cpp: - * adbc/ODBC/ODBC_export.h: - * examples/ODBC: - * examples/ODBC/static: - * examples/ODBC/static/static.mpc: - * examples/ODBC/static/static.mwc: - * examples/ODBC/static/static.cpp: - - First implementation of ADBC wrappers for ODBC and a - simple example illstrating its usage. - -Mon Jan 4 05:29:45 UTC 2010 James H. Hill <hillj at cs dot iupui dot edu> - - * ADBC.mwc: - - Explicitly specified the directories to include in - the workspace. - - * MPC/config/adbc_sqlite.mpb: - - Added the sqlite3 base project. - - * MPC/config/adbclib.mpb: - - Fixed errors in the base project specification. - - * adbc/ADBC.mpc: - * adbc/Connection.h: - * adbc/Exception.h: - * adbc/Parameter.h: - * adbc/Parameter.inl: - * adbc/Parameter_List.h: - * adbc/Query.h: - * adbc/SQLite/Types.h: - - Changed all instances of CUTS to ADBC. - - * adbc/Record.h: - - Added a pure virtual reset () method. - - * adbc/SQLite/Parameter.h: - * adbc/SQLite/Parameter.inl: - * adbc/SQLite/Parameter.cpp: - - Removed the length (size_t) function since this must be set - when a parameter is bound. - - Re-implemented the is_null () so that is not implemented in - terms of its base class. - - * adbc/SQLite/Query.h: - * adbc/SQLite/Query.inl: - * adbc/SQLite/Query.cpp: - * adbc/SQLite/Record.h: - * adbc/SQLite/Record.inl: - * adbc/SQLite/Record.cpp: - - Improved the implementation of the Record class so that its - semantics are more in line with its specification. This also - simplified the execute* () methods on the Query class since - the Record handles reseting the cursor for each execution of - a statement. - - * default.features.tmpl: - - Template of all possible features for MPC. - - * examples/SQLite/simple/simple.cpp: - - Fixed build errors in the example. - -Sat Jan 2 16:23:29 UTC 2010 James H. Hill <hillj at cs dot iupui dot edu> - - * adbc/Query.h: - * adbc/Record.h: - * adbc/SQLite/Query.h: - * adbc/SQLite/Query.cpp: - * adbc/SQLite/Record.h: - * adbc/SQLite/Record.inl: - - Moved the count () method from the Record class to the - Query class since it has no meaning on the SELECT SQL - statement, which results in a Record object for iteration. - -Sat Jan 2 02:23:02 UTC 2010 James H. Hill <hillj at cs dot iupui dot edu> - - * adbc/SQLite/Query.h: - * adbc/SQLite/Query.inl: - * adbc/SQLite/Query.cpp: - * adbc/SQLite/Record.h: - * adbc/SQLite/Record.inl: - - execute () no longer allocates a record for each query - executed. Instead, it return an embedded record, which - should not be deallocated () by the client. - - * examples/SQLite/dynamic/dynamic.cpp: - * examples/SQLite/simple/simple.cpp: - - Updated the examples. - -Wed Dec 30 22:54:02 UTC 2009 James H. Hill <hillj@dre.vanderbilt.edu> - - * adbc/SQLite/Query.h: - * adbc/SQLite/Query.inl: - * adbc/SQLite/Query.cpp: - - Improved the inline implementation. - - * examples/SQLite/dynamic: - * examples/SQLite/dynamic/dynamic.mpc: - * examples/SQLite/dynamic/dynamic.mwc: - * examples/SQLite/dynamic/dynamic.cpp: - - Example illustrating dynamic allocation of a query. - - * examples/SQLite/simple/simple.cpp: - - This example no longer dynamically allocates the query. - -Wed Dec 30 22:26:58 UTC 2009 James H. Hill <hillj@dre.vanderbilt.edu> - - * ADBC.mwc: - * AUTHORS: - * COPYING: - * MPC: - * MPC/config: - * MPC/config/adbc_defaults.mpb: - * MPC/config/adbc_exe.mpb: - * MPC/config/adbc_lib.mpb: - * MPC/config/adbc_sqlite.mpb: - * MPC/config/adbclib.mpb: - * NEWS: - * PROBLEM-REPORT-FORM: - * THANKS: - * VERSION: - * adbc: - * adbc/ADBC.mpc: - * adbc/ADBC_export.h: - * adbc/Connection.h: - * adbc/Connection.inl: - * adbc/Connection.cpp: - * adbc/Exception.h: - * adbc/Exception.inl: - * adbc/Exception.cpp: - * adbc/Parameter.h: - * adbc/Parameter.inl: - * adbc/Parameter.cpp: - * adbc/Parameter_List.h: - * adbc/Parameter_List.inl: - * adbc/Parameter_List.cpp: - * adbc/Query.h: - * adbc/Query.inl: - * adbc/Query.cpp: - * adbc/Record.h: - * adbc/Record.inl: - * adbc/Record.cpp: - * adbc/SQLite: - * adbc/SQLite/Connection.h: - * adbc/SQLite/Connection.inl: - * adbc/SQLite/Connection.cpp: - * adbc/SQLite/Exception.h: - * adbc/SQLite/Exception.inl: - * adbc/SQLite/Exception.cpp: - * adbc/SQLite/Parameter.h: - * adbc/SQLite/Parameter.inl: - * adbc/SQLite/Parameter.cpp: - * adbc/SQLite/Parameter_List.h: - * adbc/SQLite/Parameter_List.inl: - * adbc/SQLite/Parameter_List.cpp: - * adbc/SQLite/Query.h: - * adbc/SQLite/Query.inl: - * adbc/SQLite/Query.cpp: - * adbc/SQLite/Record.h: - * adbc/SQLite/Record.inl: - * adbc/SQLite/Record.cpp: - * adbc/SQLite/SQLite.mpc: - * adbc/SQLite/SQLite_export.h: - * adbc/SQLite/Types.h: - * adbc/SQLite/Types.inl: - * adbc/SQLite/Types.cpp: - * adbc/Types.h: - * adbc/Types.inl: - * adbc/Types.cpp: - * adbc/destroy_t.h: - * bin: - * docs: - * lib: - * tests: - - Checkpointing current implementation of ADBC. Right now, it - supports only SQLite3. The ODBC implementation still needs - to be ported from the CUTS distribution. - - * examples: - * examples/SQLite: - * examples/SQLite/simple: - * examples/SQLite/simple/simple.mpc: - * examples/SQLite/simple/simple.mwc: - * examples/SQLite/simple/simple.cpp: - - Very simple example illustrating how to use the SQLite3 - implementation. diff --git a/ADBC/MPC/config/adbc_defaults.mpb b/ADBC/MPC/config/adbc_defaults.mpb deleted file mode 100644 index 8233650dbd6..00000000000 --- a/ADBC/MPC/config/adbc_defaults.mpb +++ /dev/null @@ -1,22 +0,0 @@ -// $Id$ - -project : acenosubsets, acedefaults { - includes += $(ADBC_ROOT) $(ADBC_ROOT)/adbc - libpaths += $(ADBC_ROOT)/lib - - specific (prop:microsoft) { - DisableSpecificWarnings += 4290 4251 4275 4355 4180 - } - - verbatim (gnuace, top) { - no_hidden_visibility = 1 - } -} - -feature (noinline) { - macros -= __ADBC_INLINE__ -} - -feature (!noinline) { - macros += __ADBC_INLINE__ -} diff --git a/ADBC/MPC/config/adbc_exe.mpb b/ADBC/MPC/config/adbc_exe.mpb deleted file mode 100644 index ba986218cff..00000000000 --- a/ADBC/MPC/config/adbc_exe.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// $Id$ - -project : aceexe, adbclib { - install = $(ADBC_ROOT)/bin -} diff --git a/ADBC/MPC/config/adbc_lib.mpb b/ADBC/MPC/config/adbc_lib.mpb deleted file mode 100644 index c21cffbe1c8..00000000000 --- a/ADBC/MPC/config/adbc_lib.mpb +++ /dev/null @@ -1,6 +0,0 @@ -// $Id$ - -project : acelib, adbclib { - libout = $(ADBC_ROOT)/lib - dllout = $(ADBC_ROOT)/lib -} diff --git a/ADBC/MPC/config/adbc_sqlite.mpb b/ADBC/MPC/config/adbc_sqlite.mpb deleted file mode 100644 index a7060efd5fa..00000000000 --- a/ADBC/MPC/config/adbc_sqlite.mpb +++ /dev/null @@ -1,6 +0,0 @@ -// $Id$ - -project : sqlite3, adbc_defaults { - libs += ADBC_SQLite - after += ADBC_SQLite -} diff --git a/ADBC/MPC/config/adbclib.mpb b/ADBC/MPC/config/adbclib.mpb deleted file mode 100644 index 14f02457ced..00000000000 --- a/ADBC/MPC/config/adbclib.mpb +++ /dev/null @@ -1,6 +0,0 @@ -// $Id$ - -project : adbc_defaults { - after += ADBC - libs += ADBC -} diff --git a/ADBC/NEWS b/ADBC/NEWS deleted file mode 100644 index e69de29bb2d..00000000000 --- a/ADBC/NEWS +++ /dev/null diff --git a/ADBC/PROBLEM-REPORT-FORM b/ADBC/PROBLEM-REPORT-FORM deleted file mode 100644 index c0ae2c1d9a5..00000000000 --- a/ADBC/PROBLEM-REPORT-FORM +++ /dev/null @@ -1,93 +0,0 @@ -[Please use the PRF form below to submit bug reports, problem reports, - etc., to the ACE developers and interested users. Send to - ace-bugs@cs.wustl.edu. If you are using OCI, PrismTech, or - Riverace's versions of ACE do not send bugs to this mailing list, but - instead contact those companies for support. Please also send your - PRF as plain ASCII text, _not_ uuencoded or as an attachment. - - We prefer that all bug reports be submitted through our bug tracking - system. See $ACE_ROOT/docs/usage-bugzilla.html for more information - about how to do this. If you are unsure as to whether your problem - is a real bug or not then please submit your question to the mailing - list using the following form. Not using the problem report form - will make it harder or impossible to identify the problem, and in - many cases we will be unable to help at all. Also please try to - browse bugzilla and the ChangeLog files to find out if your problem - has been solved in a more recent version of ACE. - - To ensure that you see responses, please do one of the following: - - 1) Subscribe to the ace-bugs mail list, by sending email with - contents "subscribe ace-bugs" to majordomo@cs.wustl.edu. - - 2) Or, monitor the comp.soft-sys.ace newsgroup for responses. - - Replace/remove all the explanatory text in brackets before mailing. - - Please send this form as ASCII text only. Do _not_ send it as an - attachment, or as tar'ed, compressed and/or uuencoded text. And - limit line lengths to less than 80 characters. - - PLEASE make your Subject: line as descriptive as possible. - Subjects like "ACE bug" or "bug report" are not helpful! - Also, do _not_ include the word "help" in the Subject!] - - When including your config.h and platform_macros.GNU files as requested - below, only include the contents if you use the recommended method of - including the platform-specific file in your file. If you use a link - to the platform-specific file, simply state which one - DO NOT - include an entire platform-specific configuration file in the form. - -8<----------8<----------8<----------8<----------8<----------8<----------8<---- - -To: ace-bugs@cs.wustl.edu -Subject: [area]: [synopsis] - - ADBC VERSION: 0.1.5 - - HOST MACHINE and OPERATING SYSTEM: - If on Windows based OS's, which version of WINSOCK do you - use?: - - TARGET MACHINE and OPERATING SYSTEM, if different from HOST: - COMPILER NAME AND VERSION (AND PATCHLEVEL): - - THE $ACE_ROOT/ace/config.h FILE [if you use a link to a platform- - specific file, simply state which one]: - - THE $ACE_ROOT/include/makeinclude/platform_macros.GNU FILE [if you - use a link to a platform-specific file, simply state which one - (unless this isn't used in this case, e.g., with Microsoft Visual - C++)]: - - BUILD METHOD USED: -[Experimental ./configure or traditional makefile/project file?] - - CONTENTS OF $ACE_ROOT/bin/MakeProjectCreator/config/default.features - (used by MPC when you generate your own makefiles): - - AREA/CLASS/EXAMPLE AFFECTED: -[What example failed? What module failed to compile?] - - DOES THE PROBLEM AFFECT: - COMPILATION? - LINKING? - On Unix systems, did you run make realclean first? - EXECUTION? - OTHER (please specify)? -[Please indicate whether ACE, your application, or both are affected.] - - SYNOPSIS: -[Brief description of the problem] - - DESCRIPTION: -[Detailed description of problem. Don't just say "<blah> -doesn't work, here's a fix," explain what your program does -to get to the <blah> state. ] - - REPEAT BY: -[What you did to get the error; include test program or session -transcript if at all possible. ] - - SAMPLE FIX/WORKAROUND: -[If available ] diff --git a/ADBC/THANKS b/ADBC/THANKS deleted file mode 100644 index 106bd7294a3..00000000000 --- a/ADBC/THANKS +++ /dev/null @@ -1,35 +0,0 @@ -ACKNOWLEDGEMENTS - -ADBC has been deeply influenced and improved by the following -members research group Indiana University-Purdue University -Indinapolis and colleages at Vanderbilt University in Nashville. - --- - --- - -I would also like to thank all the following people who have also -contributed to ACE and TAO over the years: - --- - --- - -I would particularly like to thank Douglas C. Schmidt for allowing -me to distribute ADBC with the DOC Group middleware. - -In conclusion, our goal is to see ADBC continue to evolve and -become a more comprehensive, robust, and well-documented C++ class -library for databases that is freely available to researchers and -developers. If you have any improvements, suggestions, and or -comments, we'd like to hear about it. Please see the instructions -in - -$ADBC_ROOT/PROBLEM-REPORT-FORM - -for instructions on submitting suggestions or fixes. - - Thanks, - - James H. Hill - hillj at cs dot iupui dot edu diff --git a/ADBC/VERSION b/ADBC/VERSION deleted file mode 100644 index 4c79a47be10..00000000000 --- a/ADBC/VERSION +++ /dev/null @@ -1,11 +0,0 @@ -This is ADBC version 0.7.4, released <%TBD%> - -If you have any problems with or questions about ADBC, please send -email to the ACE mailing list (ace-users@cs.wustl.edu), using the form -found in the file PROBLEM-REPORT-FORM. To ensure that you see responses, -please do one of the following: - - 1) Subscribe to the ace-users mail list, by sending email with - contents "subscribe ace-users" to majordomo@cs.wustl.edu. - - 2) Or, monitor the comp.soft-sys.ace newsgroup for responses. diff --git a/ADBC/adbc/ADBC.mpc b/ADBC/adbc/ADBC.mpc deleted file mode 100644 index d2c692ccd55..00000000000 --- a/ADBC/adbc/ADBC.mpc +++ /dev/null @@ -1,27 +0,0 @@ -// $Id$ - -project (ADBC) : acelib, adbc_defaults { - sharedname += ADBC - dynamicflags += ADBC_BUILD_DLL - - libout = $(ADBC_ROOT)/lib - dllout = $(ADBC_ROOT)/lib - - Source_Files { - Connection.cpp - Exception.cpp - Parameter.cpp - Parameter_List.cpp - Query.cpp - Record.cpp - Types.cpp - } - - Template_Files { - } - - Header_Files { - ADBC_export.h - destroy_t.h - } -} diff --git a/ADBC/adbc/ADBC_export.h b/ADBC/adbc/ADBC_export.h deleted file mode 100644 index d2ec8e1d017..00000000000 --- a/ADBC/adbc/ADBC_export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl ADBC -// ------------------------------ -#ifndef ADBC_EXPORT_H -#define ADBC_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ADBC_HAS_DLL) -# define ADBC_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ADBC_HAS_DLL */ - -#if !defined (ADBC_HAS_DLL) -# define ADBC_HAS_DLL 1 -#endif /* ! ADBC_HAS_DLL */ - -#if defined (ADBC_HAS_DLL) && (ADBC_HAS_DLL == 1) -# if defined (ADBC_BUILD_DLL) -# define ADBC_Export ACE_Proper_Export_Flag -# define ADBC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ADBC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ADBC_BUILD_DLL */ -# define ADBC_Export ACE_Proper_Import_Flag -# define ADBC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ADBC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ADBC_BUILD_DLL */ -#else /* ADBC_HAS_DLL == 1 */ -# define ADBC_Export -# define ADBC_SINGLETON_DECLARATION(T) -# define ADBC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ADBC_HAS_DLL == 1 */ - -// Set ADBC_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ADBC_NTRACE) -# if (ACE_NTRACE == 1) -# define ADBC_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ADBC_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ADBC_NTRACE */ - -#if (ADBC_NTRACE == 1) -# define ADBC_TRACE(X) -#else /* (ADBC_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define ADBC_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (ADBC_NTRACE == 1) */ - -#endif /* ADBC_EXPORT_H */ - -// End of auto generated file. diff --git a/ADBC/adbc/Connection.cpp b/ADBC/adbc/Connection.cpp deleted file mode 100644 index f02cea05728..00000000000 --- a/ADBC/adbc/Connection.cpp +++ /dev/null @@ -1,7 +0,0 @@ -// $Id$ - -#include "Connection.h" - -#if !defined (__ADBC_INLINE__) -#include "Connection.inl" -#endif diff --git a/ADBC/adbc/Connection.h b/ADBC/adbc/Connection.h deleted file mode 100644 index 2955617bbe4..00000000000 --- a/ADBC/adbc/Connection.h +++ /dev/null @@ -1,84 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Connection.h - * - * $Id$ - * - * @author James H. Hill - */ -//============================================================================= - -#ifndef _ADBC_CONNECTION_H_ -#define _ADBC_CONNECTION_H_ - -#include "Exception.h" - -namespace ADBC -{ -// Forward decl. -class Query; - -/** - * @class Connection - * - * Base class for all database connection implemenations. - */ -class ADBC_Export Connection -{ -public: - /// Constructor. - Connection (void); - - /// Destructor. - virtual ~Connection (void); - - /** - * Create a connection. - * - * @param[in] username Name of the user. - * @param[in] password Password of the user. - * @param[in] server Location of the database. - * @param[in] port Port number for connection. - */ - virtual void connect (const ACE_CString & connstr) = 0; - - /// Close the current connection. - virtual void disconnect (void) = 0; - - /** - * Create a database database query. The query created will be - * dependent on the implemenation. - * - * @return Pointer to a database query. - */ - virtual Query * create_query (void) = 0; - - /** - * Determine if there is a valid connection. - * - * @retval true There is a connection. - * @retval false There is not a connection. - */ - virtual bool is_connected (void) const; - -protected: - /// Holds the current connection state. - bool connected_; - - /// The connction string for the connection. - ACE_CString connstr_; - -private: - // Prevent the following operations. - Connection (const Connection &); - const Connection & operator = (const Connection &); -}; -} - -#if defined (__ADBC_INLINE__) -#include "Connection.inl" -#endif - -#endif // !defined _ADBC_DB_CONNECTION_H_ diff --git a/ADBC/adbc/Connection.inl b/ADBC/adbc/Connection.inl deleted file mode 100644 index 1eecc25f9a4..00000000000 --- a/ADBC/adbc/Connection.inl +++ /dev/null @@ -1,52 +0,0 @@ -// -*- C++ -*- -// $Id$ - -namespace ADBC -{ -// -// Connection -// -ADBC_INLINE -Connection::Connection (void) -: connected_ (false) -{ - -} - -// -// ~Connection -// -ADBC_INLINE -Connection::~Connection (void) -{ - this->disconnect (); -} - -// -// is_connected -// -ADBC_INLINE -bool Connection::is_connected (void) const -{ - return this->connected_; -} - -// -// disconnect -// -ADBC_INLINE -void Connection::disconnect (void) -{ - this->connected_ = false; -} - -// -// connect -// -ADBC_INLINE -void Connection::connect (const ACE_CString & connstr) -{ - this->connected_ = true; - this->connstr_ = connstr; -} -} diff --git a/ADBC/adbc/Exception.cpp b/ADBC/adbc/Exception.cpp deleted file mode 100644 index 02110d8529d..00000000000 --- a/ADBC/adbc/Exception.cpp +++ /dev/null @@ -1,60 +0,0 @@ -// $Id$ - -#include "Exception.h" - -#if !defined (__ADBC_INLINE__) -#include "Exception.inl" -#endif - -namespace ADBC -{ -// -// Exception -// -Exception::Exception (void) -: native_ (0) -{ - -} - -// -// Exception -// -Exception:: -Exception (long native, const char * state, const char * msg) -: native_ (native), - state_ (state), - message_ (msg) -{ - -} - -// -// Exception -// -Exception::Exception (const Exception & ex) -: native_ (ex.native_), - state_ (ex.state_), - message_ (ex.message_) -{ - -} - -// -// Exception -// -Exception::Exception (const char * message) -: native_ (0), - message_ (message) -{ - -} - -// -// Exception -// -Exception::~Exception (void) -{ - -} -} diff --git a/ADBC/adbc/Exception.h b/ADBC/adbc/Exception.h deleted file mode 100644 index a3832574215..00000000000 --- a/ADBC/adbc/Exception.h +++ /dev/null @@ -1,95 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Exception.h - * - * $Id$ - * - * @author James H. Hill - */ -//============================================================================= - -#ifndef _ADBC_EXCEPTION_H_ -#define _ADBC_EXCEPTION_H_ - -#include "ace/SString.h" -#include "ADBC_export.h" -#include "config.h" - -namespace ADBC -{ -/** - * @class Exception - * - * Base class for all ADBC exceptions. - */ -class ADBC_Export Exception -{ -public: - /// Default constructor. - Exception (void); - - /** - * Initializing constructor. - * - * @param[in] message Error message. - */ - Exception (const char * message); - - /** - * Initializing constructor. - * - * @param[in] message Error message. - */ - Exception (long native, const char * state, const char * msg); - - /** - * Copy constructor. - * - * @param[in] ex Source exception. - */ - Exception (const Exception & ex); - - /// Destructor. - virtual ~Exception (void); - - /** - * Get the native error number for the exception. - * - * @return Native error number. - */ - virtual long native (void) const; - - /** - * Get the state code of the database. This is usually the - * SQL state of the database. - * - * @return Read-only reference to the SQL state. - */ - virtual const ACE_CString & state (void) const; - - /** - * Get the error message. - * - * @return Read-only reference to the message. - */ - virtual const ACE_CString & message (void) const; - -protected: - /// The native error number. - long native_; - - /// The current state of the database. - ACE_CString state_; - - /// The error message. - ACE_CString message_; -}; -} - -#if defined (__ADBC_INLINE__) -#include "Exception.inl" -#endif - -#endif // !defined _ADBC_DB_EXCEPTION_H_ diff --git a/ADBC/adbc/Exception.inl b/ADBC/adbc/Exception.inl deleted file mode 100644 index 90f1956d213..00000000000 --- a/ADBC/adbc/Exception.inl +++ /dev/null @@ -1,32 +0,0 @@ -// -*- C++ -*- -// $Id$ - -namespace ADBC -{ -// -// message -// -ADBC_INLINE -const ACE_CString & Exception::message (void) const -{ - return this->message_; -} - -// -// native -// -ADBC_INLINE -long Exception::native (void) const -{ - return this->native_; -} - -// -// state -// -ADBC_INLINE -const ACE_CString & Exception::state (void) const -{ - return this->state_; -} -} diff --git a/ADBC/adbc/ODBC/ODBC.h b/ADBC/adbc/ODBC/ODBC.h deleted file mode 100644 index b40e7e583d1..00000000000 --- a/ADBC/adbc/ODBC/ODBC.h +++ /dev/null @@ -1,42 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file ODBC.h - * - * $Id$ - * - * @author James H. Hill - */ -//============================================================================= - -#ifndef _ADBC_ODBC_H_ -#define _ADBC_ODBC_H_ - -#include "adbc/config.h" -#include "ODBC_export.h" - -#if defined (WIN32) -#include <windows.h> -#endif - -// SQL headers -#include <sql.h> -#include <sqlext.h> -#include <sqltypes.h> -#include <odbcinst.h> - -/// Determine if the return value from a SQL* method is -/// a successful code. -#define SQL_SUCCEED(res) ((res == SQL_SUCCESS_WITH_INFO) || (res == SQL_SUCCESS)) - -/// Verify an SQL operation succeeds. If it does not, then we -/// throw the specified exception. -#define SQL_VERIFY(op, ex) \ - do { \ - SQLRETURN __return__ = op; \ - if (!SQL_SUCCEED (__return__)) \ - throw ex; \ - } while (0) - -#endif // !defined _ADBC_ODBC_H_ diff --git a/ADBC/adbc/ODBC/ODBC.mpc b/ADBC/adbc/ODBC/ODBC.mpc deleted file mode 100644 index 2f0345d1242..00000000000 --- a/ADBC/adbc/ODBC/ODBC.mpc +++ /dev/null @@ -1,22 +0,0 @@ -// $Id$ - -project (ADBC_ODBC) : odbc, adbc_lib { - sharedname += ADBC_ODBC - dynamicflags += ADBC_ODBC_BUILD_DLL - - Source_Files { - ODBC_Connection.cpp - ODBC_Env.cpp - ODBC_Exception.cpp - ODBC_Parameter.cpp - ODBC_Parameter_List.cpp - ODBC_Query.cpp - ODBC_Record.cpp - ODBC_Types.cpp - } - - Header_Files { - ODBC.h - ODBC_export.h - } -} diff --git a/ADBC/adbc/ODBC/ODBC_Connection.cpp b/ADBC/adbc/ODBC/ODBC_Connection.cpp deleted file mode 100644 index f27341d44c2..00000000000 --- a/ADBC/adbc/ODBC/ODBC_Connection.cpp +++ /dev/null @@ -1,88 +0,0 @@ -// $Id$ - -#include "ODBC_Connection.h" - -#if !defined (__ADBC_INLINE__) -#include "ODBC_Connection.inl" -#endif - -#include "ODBC_Query.h" -#include "ace/CORBA_macros.h" - -namespace ADBC -{ -namespace ODBC -{ -// -// init -// -void Connection::init (void) -{ - // Allocate the connection handle. - SQL_ENV_VERIFY (::SQLAllocHandle (SQL_HANDLE_DBC, this->env_, &this->handle_), - this->env_->handle ()); -} - -// -// ~Connection -// -Connection::~Connection (void) -{ - if (this->handle_ != SQL_NULL_HANDLE) - ::SQLFreeHandle (SQL_HANDLE_DBC, this->handle_); -} - -// -// connect -// -void Connection::connect (const ACE_CString & connstr) -{ - // Remove this connection. - this->disconnect (); - - // Establish a connection with the database. - short result = 0; - static SQLCHAR tempstr[1024]; - - SQL_CONN_VERIFY (::SQLDriverConnect (this->handle_, - 0, - (SQLCHAR *)connstr.c_str (), - connstr.length (), - tempstr, - sizeof (tempstr), - &result, - SQL_DRIVER_NOPROMPT), - this->handle_); - - // Pass control to the base class. - ::ADBC::Connection::connect (connstr); -} - -// -// disconnect -// -void Connection::disconnect (void) -{ - if (this->handle_ != SQL_NULL_HDBC && this->is_connected ()) - SQL_CONN_VERIFY (::SQLDisconnect (this->handle_), - this->handle_); - - // Pass control to the base class. - ::ADBC::Connection::disconnect (); -} - -// -// create_query -// -Query * Connection::create_query (void) -{ - Query * query = 0; - - ACE_NEW_THROW_EX (query, - Query (*this), - ACE_bad_alloc ()); - - return query; -} -} -} diff --git a/ADBC/adbc/ODBC/ODBC_Connection.h b/ADBC/adbc/ODBC/ODBC_Connection.h deleted file mode 100644 index 41eea1afd13..00000000000 --- a/ADBC/adbc/ODBC/ODBC_Connection.h +++ /dev/null @@ -1,93 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file ODBC_Connection.h - * - * $Id$ - * - * @author James H. Hill - */ -//============================================================================= - -#ifndef _ADBC_ODBC_CONNECTION_H_ -#define _ADBC_ODBC_CONNECTION_H_ - -#include "ODBC_Env.h" -#include "ODBC_Exception.h" -#include "ODBC_Query.h" -#include "adbc/Connection.h" - -namespace ADBC -{ -namespace ODBC -{ -// Forward decl. -class Query; - -/** - * @class Connection - * - * @brief Wrapper class for handling ODBC connection objects. - * - * This class provides a minimal set of operations used in ADBC for - * creating connection to a database using the ODBC protocol. Futhermore, - * this class is the only way to create an ODBC_Query object for performing - * SQL queries using the ODBC protocol. - */ -class ADBC_ODBC_Export Connection : - public ::ADBC::Connection -{ - // Friend decl. - friend class Query; - -public: - /// Constructor - Connection (Environment * env = Environment::instance ()); - - /// Destructor - virtual ~Connection (void); - - /** - * Establish connection of an ODBC database. The connection string - * is a full connection string that depends on the target database - * driver. For a complete list of ODBC connection string formats, - * please see the following location: - * - * http://www.connectionstrings.com - * - * @param[in] connstr The connection string. - */ - virtual void connect (const ACE_CString & connstr); - - /// Close the existing connection - virtual void disconnect (void); - - /** - * Create an ODBC query object. - * - * @return Pointer to the database query. - */ - virtual ::ADBC::ODBC::Query * create_query (void); - - /// Get the underlying handle to the connection. - HDBC handle (void) const; - -private: - /// Initialize the connection. - void init (void); - - /// Handle to the database connection - HDBC handle_; - - /// Pointer to the target environment. - Environment * env_; -}; -} -} - -#if defined (__ADBC_INLINE__) -#include "ODBC_Connection.inl" -#endif - -#endif // !defined _ADBC_ODBC_CONNECTION_H_ diff --git a/ADBC/adbc/ODBC/ODBC_Connection.inl b/ADBC/adbc/ODBC/ODBC_Connection.inl deleted file mode 100644 index 2c36c758772..00000000000 --- a/ADBC/adbc/ODBC/ODBC_Connection.inl +++ /dev/null @@ -1,28 +0,0 @@ -// $Id$ - -namespace ADBC -{ -namespace ODBC -{ -// -// Connection -// -ADBC_INLINE -Connection::Connection (Environment * env) -: handle_ (SQL_NULL_HANDLE), - env_ (env) -{ - this->init (); -} - -// -// handle -// -ADBC_INLINE -HDBC Connection::handle (void) const -{ - return this->handle_; -} - -} -} diff --git a/ADBC/adbc/ODBC/ODBC_Env.cpp b/ADBC/adbc/ODBC/ODBC_Env.cpp deleted file mode 100644 index 496f96eb7c7..00000000000 --- a/ADBC/adbc/ODBC/ODBC_Env.cpp +++ /dev/null @@ -1,114 +0,0 @@ -// $Id$ - -#include "ODBC_Env.h" - -#if !defined (__ADBC_INLINE__) -#include "ODBC_Env.inl" -#endif - -#include "ODBC_Exception.h" - -namespace ADBC -{ -namespace ODBC -{ -// -// delete_singleton_env_ -// -bool Environment::delete_singleton_env_ = false; - -// -// singleton_env_ -// -Environment * Environment::singleton_env_ = 0; - -// -// ~Environment -// -Environment::~Environment (void) -{ - if (this->handle_ != SQL_NULL_HANDLE) - ::SQLFreeHandle (SQL_HANDLE_ENV, this->handle_); -} - -// -// init -// -void Environment::init (void) -{ - // Allocate environment handle. Eventually we would like to be - // able to attach to user-defined environments. - SQL_VERIFY (::SQLAllocHandle (SQL_HANDLE_ENV, - SQL_NULL_HANDLE, - &this->handle_), - Exception ("failed to allocate environment handle")); - - // Set the version of ODBC. Right now we only support ODBC 3.x - SQL_ENV_VERIFY (::SQLSetEnvAttr (this->handle_, - SQL_ATTR_ODBC_VERSION, - (void *)SQL_OV_ODBC3, - 0), - this->handle_); -} - -// -// instance -// -Environment * Environment::instance (Environment * new_env) -{ - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, - *ACE_Static_Object_Lock::instance (), 0)); - - Environment * old_env = Environment::singleton_env_; - - // We can't safely delete it since we don't know who created it! - Environment::delete_singleton_env_ = false; - Environment::singleton_env_ = new_env; - - return old_env; -} - -// -// instance -// -Environment * Environment::instance (void) -{ - if (Environment::singleton_env_ == 0) - { - // Perform Double-Checked Locking Optimization. - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, - *ACE_Static_Object_Lock::instance (), 0)); - - if (Environment::singleton_env_ == 0) - { - ACE_NEW_RETURN (Environment::singleton_env_, - Environment (), - 0); - - Environment::delete_singleton_env_ = true; - } - } - - return Environment::singleton_env_; -} - -// -// close_singleton -// -void Environment::close_singleton (void) -{ - ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, - *ACE_Static_Object_Lock::instance ())); - - if (Environment::singleton_env_) - { - // Delete the existing environment. - delete Environment::singleton_env_; - - Environment::singleton_env_ = 0; - Environment::delete_singleton_env_ = false; - } -} - -} -} diff --git a/ADBC/adbc/ODBC/ODBC_Env.h b/ADBC/adbc/ODBC/ODBC_Env.h deleted file mode 100644 index 6c25d1eb70c..00000000000 --- a/ADBC/adbc/ODBC/ODBC_Env.h +++ /dev/null @@ -1,72 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file ODBC_Env.h - * - * $Id$ - * - * @author James H. Hill - */ -//============================================================================= - -#ifndef _ADBC_ODBC_ENV_H_ -#define _ADBC_ODBC_ENV_H_ - -#include "ace/Singleton.h" -#include "ace/Thread_Mutex.h" -#include "ODBC.h" - -namespace ADBC -{ -namespace ODBC -{ -/** - * @class Environment - * - * Environment for an existing ODBC connection. - */ -class ADBC_ODBC_Export Environment -{ -public: - /// Default constructor. - Environment (void); - - /// Destructor. - ~Environment (void); - - /// Get the underlying environment handle. - HENV handle (void) const; - - /// Get pointer to a process-wide Environment. - static Environment *instance (void); - - /// Set pointer to a process-wide Environment and return - /// existing pointer. - static Environment *instance (Environment * env); - - /// Delete the dynamically allocated Singleton - static void close_singleton (void); - -private: - /// Initialize the environment. - void init (void); - - /// Handle to the environment. - HENV handle_; - - /// Pointer to a process-wide ACE_Thread_Manager. - static Environment * singleton_env_; - - /// Must delete the thr_mgr_ if true. - static bool delete_singleton_env_; -}; - -} -} - -#if defined (__ADBC_INLINE__) -#include "ODBC_Env.inl" -#endif - -#endif // !defined _ADBC_ODBC_ENV_H_ diff --git a/ADBC/adbc/ODBC/ODBC_Env.inl b/ADBC/adbc/ODBC/ODBC_Env.inl deleted file mode 100644 index d90a5a9da34..00000000000 --- a/ADBC/adbc/ODBC/ODBC_Env.inl +++ /dev/null @@ -1,28 +0,0 @@ -// -*- C++ -*- -// $Id$ - -namespace ADBC -{ -namespace ODBC -{ -// -// Environment -// -ADBC_INLINE -Environment::Environment (void) -: handle_ (SQL_NULL_HANDLE) -{ - this->init (); -} - -// -// handle -// -ADBC_INLINE -HENV Environment::handle (void) const -{ - return this->handle_; -} - -} -} diff --git a/ADBC/adbc/ODBC/ODBC_Exception.cpp b/ADBC/adbc/ODBC/ODBC_Exception.cpp deleted file mode 100644 index 40e1c7baaf8..00000000000 --- a/ADBC/adbc/ODBC/ODBC_Exception.cpp +++ /dev/null @@ -1,47 +0,0 @@ -// $Id$ - -#include "ODBC_Exception.h" - -#if !defined (__ADBC_INLINE__) -#include "ODBC_Exception.inl" -#endif - -namespace ADBC -{ -namespace ODBC -{ -// -// Exception -// -Exception::Exception (SQLHANDLE handle, SQLSMALLINT type) -{ - static char message[256], state[6]; - SQLSMALLINT actual; - - SQLRETURN retval = ::SQLGetDiagRec (type, - handle, - 1, - (SQLCHAR *)state, - &this->native_, - (SQLCHAR *)message, - sizeof (message), - &actual); - - if (SQL_SUCCEED (retval)) - { - // We need to make sure the code is NULL-terminated - // before continuing. - state[5] = 0; - - // Store the information. - this->state_ = state; - this->message_ = message; - } - else - { - this->state_ = "00000"; - this->message_ = "failed to get ODBC exception"; - } -} -} -} diff --git a/ADBC/adbc/ODBC/ODBC_Exception.h b/ADBC/adbc/ODBC/ODBC_Exception.h deleted file mode 100644 index 287418724c9..00000000000 --- a/ADBC/adbc/ODBC/ODBC_Exception.h +++ /dev/null @@ -1,74 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Exception.h - * - * $Id$ - * - * @author James H. Hill - */ -//============================================================================= - -#ifndef _ADBC_ODBC_EXCEPTION_H_ -#define _ADBC_ODBC_EXCEPTION_H_ - -#include "adbc/Exception.h" -#include "ODBC.h" - -namespace ADBC -{ -namespace ODBC -{ -/** - * @class Exception - * - * @brief Base class for all ODBC exception classes. - */ -class ADBC_ODBC_Export Exception : public ::ADBC::Exception -{ -public: - /// Default constructor. - Exception (void); - - /** - * Initializing constructor. - * - * @param[in] handle Faulting ODBC handle. - * @param[in] type Type of handle. - */ - Exception (SQLHANDLE handle, SQLSMALLINT type); - - /** - * Initializing constructor. - * - * @param[in] message Set the error message. - */ - Exception (const char * message); - - /// Default destructor. - virtual ~Exception (void); -}; -} -} - -#define SQL_ENV_VERIFY(op, handle) \ - SQL_VERIFY (op, ::ADBC::ODBC::Exception (handle, SQL_HANDLE_ENV)) - -/// Exception for an ODBC connection \a handle. -#define SQL_CONN_VERIFY(op, handle) \ - SQL_VERIFY (op, ::ADBC::ODBC::Exception (handle, SQL_HANDLE_DBC)) - -/// Exception for an ODBC statement \a handle. -#define SQL_STMT_VERIFY(op, handle) \ - SQL_VERIFY (op, ::ADBC::ODBC::Exception (handle, SQL_HANDLE_STMT)) - -/// Exception for an ODBC description \a handle. -#define SQL_DESC_VERIFY(op, handle) \ - SQL_VERIFY (op, ::ADBC::ODBC::Exception (handle, SQL_HANDLE_DESC)) - -#if defined (__ADBC_INLINE__) -#include "ODBC_Exception.inl" -#endif - -#endif // !defined _ADBC_ODBC_EXCEPTION_H_ diff --git a/ADBC/adbc/ODBC/ODBC_Exception.inl b/ADBC/adbc/ODBC/ODBC_Exception.inl deleted file mode 100644 index c022c5997b2..00000000000 --- a/ADBC/adbc/ODBC/ODBC_Exception.inl +++ /dev/null @@ -1,37 +0,0 @@ -// -*- C++ -*- -// $Id$ - -namespace ADBC -{ -namespace ODBC -{ -// -// Exception -// -ADBC_INLINE -Exception::Exception (void) -: ::ADBC::Exception ("unknown ODBC exception has occurred") -{ - -} - -// -// Exception -// -ADBC_INLINE -Exception::Exception (const char * message) -: ::ADBC::Exception (message) -{ - -} - -// -// ~Exception -// -ADBC_INLINE -Exception::~Exception (void) -{ - -} -} -} diff --git a/ADBC/adbc/ODBC/ODBC_Parameter.cpp b/ADBC/adbc/ODBC/ODBC_Parameter.cpp deleted file mode 100644 index 324f4d84d1c..00000000000 --- a/ADBC/adbc/ODBC/ODBC_Parameter.cpp +++ /dev/null @@ -1,97 +0,0 @@ -// $Id$ - -#include "ODBC_Parameter.h" - -#if !defined (__ADBC_INLINE__) -#include "ODBC_Parameter.inl" -#endif - -#include "ODBC_Query.h" -#include "ODBC_Types.h" - -namespace ADBC -{ -namespace ODBC -{ -// -// operator = -// -const Parameter & Parameter::operator = (const Parameter & rhs) -{ - if (this == &rhs) - return *this; - - this->query_ = rhs.query_; - this->index_ = rhs.index_; - - return *this; -} - -// -// bind -// -void Parameter::bind (Date_Time * dt) -{ - this->bind_i (SQL_PARAM_INPUT, - SQL_C_TYPE_TIMESTAMP, - SQL_TYPE_TIMESTAMP, - 0, - 0, - dt->value (), - 0); - - ::ADBC::Parameter::bind (dt); -} - -// -// bind -// -void Parameter::bind (::ADBC::Date_Time * dt) -{ - Date_Time * date_time = dynamic_cast <Date_Time *> (dt); - - if (0 == date_time) - throw ::ADBC::ODBC::Exception ("object is not of type ::ADBC::ODBC::Date_Time"); - - this->bind (date_time); -} - -// -// -// bind_i -// -void Parameter::bind_i (SQLSMALLINT iotype, - SQLSMALLINT valuetype, - SQLSMALLINT paramtype, - SQLUINTEGER columnsize, - SQLSMALLINT decimals, - SQLPOINTER valueptr, - SQLINTEGER buffer_length) -{ - // Initialize the intptr_ data member. - switch (valuetype) - { - case SQL_C_CHAR: - this->intptr_ = buffer_length == 0 ? SQL_NTS : buffer_length; - break; - - default: - this->intptr_ = 0; - }; - - // Bind the parameter for the statement. - SQL_STMT_VERIFY (::SQLBindParameter (this->query_->handle (), - this->index_ + 1, - iotype, - valuetype, - paramtype, - columnsize, - decimals, - valueptr, - buffer_length, - &this->intptr_), - this->query_->handle ()); -} - -} -} diff --git a/ADBC/adbc/ODBC/ODBC_Parameter.h b/ADBC/adbc/ODBC/ODBC_Parameter.h deleted file mode 100644 index dd0188b97ac..00000000000 --- a/ADBC/adbc/ODBC/ODBC_Parameter.h +++ /dev/null @@ -1,113 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file ODBC_Parameter.h - * - * $Id$ - * - * @author James H. Hill - */ -//============================================================================= - -#ifndef _ODBC_PARAMETER_H_ -#define _ODBC_PARAMETER_H_ - -#include "adbc/Parameter.h" -#include "ODBC_Exception.h" -#include "ODBC_Types.h" - -namespace ADBC -{ -namespace ODBC -{ -// Forward decl. -class Query; - -// Forward decl. -class Parameter_List; - -/** - * @class Parameter - * - * ODBC implementation of the ADBC_DB_Parameter abstract type. - */ -class ADBC_ODBC_Export Parameter : public ::ADBC::Parameter -{ - // Friend decl. - friend class Parameter_List; - -public: - /// Default constructor - Parameter (void); - - /** - * Copy constructor. - * - * @param[in] p Source parameter. - */ - Parameter (const Parameter & p); - - /// Destructor. - virtual ~Parameter (void); - - virtual void null (void); - - virtual void bind (char * buffer, size_t bufsize); - - virtual void bind (const char * buffer, size_t bufsize); - - virtual void bind (ACE_INT16 * buffer); - - virtual void bind (ACE_UINT16 * buffer); - - virtual void bind (ACE_INT32 * buffer); - - virtual void bind (ACE_UINT32 * buffer); - - virtual void bind (ACE_UINT64 * value); - - virtual void bind (ACE_INT64 * value); - - virtual void bind (float * value); - - virtual void bind (double * value); - - void bind (Date_Time * dt); - virtual void bind (::ADBC::Date_Time * dt); - - const Parameter & operator = (const Parameter & rhs); - - /** - * Get the current length/size of the parameter. - * - * @return The length/size of the parameter. - */ - virtual long length (void); - - /// Test if the parameter is NULL - virtual bool is_null (void) const; - -private: - /// Helper method for binding SQL parameters. - void bind_i (SQLSMALLINT iotype, - SQLSMALLINT valuetype, - SQLSMALLINT paramtype, - SQLUINTEGER columnsize, - SQLSMALLINT decimals, - SQLPOINTER valueptr, - SQLINTEGER buffer_length); - - /// Handle to the ODBC statement. - const Query * query_; - - /// Size of the parameter buffer. - SQLINTEGER intptr_; - - /// Pointer to allocated memory. - void * buffer_; -}; -} -} - -#endif // !defined _ODBC_PARAMETER_H_ diff --git a/ADBC/adbc/ODBC/ODBC_Parameter.inl b/ADBC/adbc/ODBC/ODBC_Parameter.inl deleted file mode 100644 index 7eeb019c3ed..00000000000 --- a/ADBC/adbc/ODBC/ODBC_Parameter.inl +++ /dev/null @@ -1,235 +0,0 @@ -// -*- C++ -*- -// $Id$ - -namespace ADBC -{ -namespace ODBC -{ -// -// ODBC_Parameter -// -ADBC_INLINE -Parameter::Parameter (void) -: query_ (0) -{ - -} - -// -// ODBC_Parameter -// -ADBC_INLINE -Parameter::Parameter (const Parameter & p) -: ADBC::Parameter (p), - query_ (p.query_) -{ - new Parameter (); -} - -// -// ~ODBC_Parameter -// -ADBC_INLINE -Parameter::~Parameter (void) -{ - -} - -// -// null -// -ADBC_INLINE -void Parameter::null (void) -{ - this->intptr_ = SQL_NULL_DATA; -} - -// -// is_null -// -ADBC_INLINE -bool Parameter::is_null (void) const -{ - return this->intptr_ == SQL_NULL_DATA; -} - -// -// length -// -ADBC_INLINE -long Parameter::length (void) -{ - return this->intptr_; -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (const char * buffer, size_t bufsize) -{ - this->bind_i (SQL_PARAM_INPUT, - SQL_C_CHAR, - SQL_CHAR, - 0, - 0, - (SQLPOINTER)buffer, - bufsize); - - ::ADBC::Parameter::bind (buffer, bufsize); -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (char * buffer, size_t bufsize) -{ - this->bind_i (SQL_PARAM_INPUT, - SQL_C_CHAR, - SQL_CHAR, - 0, - 0, - buffer, - bufsize); - - ::ADBC::Parameter::bind (buffer, bufsize); -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (ACE_INT16 * buffer) -{ - this->bind_i (SQL_PARAM_INPUT, - SQL_C_SSHORT, - SQL_SMALLINT, - 0, - 0, - buffer, - 0); - - ::ADBC::Parameter::bind (buffer); -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (ACE_UINT16 * buffer) -{ - this->bind_i (SQL_PARAM_INPUT, - SQL_C_USHORT, - SQL_SMALLINT, - 0, - 0, - &buffer, - 0); - - ::ADBC::Parameter::bind (buffer); -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (ACE_INT32 * buffer) -{ - this->bind_i (SQL_PARAM_INPUT, - SQL_C_SLONG, - SQL_INTEGER, - 0, - 0, - &buffer, - 0); - - ::ADBC::Parameter::bind (buffer); -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (ACE_UINT32 * buffer) -{ - this->bind_i (SQL_PARAM_INPUT, - SQL_C_ULONG, - SQL_INTEGER, - 0, - 0, - &buffer, - 0); - - ::ADBC::Parameter::bind (buffer); -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (ACE_INT64 * buffer) -{ - this->bind_i (SQL_PARAM_INPUT, - SQL_C_UBIGINT, - SQL_BIGINT, - 0, - 0, - &buffer, - 0); - - ::ADBC::Parameter::bind (buffer); -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (ACE_UINT64 * buffer) -{ - this->bind_i (SQL_PARAM_INPUT, - SQL_C_SBIGINT, - SQL_BIGINT, - 0, - 0, - &buffer, - 0); - - ::ADBC::Parameter::bind (buffer); -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (float * buffer) -{ - this->bind_i (SQL_PARAM_INPUT, - SQL_C_FLOAT, - SQL_REAL, - 0, - 0, - &buffer, - 0); - - ::ADBC::Parameter::bind (buffer); -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (double * buffer) -{ - this->bind_i (SQL_PARAM_INPUT, - SQL_C_DOUBLE, - SQL_DOUBLE, - 0, - 0, - &buffer, - 0); - - ::ADBC::Parameter::bind (buffer); -} -} -} diff --git a/ADBC/adbc/ODBC/ODBC_Parameter_List.cpp b/ADBC/adbc/ODBC/ODBC_Parameter_List.cpp deleted file mode 100644 index 97de42dac6c..00000000000 --- a/ADBC/adbc/ODBC/ODBC_Parameter_List.cpp +++ /dev/null @@ -1,38 +0,0 @@ -// $Id$ - -#include "ODBC_Parameter_List.h" - -#if !defined (__ADBC_INLINE__) -#include "ODBC_Parameter_List.inl" -#endif - -#include "ODBC_Query.h" - -namespace ADBC -{ -namespace ODBC -{ -// -// update -// -void Parameter_List::update (void) -{ - // Get the number of parameters in the prepared statement. - SQLSMALLINT param_count; - - SQL_STMT_VERIFY (::SQLNumParams (this->query_.handle (), ¶m_count), - this->query_.handle ()); - - // If this is the first prepared statement on this handle - // then we need to allocate a new parameter list. - this->params_.size (param_count); - - for (SQLSMALLINT i = 0; i < param_count; ++ i) - { - this->params_[i].query_ = &this->query_; - this->params_[i].index_ = i; - } -} - -} -} diff --git a/ADBC/adbc/ODBC/ODBC_Parameter_List.h b/ADBC/adbc/ODBC/ODBC_Parameter_List.h deleted file mode 100644 index 1f8a248ac7c..00000000000 --- a/ADBC/adbc/ODBC/ODBC_Parameter_List.h +++ /dev/null @@ -1,84 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file ODBC_Parameter_List.h - * - * $Id$ - * - * @author James H. Hill - */ -//============================================================================= - -#ifndef _ADBC_ODBC_PARAMETER_LIST_H_ -#define _ADBC_ODBC_PARAMETER_LIST_H_ - -#include "ace/Array.h" -#include "adbc/Parameter_List.h" -#include "ODBC_Parameter.h" - -// Forward decl. -class ODBC_Query; - -namespace ADBC -{ -namespace ODBC -{ -/** - * @class ODBC_Parameter_List - * - * Container class for ODBC_Parameter objects. - */ -class ADBC_ODBC_Export Parameter_List : - public ::ADBC::Parameter_List -{ - // Friend decl. - friend class Query; - -public: - /** - * Initializing constructor. - */ - Parameter_List (const Query & query); - - /// Destructor. - virtual ~Parameter_List (void); - - /** - * Get the size of the parameter list. - * - * @return Size of the parmameter list. - */ - virtual size_t size (void) const; - - /** - * Get an existing parameter. - * - * @param[in] index Index of the parameter. - * @param[out] param Pointer to the parameter. - */ - virtual const Parameter & operator [] (size_t index) const; - - virtual Parameter & operator [] (size_t index); - - /// Update the number of parameters for parent query. - void update (void); - -private: - /// Helper function to initialize a parameter. - void init (Parameter & p, size_t index); - - /// Type definition of the list of parameters. - ACE_Array <Parameter> params_; - - /// The parent of the query. - const Query & query_; -}; -} -} - -#if defined (__ADBC_INLINE__) -#include "ODBC_Parameter_List.inl" -#endif - -#endif // !defined _ODBC_PARAMETER_LIST_H_ diff --git a/ADBC/adbc/ODBC/ODBC_Parameter_List.inl b/ADBC/adbc/ODBC/ODBC_Parameter_List.inl deleted file mode 100644 index 3225d75c75f..00000000000 --- a/ADBC/adbc/ODBC/ODBC_Parameter_List.inl +++ /dev/null @@ -1,54 +0,0 @@ -// $Id$ - -namespace ADBC -{ -namespace ODBC -{ -// -// Parameter_List -// -ADBC_INLINE -Parameter_List::Parameter_List (const Query & query) -: query_ (query) -{ - -} - -// -// ~Parameter_List -// -ADBC_INLINE -Parameter_List::~Parameter_List (void) -{ - -} - -// -// size -// -ADBC_INLINE -size_t Parameter_List::size (void) const -{ - return this->size (); -} - -// -// operator [] -// -ADBC_INLINE -const Parameter & Parameter_List::operator [] (size_t index) const -{ - return this->params_[index]; -} - -// -// operator [] -// -ADBC_INLINE -Parameter & Parameter_List::operator [] (size_t index) -{ - return this->params_[index]; -} - -} -} diff --git a/ADBC/adbc/ODBC/ODBC_Query.cpp b/ADBC/adbc/ODBC/ODBC_Query.cpp deleted file mode 100644 index 4c437edfa29..00000000000 --- a/ADBC/adbc/ODBC/ODBC_Query.cpp +++ /dev/null @@ -1,173 +0,0 @@ -// $Id$ - -#include "ODBC_Query.h" - -#if !defined (__ADBC_INLINE__) -#include "ODBC_Query.inl" -#endif - -#include "ODBC_Connection.h" -#include "ODBC_Record.h" -#include "ODBC_Parameter.h" -#include "ODBC_Parameter_List.h" - -namespace ADBC -{ -namespace ODBC -{ -// -// ~Query -// -Query::~Query (void) -{ - if (this->handle_ != SQL_NULL_HSTMT) - ::SQLFreeHandle (SQL_HANDLE_STMT, this->handle_); -} - -// -// init -// -void Query::init (void) -{ - SQL_CONN_VERIFY (::SQLAllocHandle (SQL_HANDLE_STMT, - this->parent_.handle (), - &this->handle_), - this->parent_.handle ()); - - // Set the attributes for the statement. We need to find a - // better method for setting attributes. Maybe we can overload - // the operator []. - SQL_STMT_VERIFY (::SQLSetStmtAttr (this->handle_, - SQL_ATTR_CONCURRENCY, - (SQLPOINTER) SQL_CONCUR_ROWVER, - 0), - this->handle_); - - SQL_STMT_VERIFY (::SQLSetStmtAttr (this->handle_, - SQL_ATTR_CURSOR_TYPE, - (SQLPOINTER) SQL_CURSOR_KEYSET_DRIVEN, - 0), - this->handle_); -} - -// -// prepare -// -void Query::prepare (const char * stmt) -{ - // Prepare the SQL statement. - SQL_STMT_VERIFY (::SQLPrepare (this->handle_, - (SQLCHAR *) stmt, - SQL_NTS), - this->handle_); - - /// Update the parameters for this statement. - this->params_.update (); - this->is_prepared_ = true; -} - -// -// execute_no_record -// -void Query::execute_no_record (void) -{ - if (!this->is_prepared_) - throw ::ADBC::ODBC::Exception ("statement is not prepared"); - - SQL_STMT_VERIFY (::SQLExecute (this->handle_), - this->handle_); - - // There is no cursor associated with non-record statements. - this->cursor_open_ = false; -} - -// -// execute_no_record -// -void Query::execute_no_record (const char * query) -{ - SQL_STMT_VERIFY (::SQLExecDirect (this->handle_, (SQLCHAR *)query, SQL_NTS), - this->handle_); - - // The statement is not prepared, and there is no cursor - // associated with non-record statements. - this->is_prepared_ = false; - this->cursor_open_ = false; -} - -// -// last_insert_id -// -long Query::last_insert_id (void) -{ - // Execute the statement and move to the first and only row in - // the result set. There has to be some way to get the last insert - // id without having to execute an SQL statement. - Query temp_query (this->parent_); - Record & record = temp_query.execute ("SELECT LAST_INSERT_ID()"); - - // Get the data returned from the statement. - long last_id = 0; - record.get_data (1, last_id); - - return last_id; -} - -// -// cancel -// -void Query::cancel (void) -{ - SQL_STMT_VERIFY (::SQLCancel (this->handle_), - this->handle_); -} - -// -// execute -// -Record & Query::execute (const char * query) -{ - // Execute the query and set the <cursor_open_> to open. - this->execute_no_record (query); - - // Move to the first record, if available. - this->record_.reset (); - return this->record_; -} - -// -// execute -// -Record & Query::execute (void) -{ - // Execute the prepared SQL statement. - this->execute_no_record (); - - // Move to the first record, if available. - this->record_.reset (); - return this->record_; -} - -// -// reset -// -void Query::reset (void) -{ - SQL_STMT_VERIFY (::SQLFreeStmt (this->handle_, SQL_CLOSE), - this->handle_); -} - -// -// count -// -size_t Query::count (void) const -{ - SQLINTEGER count; - SQL_STMT_VERIFY (::SQLRowCount (this->handle_, &count), - this->handle_); - - return count; -} - -} -} diff --git a/ADBC/adbc/ODBC/ODBC_Query.h b/ADBC/adbc/ODBC/ODBC_Query.h deleted file mode 100644 index d7af509b16d..00000000000 --- a/ADBC/adbc/ODBC/ODBC_Query.h +++ /dev/null @@ -1,142 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file ODBC_Query.h - * - * $Id$ - * - * @author James H. Hill <hillj@isis.vanderbilt.edu> - */ -//============================================================================= - -#ifndef _ADBC_ODBC_QUERY_H_ -#define _ADBC_ODBC_QUERY_H_ - -#include "adbc/Query.h" -#include "ODBC_Parameter_List.h" -#include "ODBC_Record.h" - -namespace ADBC -{ -namespace ODBC -{ -// Forward decl. -class Connection; - -/** - * @class ODBC_Query - * - * @brief Wrapper class for using ODBC statement handles. - * - * This class contains common operations used by ADBC for executing - * SQL statements using ODBC. One cannot instantiate an object of this - * class alone. Instead, it can only be created by an Connection - * object. This prevents the creation of dangling ODBC_Query objects - * (those not associated with a connection). - */ -class ADBC_ODBC_Export Query : public ::ADBC::Query -{ -public: - /** - * Initializing constructor. - * - * @param[in] conn Parent database connection. - */ - Query (Connection & conn); - - /// Destructor. - virtual ~Query (void); - - /** - * Prepare an SQL query for execution. - * - * @param[in] query NULL-terminate SQL query string. - */ - virtual void prepare (const char * query); - - /// Execute a prepare query. - virtual void execute_no_record (void); - - /** - * Execute a query. - * - * @param[in] query Query to execute. - */ - virtual void execute_no_record (const char * query); - - /** - * Get the last insert id. This method is only value if an - * insert was made to a table with an \a auto_increment field. - * - * @return The last id inserted. - */ - virtual long last_insert_id (void); - - /// Cancel the current operation. - virtual void cancel (void); - - /** - * Execute a query. This method is useful with the query is known - * to return results that will consist of multiple data rows, and - * columns. The client has the responsibility of delete the record - * once its done with it. - * - * @return Pointer to a record. - */ - virtual Record & execute (const char * query); - - /** - * Execute a prepared query. This method is useful with the query is - * known to return results that will consist of multiple data rows, - * and columns. The client has the responsibility of delete the record - * once its done with it. - * - * @return Pointer to a record. - */ - virtual Record & execute (void); - - /// Get a read-only list of the parameters. - virtual const Parameter_List & parameters (void) const; - - /// Get a list of the parameters. - virtual Parameter_List & parameters (void); - - /// Reset the query string. - void reset (void); - - virtual size_t count (void) const; - - /// Get the handle to the underlying statement. - HSTMT handle (void) const; - -private: - /// Initialize the query. - void init (void); - - /// Parent of the query. - Connection & parent_; - - /// handle to the ODBC statement - HSTMT handle_; - - /// The state of the cursor. - bool cursor_open_; - - /// The query is prepared. - bool is_prepared_; - - /// Pointer to the parameters for the method. - Parameter_List params_; - - /// The record associated with this query. - Record record_; -}; -} -} - -#if defined (__ADBC_INLINE__) -#include "ODBC_Query.inl" -#endif - -#endif // !defined _ADBC_ODBC_QUERY_H_ diff --git a/ADBC/adbc/ODBC/ODBC_Query.inl b/ADBC/adbc/ODBC/ODBC_Query.inl deleted file mode 100644 index 3ee92e0c8aa..00000000000 --- a/ADBC/adbc/ODBC/ODBC_Query.inl +++ /dev/null @@ -1,50 +0,0 @@ -// $Id$ - -namespace ADBC -{ -namespace ODBC -{ -// -// Query -// -ADBC_INLINE -Query::Query (Connection & conn) -: parent_ (conn), - handle_ (SQL_NULL_HSTMT), - cursor_open_ (false), - is_prepared_ (false), - params_ (*this), - record_ (*this) -{ - this->init (); -} - -// -// parameters -// -ADBC_INLINE -Parameter_List & Query::parameters (void) -{ - return this->params_; -} - -// -// parameters -// -ADBC_INLINE -const Parameter_List & Query::parameters (void) const -{ - return this->params_; -} - -// -// handle -// -ADBC_INLINE -HSTMT Query::handle (void) const -{ - return this->handle_; -} - -} -} diff --git a/ADBC/adbc/ODBC/ODBC_Record.cpp b/ADBC/adbc/ODBC/ODBC_Record.cpp deleted file mode 100644 index b8b22db5101..00000000000 --- a/ADBC/adbc/ODBC/ODBC_Record.cpp +++ /dev/null @@ -1,85 +0,0 @@ -// $Id$ - -#include "ODBC_Record.h" - -#if !defined (__ADBC_INLINE__) -#include "ODBC_Record.inl" -#endif - -#include "ODBC_Query.h" -#include "ace/Date_Time.h" - -namespace ADBC -{ -namespace ODBC -{ -// -// reset -// -void Record::reset (void) -{ - // Move to the first record in the result set. - if (!SQL_SUCCEED (this->state_)) - this->state_ = ::SQLFetchScroll (this->query_.handle (), - SQL_FETCH_FIRST, - 0); - - if (this->state_ == SQL_ERROR || this->state_ == SQL_INVALID_HANDLE) - throw Exception (this->query_.handle (), SQL_HANDLE_STMT); -} - -// -// advance -// -void Record::advance (void) -{ - if (this->state_ != SQL_NO_DATA) - this->state_ = ::SQLFetch (this->query_.handle ()); - - if (this->state_ == SQL_ERROR || this->state_ == SQL_INVALID_HANDLE) - throw Exception (this->query_.handle (), SQL_HANDLE_STMT); -} - -// -// get_data -// -void Record::get_data (size_t column, ACE_Date_Time & datetime) -{ - SQL_TIMESTAMP_STRUCT timestamp; - - this->get_data_i (static_cast <SQLUSMALLINT> (column), - SQL_C_TYPE_TIMESTAMP, - ×tamp, - sizeof (SQL_TIMESTAMP_STRUCT), - 0); - - // Convert the <SQL_TIMESTAMP_STRUCT> to a <ACE_Time_Value>. - datetime.month (timestamp.month); - datetime.day (timestamp.day); - datetime.year (timestamp.year); - datetime.hour (timestamp.hour); - datetime.minute (timestamp.minute); - datetime.second (timestamp.second); - datetime.microsec (timestamp.fraction); -} - -// -// get_data_i -// -void Record::get_data_i (SQLUSMALLINT column, - SQLSMALLINT target_type, - SQLPOINTER target, - SQLINTEGER bufsize, - SQLINTEGER * result) -{ - SQL_STMT_VERIFY (::SQLGetData (this->query_.handle (), - column, - target_type, - target, - bufsize, - result), - this->query_.handle ()); -} - -} -} diff --git a/ADBC/adbc/ODBC/ODBC_Record.h b/ADBC/adbc/ODBC/ODBC_Record.h deleted file mode 100644 index 2f935aa2c76..00000000000 --- a/ADBC/adbc/ODBC/ODBC_Record.h +++ /dev/null @@ -1,103 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file ODBC_Record.h - * - * $Id$ - * - * @author James H. Hill - */ -//============================================================================= - -#ifndef _ADBC_ODBC_RECORD_H_ -#define _ADBC_ODBC_RECORD_H_ - -#include "adbc/Record.h" -#include "ODBC.h" - -namespace ADBC -{ -namespace ODBC -{ -// Forward decl. -class Query; - -/** - * @class ODBC_Record - * - * Implementation of the ::ADBC::Record for ODBC. - */ -class ADBC_ODBC_Export Record : public ::ADBC::Record -{ -public: - /** - * Initializing constructor. - * - * @param[in] handle Statement handle. - */ - Record (const Query & query); - - /// Destructor. - virtual ~Record (void); - - // Move to the next record. - virtual void advance (void); - - // Test if the iterator is done. - virtual bool done (void) const; - - virtual void reset (void); - - /** - * Get the number of columns in the result. - * - * @return Number of columns. - */ - virtual size_t columns (void) const; - - virtual void get_data (size_t column, char * buffer, size_t bufsize); - - virtual void get_data (size_t column, char & value); - - virtual void get_data (size_t column, unsigned char & value); - - virtual void get_data (size_t column, short & value); - - virtual void get_data (size_t column, unsigned short & value); - - virtual void get_data (size_t column, long & value); - - virtual void get_data (size_t column, unsigned long & value); - - virtual void get_data (size_t column, float & value); - - virtual void get_data (size_t column, double & value); - - virtual void get_data (size_t column, ACE_Date_Time & datetime); - -private: - /// Help method that wraps the SQLGetData method. - void get_data_i (SQLUSMALLINT column, - SQLSMALLINT target_type, - SQLPOINTER target, - SQLINTEGER bufsize, - SQLINTEGER * result); - - /// Parent of the record. - const Query & query_; - - /// Number of columns in the record set. - size_t columns_; - - /// State of the iterator. - SQLRETURN state_; -}; -} -} - -#if defined (__ADBC_INLINE__) -#include "ODBC_Record.inl" -#endif - -#endif // !defined _ADBC_ODBC_RECORD_H_ diff --git a/ADBC/adbc/ODBC/ODBC_Record.inl b/ADBC/adbc/ODBC/ODBC_Record.inl deleted file mode 100644 index a7a7ff5e220..00000000000 --- a/ADBC/adbc/ODBC/ODBC_Record.inl +++ /dev/null @@ -1,168 +0,0 @@ -// $Id$ - -namespace ADBC -{ -namespace ODBC -{ -// -// Record -// -ADBC_INLINE -Record::Record (const Query & query) -: query_ (query), - columns_ (0), - state_ (SQL_SUCCESS) -{ - -} - -// -// ~Record -// -ADBC_INLINE -Record::~Record (void) -{ - -} - - -// -// get_data -// -ADBC_INLINE -void Record:: -get_data (size_t column, char * buffer, size_t bufsize) -{ - this->get_data_i (static_cast <SQLUSMALLINT> (column), - SQL_C_CHAR, - buffer, - bufsize, - 0); -} - - -// -// get_data -// -ADBC_INLINE -void Record::get_data (size_t column, long & value) -{ - this->get_data_i (static_cast <SQLUSMALLINT> (column), - SQL_C_SLONG, - &value, - sizeof (long), - 0); -} - -// -// get_data -// -ADBC_INLINE -void Record::get_data (size_t column, unsigned long & value) -{ - this->get_data_i (static_cast <SQLUSMALLINT> (column), - SQL_C_ULONG, - &value, - sizeof (unsigned long), - 0); -} - -// -// get_data -// -ADBC_INLINE -void Record::get_data (size_t column, char & value) -{ - this->get_data_i (static_cast <SQLUSMALLINT> (column), - SQL_C_CHAR, - &value, - sizeof (char), - 0); -} - -// -// get_data -// -ADBC_INLINE -void Record::get_data (size_t column, unsigned char & value) -{ - this->get_data_i (static_cast <SQLUSMALLINT> (column), - SQL_C_CHAR, - &value, - sizeof (unsigned char), - 0); -} - -// -// get_data -// -ADBC_INLINE -void Record::get_data (size_t column, short & value) -{ - this->get_data_i (static_cast <SQLUSMALLINT> (column), - SQL_C_SHORT, - &value, - sizeof (short), - 0); -} - -// -// get_data -// -ADBC_INLINE -void Record::get_data (size_t column, unsigned short & value) -{ - this->get_data_i (static_cast <SQLUSMALLINT> (column), - SQL_C_USHORT, - &value, - sizeof (unsigned short), - 0); -} - -// -// get_data -// -ADBC_INLINE -void Record::get_data (size_t column, float & value) -{ - this->get_data_i (static_cast <SQLUSMALLINT> (column), - SQL_C_FLOAT, - &value, - sizeof (float), - 0); -} - - -// -// get_data -// -ADBC_INLINE -void Record::get_data (size_t column, double & value) -{ - this->get_data_i (static_cast <SQLUSMALLINT> (column), - SQL_C_DOUBLE, - &value, - sizeof (double), - 0); -} - -// -// columns -// -ADBC_INLINE -size_t Record::columns (void) const -{ - return this->columns_; -} - -// -// done -// -ADBC_INLINE -bool Record::done (void) const -{ - return this->state_ == SQL_NO_DATA; -} - -} -} diff --git a/ADBC/adbc/ODBC/ODBC_Types.cpp b/ADBC/adbc/ODBC/ODBC_Types.cpp deleted file mode 100644 index 3efad071cd0..00000000000 --- a/ADBC/adbc/ODBC/ODBC_Types.cpp +++ /dev/null @@ -1,50 +0,0 @@ -// $Id$ - -#include "ODBC_Types.h" - -#if !defined (__ADBC_INLINE__) -#include "ODBC_Types.inl" -#endif - -#include "ace/OS_NS_string.h" -#include "ace/Date_Time.h" - -namespace ADBC -{ -namespace ODBC -{ -// -// Date_Time -// -Date_Time::Date_Time (void) -{ - ACE_OS::memset (&this->datetime_, - 0, - sizeof (SQL_TIMESTAMP_STRUCT)); -} - -// -// set -// -void Date_Time::set (const ACE_Date_Time & datetime) -{ - this->month (datetime.month ()); - this->day (datetime.day ()); - this->year (datetime.year ()); - this->hour (datetime.hour ()); - this->minute (datetime.minute ()); - this->second (datetime.second ()); - this->fraction (datetime.microsec ()); -} - -// -// set -// -void Date_Time::set (const Date_Time & datetime) -{ - ACE_OS::memcpy (&this->datetime_, - &datetime.datetime_, - sizeof (SQL_TIMESTAMP_STRUCT)); -} -} -} diff --git a/ADBC/adbc/ODBC/ODBC_Types.h b/ADBC/adbc/ODBC/ODBC_Types.h deleted file mode 100644 index df4b4d54545..00000000000 --- a/ADBC/adbc/ODBC/ODBC_Types.h +++ /dev/null @@ -1,85 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file ODBC_Types.h - * - * $Id$ - * - * @author James H. Hill - */ -//============================================================================= - -#ifndef _ADBC_ODBC_TYPES_H_ -#define _ADBC_ODBC_TYPES_H_ - -#include "ODBC.h" -#include "adbc/Types.h" - -// Forward decl. -class ACE_Date_Time; - -namespace ADBC -{ -namespace ODBC -{ -/** - * @class Date_Time - * - * ODBC implementation of the ::ADBC::Date_Time class. - */ -class ADBC_ODBC_Export Date_Time : public ::ADBC::Date_Time -{ -public: - /// Default constructor. - Date_Time (void); - - /// Destructor. - virtual ~Date_Time (void); - - long month (void) const; - - void month (long); - - long day (void) const; - - void day (long); - - long year (void) const; - - void year (long); - - long hour (void) const; - - void hour (long); - - long minute (void) const; - - void minute (long); - - long second (void) const; - - void second (long); - - long fraction (void) const; - - void fraction (long); - - void * value (void); - - void set (const ACE_Date_Time & datetime); - - void set (const Date_Time & datetime); - -private: - /// SQL timestamp data value. - SQL_TIMESTAMP_STRUCT datetime_; -}; -} -} - -#if defined (__ADBC_INLINE__) -#include "ODBC_Types.inl" -#endif - -#endif // !defined _ADBC_ODBC_TYPES_H_ diff --git a/ADBC/adbc/ODBC/ODBC_Types.inl b/ADBC/adbc/ODBC/ODBC_Types.inl deleted file mode 100644 index 8d07ad1b434..00000000000 --- a/ADBC/adbc/ODBC/ODBC_Types.inl +++ /dev/null @@ -1,152 +0,0 @@ -// $Id$ - -namespace ADBC -{ -namespace ODBC -{ -// -// ~Date_Time -// -ADBC_INLINE -Date_Time::~Date_Time (void) -{ - -} - -// -// month -// -ADBC_INLINE -void Date_Time::month (long value) -{ - this->datetime_.month = static_cast <SQLUSMALLINT> (value); -} - -// -// month -// -ADBC_INLINE -long Date_Time::month (void) const -{ - return this->datetime_.month; -} - -// -// day -// -ADBC_INLINE -void Date_Time::day (long value) -{ - this->datetime_.day = static_cast <SQLUSMALLINT> (value); -} - -// -// day -// -ADBC_INLINE -long Date_Time::day (void) const -{ - return this->datetime_.day; -} - -// -// year -// -ADBC_INLINE -void Date_Time::year (long value) -{ - this->datetime_.year = static_cast <SQLUSMALLINT> (value); -} - -// -// year -// -ADBC_INLINE -long Date_Time::year (void) const -{ - return this->datetime_.year; -} - -// -// hour -// -ADBC_INLINE -void Date_Time::hour (long value) -{ - this->datetime_.hour = static_cast <SQLSMALLINT> (value); -} - -// -// hour -// -ADBC_INLINE -long Date_Time::hour (void) const -{ - return this->datetime_.hour; -} - -// -// minute -// -ADBC_INLINE -void Date_Time::minute (long value) -{ - this->datetime_.minute = static_cast <SQLUSMALLINT> (value); -} - -// -// minute -// -ADBC_INLINE -long Date_Time::minute (void) const -{ - return this->datetime_.minute; -} - -// -// second -// -ADBC_INLINE -void Date_Time::second (long value) -{ - this->datetime_.second = static_cast <SQLUSMALLINT> (value); -} - -// -// second -// -ADBC_INLINE -long Date_Time::second (void) const -{ - return this->datetime_.second; -} - -// -// fraction -// -ADBC_INLINE -void Date_Time::fraction (long value) -{ - this->datetime_.fraction = static_cast <SQLUSMALLINT> (value); -} - -// -// fraction -// -ADBC_INLINE -long Date_Time::fraction (void) const -{ - return this->datetime_.fraction; -} - -// -// fraction -// -ADBC_INLINE -void * Date_Time::value (void) -{ - return &this->datetime_; -} - -} -} diff --git a/ADBC/adbc/ODBC/ODBC_export.h b/ADBC/adbc/ODBC/ODBC_export.h deleted file mode 100644 index 4231105e7b0..00000000000 --- a/ADBC/adbc/ODBC/ODBC_export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl ADBC_ODBC -// ------------------------------ -#ifndef ADBC_ODBC_EXPORT_H -#define ADBC_ODBC_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ADBC_ODBC_HAS_DLL) -# define ADBC_ODBC_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ADBC_ODBC_HAS_DLL */ - -#if !defined (ADBC_ODBC_HAS_DLL) -# define ADBC_ODBC_HAS_DLL 1 -#endif /* ! ADBC_ODBC_HAS_DLL */ - -#if defined (ADBC_ODBC_HAS_DLL) && (ADBC_ODBC_HAS_DLL == 1) -# if defined (ADBC_ODBC_BUILD_DLL) -# define ADBC_ODBC_Export ACE_Proper_Export_Flag -# define ADBC_ODBC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ADBC_ODBC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ADBC_ODBC_BUILD_DLL */ -# define ADBC_ODBC_Export ACE_Proper_Import_Flag -# define ADBC_ODBC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ADBC_ODBC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ADBC_ODBC_BUILD_DLL */ -#else /* ADBC_ODBC_HAS_DLL == 1 */ -# define ADBC_ODBC_Export -# define ADBC_ODBC_SINGLETON_DECLARATION(T) -# define ADBC_ODBC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ADBC_ODBC_HAS_DLL == 1 */ - -// Set ADBC_ODBC_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ADBC_ODBC_NTRACE) -# if (ACE_NTRACE == 1) -# define ADBC_ODBC_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ADBC_ODBC_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ADBC_ODBC_NTRACE */ - -#if (ADBC_ODBC_NTRACE == 1) -# define ADBC_ODBC_TRACE(X) -#else /* (ADBC_ODBC_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define ADBC_ODBC_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (ADBC_ODBC_NTRACE == 1) */ - -#endif /* ADBC_ODBC_EXPORT_H */ - -// End of auto generated file. diff --git a/ADBC/adbc/Parameter.cpp b/ADBC/adbc/Parameter.cpp deleted file mode 100644 index 1fb7e9e6a00..00000000000 --- a/ADBC/adbc/Parameter.cpp +++ /dev/null @@ -1,7 +0,0 @@ -// $Id$ - -#include "Parameter.h" - -#if !defined (__ADBC_INLINE__) -#include "Parameter.inl" -#endif diff --git a/ADBC/adbc/Parameter.h b/ADBC/adbc/Parameter.h deleted file mode 100644 index e491c6772d2..00000000000 --- a/ADBC/adbc/Parameter.h +++ /dev/null @@ -1,226 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Parameter.h - * - * $Id$ - * - * @author James H. Hill - */ -//============================================================================= - -#ifndef _ADBC_PARAMETER_H_ -#define _ADBC_PARAMETER_H_ - -#include "ace/Basic_Types.h" -#include "config.h" -#include "ADBC_export.h" - -namespace ADBC -{ -// Forward decl. -class Date_Time; - -/** - * @class Parameter - * - * Base class for parameters of different database implementations. - */ -class ADBC_Export Parameter -{ -public: - /// The types of parameters supported. - enum Parameter_Type - { - /// The parameter type is unknown. - PT_UNKNOWN, - /// The parameter is of boolean type. - PT_BOOL, - /// The parameter is of char type. - PT_CHAR, - /// The parameter is a short integer. - PT_SHORT, - /// The parameter is an unsigned short type. - PT_USHORT, - /// The parameter is a long type. - PT_LONG, - /// The parameter is an unsigned long type. - PT_ULONG, - /// The parameter is a long long type. - PT_LONGLONG, - /// The parameter is an unsigned long long type. - PT_ULONGLONG, - /// The parameter is a float type. - PT_FLOAT, - /// The parameter is a double type. - PT_DOUBLE, - /// The parameter is a date type. - PT_DATE, - /// The parameter is a time type. - PT_TIME, - /// The parameter is a date/time type. - PT_DATETIME - }; - - /// The direction of the parameter. - enum Direction_Type - { - /// Parameter is an input type. - DIRECTION_INPUT, - - /// Parameter is an output type. - DIRECTION_OUTPUT, - - /// Parameter is an inout type. - DIRECTION_INOUT - }; - - /** - * Initializing contructor. - * - * @param[in] type The parameter type. - * @param[in] index Index of the parameter. - */ - Parameter (void); - - /** - * Copy constructor. - * - * @param[in] p Source parameter. - */ - Parameter (const Parameter & p); - - /// Destructor. - virtual ~Parameter (void); - - /** - * Get the type of the parameter. - * - * @return The parameter type. - */ - virtual Parameter_Type type (void) const; - - /** - * Get the direction of the parameter. The direction will be - * one of the values in the Direction_Type enumeration. - * - * @return Direction of the parameter. - */ - virtual Direction_Type direction (void) const; - - /** - * Get the index of the parameter. - * - * @return The index of the parameter; 1-based. - */ - virtual size_t index (void) const; - - /** - * Determine if the parameter is null. - * - * @retval 1 The parameter is null. - * @retval 0 The parameter is not null. - */ - virtual bool is_null (void) const = 0; - - /// Make the parameter a NULL value. - virtual void null (void) = 0; - - /** - * Bind the parameter to a character buffer. If the size of - * the buffer is 0, then it is buffer is NULL terminated. - * - * @param[in] buffer Source character buffer. - * @param[in] bufsize Size of the buffer. - */ - virtual void bind (char * buffer, size_t bufsize) = 0; - - virtual void bind (const char * buffer, size_t bufsize) = 0; - - /** - * Bind the parameter to a short value. - * - * @param[in] value Reference to 16-bit value - */ - virtual void bind (ACE_INT16 * value) = 0; - /** - * Bind the parameter to a unsigned short value. - * - * @param[in] buffer Reference to unsigned 16-bit value - */ - virtual void bind (ACE_UINT16 * value) = 0; - - /** - * Bind the parameter to a signed long value. - * - * @param[in] buffer Source signed long value. - */ - virtual void bind (ACE_UINT32 * value) = 0; - - /** - * Bind the parameter to a unsigned long value. - * - * @param[in] buffer Source unsigned long value. - */ - virtual void bind (ACE_INT32 * value) = 0; - - /** - * Bind the parameter to a signed 64-bit value. - * - * @param[in] buffer Source unsigned long value. - */ - virtual void bind (ACE_UINT64 * value) = 0; - - /** - * Bind the parameter to a unsigned 64-bit value. - * - * @param[in] buffer Source unsigned long value. - */ - virtual void bind (ACE_INT64 * value) = 0; - - /** - * Bind the parameter to a float value. - * - * @param[in] buffer Source float value. - */ - virtual void bind (float * value) = 0; - - /** - * Bind the parameter to a double value. - * - * @param[in] buffer Source double value. - */ - virtual void bind (double * value) = 0; - - /** - * Bind the parameter to a data/time value. - * - * @param[in] dt Date/time value. - */ - virtual void bind (Date_Time * dt) = 0; - - /** - * Get the current length/size of the parameter. - * - * @return The length/size of the parameter. - */ - virtual long length (void) = 0; - -protected: - /// The index of the parameter. - int index_; - - /// The parameter type. - Parameter_Type type_; - - /// The direction of the parameter. - Direction_Type direction_; -}; -} - -#if defined (__ADBC_INLINE__) -#include "Parameter.inl" -#endif - -#endif // !defined _ADBC_DB_PARAMETER_H_ diff --git a/ADBC/adbc/Parameter.inl b/ADBC/adbc/Parameter.inl deleted file mode 100644 index 282ee271a2c..00000000000 --- a/ADBC/adbc/Parameter.inl +++ /dev/null @@ -1,163 +0,0 @@ -// -*- C++ -*- -// $Id$ - -namespace ADBC -{ -// -// Parameter -// -ADBC_INLINE -Parameter::Parameter (void) -: index_ (-1), - type_ (PT_UNKNOWN) -{ - -} - -// -// Parameter -// -ADBC_INLINE -Parameter::Parameter (const Parameter & p) -: index_ (p.index_), - type_ (p.type_) -{ - -} - -// -// Parameter -// -ADBC_INLINE -Parameter::~Parameter (void) -{ - -} - -// -// type -// -ADBC_INLINE -Parameter::Parameter_Type Parameter::type (void) const -{ - return this->type_; -} - -// -// direction -// -ADBC_INLINE -Parameter::Direction_Type Parameter::direction (void) const -{ - return this->direction_; -} - -// -// index -// -ADBC_INLINE -size_t Parameter::index (void) const -{ - return this->index_; -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (char *, size_t) -{ - this->type_ = Parameter::PT_CHAR; -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (const char *, size_t) -{ - this->type_ = Parameter::PT_CHAR; -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (ACE_INT16 *) -{ - this->type_ = Parameter::PT_SHORT; -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (ACE_UINT16 *) -{ - this->type_ = Parameter::PT_USHORT; -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (ACE_INT32 *) -{ - this->type_ = Parameter::PT_LONG; -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (ACE_UINT32 *) -{ - this->type_ = Parameter::PT_ULONG; -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (ACE_INT64 *) -{ - this->type_ = Parameter::PT_LONGLONG; -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (ACE_UINT64 *) -{ - this->type_ = Parameter::PT_ULONGLONG; -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (double *) -{ - this->type_ = Parameter::PT_DOUBLE; -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (float *) -{ - this->type_ = Parameter::PT_FLOAT; -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (Date_Time *) -{ - this->type_ = Parameter::PT_DATETIME; -} - -} diff --git a/ADBC/adbc/Parameter_List.cpp b/ADBC/adbc/Parameter_List.cpp deleted file mode 100644 index 7dfff545a2a..00000000000 --- a/ADBC/adbc/Parameter_List.cpp +++ /dev/null @@ -1,7 +0,0 @@ -// $Id$ - -#include "Parameter_List.h" - -#if !defined (__ADBC_INLINE__) -#include "Parameter_List.inl" -#endif diff --git a/ADBC/adbc/Parameter_List.h b/ADBC/adbc/Parameter_List.h deleted file mode 100644 index 33073662fc0..00000000000 --- a/ADBC/adbc/Parameter_List.h +++ /dev/null @@ -1,61 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Parameter_List.h - * - * $Id$ - * - * @author James H. Hill - */ -//============================================================================= - -#ifndef _ADBC_PARAMETER_LIST_H_ -#define _ADBC_PARAMETER_LIST_H_ - -#include "ADBC_export.h" -#include "config.h" - -namespace ADBC -{ -// Forward decl. -class Parameter; - -/** - * @class Parameter_List - */ -class ADBC_Export Parameter_List -{ -public: - /// Default constructor. - Parameter_List (void); - - /// Destructor - virtual ~Parameter_List (void); - - /** - * Get the paramater at the specified index. - * - * @param[in] index Index of interest. - */ - virtual const Parameter & operator [] (size_t index) const = 0; - - /** - * Get the paramater at the specified index. - * - * @param[in] index Index of interest. - */ - virtual Parameter & operator [] (size_t index) = 0; - - /** - * Get the size of the parameter list. - */ - virtual size_t size (void) const = 0; -}; -} - -#if defined (__ADBC_INLINE__) -#include "Parameter_List.inl" -#endif - -#endif // !defined _ADBC_DB_PARAMETER_LIST_H_ diff --git a/ADBC/adbc/Parameter_List.inl b/ADBC/adbc/Parameter_List.inl deleted file mode 100644 index 4cd3b9bd3df..00000000000 --- a/ADBC/adbc/Parameter_List.inl +++ /dev/null @@ -1,17 +0,0 @@ -// -*- C++ -*- -// $Id$ - -namespace ADBC -{ -ADBC_INLINE -Parameter_List::Parameter_List (void) -{ - -} - -ADBC_INLINE -Parameter_List::~Parameter_List (void) -{ - -} -} diff --git a/ADBC/adbc/Query.cpp b/ADBC/adbc/Query.cpp deleted file mode 100644 index 41c0be8f887..00000000000 --- a/ADBC/adbc/Query.cpp +++ /dev/null @@ -1,18 +0,0 @@ -// $Id$ - -#include "Query.h" - -#if !defined (__ADBC_INLINE__) -#include "Query.inl" -#endif - -namespace ADBC -{ -// -// destroy -// -void Query::destroy (void) -{ - delete this; -} -} diff --git a/ADBC/adbc/Query.h b/ADBC/adbc/Query.h deleted file mode 100644 index 01d7a443a32..00000000000 --- a/ADBC/adbc/Query.h +++ /dev/null @@ -1,132 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Query.h - * - * $Id$ - * - * @author James H. Hill - */ -//============================================================================= - -#ifndef _ADBC_QUERY_H_ -#define _ADBC_QUERY_H_ - -#include "ADBC_export.h" -#include "config.h" - -namespace ADBC -{ -// Forward decl. -class Record; - -// Forward decl. -class Parameter_List; - -/** - * @class Query - * - * Base class implemenation/interface for database query objects. - */ -class ADBC_Export Query -{ -public: - /// Default constructor. - Query (void); - - /// Destructor. - virtual ~Query (void); - - /** - * Prepare a statement for execution. - * - * @param[in] query NULL-terminated query string. - */ - virtual void prepare (const char * query) = 0; - - /// Destroy the query. The query is no longer usable after - /// this method returns. - virtual void destroy (void); - - /** - * Directly execute a database query. - * - * @param[in] query NULL-terminated query string. - */ - virtual void execute_no_record (const char * query) = 0; - - /// Execute an already prepared query. - virtual void execute_no_record (void) = 0; - - /** - * Execute a query. This method is useful with the query is known - * to return results that will consist of multiple data rows, and - * columns. The client has the responsibility of delete the record - * once its done with it. - * - * @return Pointer to a record. - */ - virtual Record & execute (const char * query) = 0; - - /** - * Execute a prepared query. This method is useful with the query is - * known to return results that will consist of multiple data rows, - * and columns. The client has the responsibility of delete the record - * once its done with it. - * - * @return Pointer to a record. - */ - virtual Record & execute (void) = 0; - - /// Cancel the current query. - virtual void cancel (void) = 0; - - /** - * Get the last insert id. This method is only value if an - * insert was made to a table with an \a auto_increment field. - * - * @return The last id inserted. - */ - virtual long last_insert_id (void) = 0; - - /** - * Create a parameter for the statement. The parameter must - * still be added to the collection of the parameters - * - * @return Pointer to the new parameter. - */ - virtual Parameter_List & parameters (void) = 0; - - /** - * Create a parameter for the statement. The parameter must - * still be added to the collection of the parameters - * - * @return Pointer to the new parameter. - */ - virtual const Parameter_List & parameters (void) const = 0; - - /// Reset the query string. - virtual void reset (void) = 0; - - /** - * Determine the number of rows affected by the query. This method - * is useful for DELETE, INSERT, and UPDATE statements. It should - * not be used to determine the number of rows in a record after - * executing a SELECT statement since it may result in unreliable - * results depending on the driver. - */ - virtual size_t count (void) const = 0; - -private: - // prevent the following operations - Query (const Query &); - const Query & operator = (const Query &); -}; -} - -#if defined (__ADBC_INLINE__) -#include "Query.inl" -#endif - -#endif // !defined _ADBC_DB_QUERY_H_ diff --git a/ADBC/adbc/Query.inl b/ADBC/adbc/Query.inl deleted file mode 100644 index fe6d0ed9b0d..00000000000 --- a/ADBC/adbc/Query.inl +++ /dev/null @@ -1,23 +0,0 @@ -// -*- C++ -*- -// $Id$ - -namespace ADBC -{ -// -// Query -// -ADBC_INLINE -Query::Query (void) -{ - -} - -// -// ~Query -// -ADBC_INLINE -Query::~Query (void) -{ - -} -} diff --git a/ADBC/adbc/Record.cpp b/ADBC/adbc/Record.cpp deleted file mode 100644 index b748fcb6486..00000000000 --- a/ADBC/adbc/Record.cpp +++ /dev/null @@ -1,7 +0,0 @@ -// $Id$ - -#include "Record.h" - -#if !defined (__ADBC_INLINE__) -#include "Record.inl" -#endif diff --git a/ADBC/adbc/Record.h b/ADBC/adbc/Record.h deleted file mode 100644 index af7729e9117..00000000000 --- a/ADBC/adbc/Record.h +++ /dev/null @@ -1,147 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Record.h - * - * $Id$ - * - * @author James H. Hill - */ -//============================================================================= - -#ifndef _ADBC_RECORD_H_ -#define _ADBC_RECORD_H_ - -#include "Exception.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -// Forward decl. -class ACE_Date_Time; -ACE_END_VERSIONED_NAMESPACE_DECL - -namespace ADBC -{ -/** - * @class Record - * - * Base class implementation/interface for database records. - */ -class ADBC_Export Record -{ -public: - /// Default constructor. - Record (void); - - /// Destructor. - virtual ~Record (void); - - /** - * Get the number of columns in the result. - * - * @return Number of columns. - */ - virtual size_t columns (void) const = 0; - - /// Move the next row in the records. - virtual void advance (void) = 0; - - /// Determine if the record iterator is done. - virtual bool done (void) const = 0; - - /// Reset to the first row in the record. - virtual void reset (void) = 0; - - /** - * Get a string data value at the specified column. - * - * @param[in] column 1-based column index. - * @param[out] buffer Pointer to the output buffer. - * @param[in] bufsize Size of the output buffer. - */ - virtual void get_data (size_t column, char * buffer, size_t bufsize) = 0; - - /** - * Get a character value. - * - * @param[in] column 1-based column index. - * @param[out] value Character value. - */ - virtual void get_data (size_t column, char & value) = 0; - - /** - * Get a character value. - * - * @param[in] column 1-based column index. - * @param[out] value Character value. - */ - virtual void get_data (size_t column, unsigned char & value) = 0; - - /** - * Get a character value. - * - * @param[in] column 1-based column index. - * @param[out] value Character value. - */ - virtual void get_data (size_t column, short & value) = 0; - - /** - * Get a character value. - * - * @param[in] column 1-based column index. - * @param[out] value Character value. - */ - virtual void get_data (size_t column, unsigned short & value) = 0; - - /** - * Get a character value. - * - * @param[in] column 1-based column index. - * @param[out] value Character value. - */ - virtual void get_data (size_t column, long & value) = 0; - - /** - * Get a character value. - * - * @param[in] column 1-based column index. - * @param[out] value Character value. - */ - virtual void get_data (size_t column, unsigned long & value) = 0; - - /** - * Get a float value. - * - * @param[in] column 1-based column index. - * @param[out] value Float value. - */ - virtual void get_data (size_t column, float & value) = 0; - - /** - * Get a double value. - * - * @param[in] column 1-based column index. - * @param[out] value Double value. - */ - virtual void get_data (size_t column, double & value) = 0; - - /** - * Get a date time value. - * - * @param[in] column 1-based column index. - * @param[out] value Character value. - */ - virtual void get_data (size_t column, ACE_Date_Time & value) = 0; - -private: - // prevent the following operations - Record (const Record &); - const Record & operator = (const Record &); -}; -} - -#if defined (__ADBC_INLINE__) -#include "Record.inl" -#endif - -#endif // !defined _ADBC_DB_RECORD_H_ diff --git a/ADBC/adbc/Record.inl b/ADBC/adbc/Record.inl deleted file mode 100644 index 617ccb10d51..00000000000 --- a/ADBC/adbc/Record.inl +++ /dev/null @@ -1,23 +0,0 @@ -// -*- C++ -*- -// $Id$ - -namespace ADBC -{ -// -// Record -// -ADBC_INLINE -Record::Record (void) -{ - -} - -// -// ~Record -// -ADBC_INLINE -Record::~Record (void) -{ - -} -} diff --git a/ADBC/adbc/SQLite/Connection.cpp b/ADBC/adbc/SQLite/Connection.cpp deleted file mode 100644 index 531636b8c1e..00000000000 --- a/ADBC/adbc/SQLite/Connection.cpp +++ /dev/null @@ -1,71 +0,0 @@ -// $Id$ - -#include "Connection.h" - -#if !defined (__ADBC_INLINE__) -#include "Connection.inl" -#endif - -#include "Exception.h" -#include "ace/CORBA_macros.h" -#include "sqlite3.h" - -namespace ADBC -{ -namespace SQLite -{ -// -// connect -// -void Connection::connect (const ACE_CString & connstr) -{ - long flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE; - this->connect (connstr, flags, 0); -} - -// -// connect -// -void Connection:: -connect (const ACE_CString & connstr, long flags, const char * vfs) -{ - int retval = ::sqlite3_open_v2 (connstr.c_str (), - &this->conn_, - flags, - vfs); - - if (retval != SQLITE_OK) - throw Exception (*this); - - ::ADBC::Connection::connect (connstr); -} - -// -// disconnect -// -void Connection::disconnect (void) -{ - if (this->conn_ == 0) - return; - - ::sqlite3_close (this->conn_); - this->conn_ = 0; - - ::ADBC::Connection::disconnect (); -} - -// -// create_query -// -Query * Connection::create_query (void) -{ - Query * query = 0; - - ACE_NEW_THROW_EX (query, - Query (*this), - ACE_bad_alloc ()); - - return query; -} -} -} diff --git a/ADBC/adbc/SQLite/Connection.h b/ADBC/adbc/SQLite/Connection.h deleted file mode 100644 index 68d582a67d6..00000000000 --- a/ADBC/adbc/SQLite/Connection.h +++ /dev/null @@ -1,83 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Connection.h - * - * $Id$ - * - * @author James H. Hill - */ -//============================================================================= - -#ifndef _ADBC_SQLITE_CONNECTION_H_ -#define _ADBC_SQLITE_CONNECTION_H_ - -#include "adbc/Connection.h" -#include "ace/SString.h" -#include "Query.h" - -// Forward decl. -struct sqlite3; - -namespace ADBC -{ -namespace SQLite -{ -// Forward decl. -class Exception; - -/** - * @class Connection - * - * Implementation of a SQLite connection. - */ -class ADBC_SQLITE_Export Connection : public ADBC::Connection -{ - // Friend decl. - friend class Query; - - // Friend decl. - friend class Exception; - -public: - /// Default constructor - Connection (void); - - /// Destructor. - virtual ~Connection (void); - - /** - * Connect to the specified database. - * - * @param[in] connstr Connection string for database - * @param[in] flags Flags for the connection - * @param[in] vfs File system flags - */ - void connect (const ACE_CString & connstr, long flags, const char * vfs = 0); - - /** - * Connect to the specified database. - * - * @param[in] connstr Connection string for database. - */ - virtual void connect (const ACE_CString & connstr); - - /// Disconnect from the database. - virtual void disconnect (void); - - /// Create a new SQLite query. - virtual Query * create_query (void); - -private: - /// Connection the database. - sqlite3 * conn_; -}; -} -} - -#if defined (__ADBC_INLINE__) -#include "Connection.inl" -#endif - -#endif // !defined _ADBC_SQLITE_CONNECTION_H_ diff --git a/ADBC/adbc/SQLite/Connection.inl b/ADBC/adbc/SQLite/Connection.inl deleted file mode 100644 index ebbb00e6aed..00000000000 --- a/ADBC/adbc/SQLite/Connection.inl +++ /dev/null @@ -1,29 +0,0 @@ -// -*- C++ -*- -// $Id$ - -namespace ADBC -{ -namespace SQLite -{ - -// -// Connection -// -ADBC_INLINE -Connection::Connection (void) -: conn_ (0) -{ - -} - -// -// ~Connection -// -ADBC_INLINE -Connection::~Connection (void) -{ - this->disconnect (); -} - -} -} diff --git a/ADBC/adbc/SQLite/Exception.cpp b/ADBC/adbc/SQLite/Exception.cpp deleted file mode 100644 index fb92ab365c5..00000000000 --- a/ADBC/adbc/SQLite/Exception.cpp +++ /dev/null @@ -1,29 +0,0 @@ -// $Id$ - -#include "Exception.h" - -#if !defined (__ADBC_INLINE__) -#include "Exception.inl" -#endif - -#include "Connection.h" -#include "sqlite3.h" - -namespace ADBC -{ -namespace SQLite -{ -// -// Exception -// -Exception:: -Exception (const Connection & conn) -: ::ADBC::Exception (::sqlite3_errcode (conn.conn_), - "", - ::sqlite3_errmsg (conn.conn_)) -{ - -} - -} -} diff --git a/ADBC/adbc/SQLite/Exception.h b/ADBC/adbc/SQLite/Exception.h deleted file mode 100644 index 4812047a793..00000000000 --- a/ADBC/adbc/SQLite/Exception.h +++ /dev/null @@ -1,61 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Exception.h - * - * $Id$ - * - * @author James H. Hill - */ -//============================================================================= - -#ifndef _ADBC_SQLITE_EXCEPTION_H_ -#define _ADBC_SQLITE_EXCEPTION_H_ - -#include "adbc/Exception.h" -#include "SQLite_export.h" - -namespace ADBC -{ -namespace SQLite -{ -// Forward decl. -class Connection; - -/** - * @class Exception - * - * Implementation of the exception class for SQLite - */ -class ADBC_SQLITE_Export Exception : public ADBC::Exception -{ -public: - /// Default constructor - Exception (void); - - /** - * Initializing constructor - * - * @param[in] conn Connection associated with exception - */ - Exception (const Connection & conn); - - /** - * Initializing constructor. - * - * @param[in] msg Message for the exception - */ - Exception (const char * msg); - - /// Destructor - virtual ~Exception (void); -}; -} -} - -#if defined (__ADBC_INLINE__) -#include "Exception.inl" -#endif - -#endif // !defined _ADBC_SQLITE_EXCEPTION_H_ diff --git a/ADBC/adbc/SQLite/Exception.inl b/ADBC/adbc/SQLite/Exception.inl deleted file mode 100644 index e0ce0ea65a7..00000000000 --- a/ADBC/adbc/SQLite/Exception.inl +++ /dev/null @@ -1,34 +0,0 @@ - -namespace ADBC -{ -namespace SQLite -{ -// -// Exception -// -ADBC_INLINE -Exception::Exception (void) -{ - -} - -// -// Exception -// -ADBC_INLINE -Exception::Exception (const char * message) -: ::ADBC::Exception (message) -{ - -} - -// -// ~Exception -// -ADBC_INLINE -Exception::~Exception (void) -{ - -} -} -} diff --git a/ADBC/adbc/SQLite/Parameter.cpp b/ADBC/adbc/SQLite/Parameter.cpp deleted file mode 100644 index 2644f7c3aac..00000000000 --- a/ADBC/adbc/SQLite/Parameter.cpp +++ /dev/null @@ -1,135 +0,0 @@ -// $Id$ - -#include "Parameter.h" - -#if !defined (__ADBC_INLINE__) -#include "Parameter.inl" -#endif - -#include "Exception.h" -#include "Query.h" -#include "Types.h" -#include "sqlite3.h" - -namespace ADBC -{ -namespace SQLite -{ -// -// operator = -// -const Parameter & Parameter::operator = (const Parameter & rhs) -{ - if (this == &rhs) - return *this; - - this->owner_ = rhs.owner_; - this->index_ = rhs.index_; - - return *this; -} - -// -// null -// -void Parameter::null (void) -{ - int retval = ::sqlite3_bind_null (this->owner_->owner ().stmt_, - this->index_); - - if (retval != SQLITE_OK) - throw Exception (this->owner_->owner ().parent_); - - this->is_null_ = true; -} - -// -// bind -// -void Parameter::bind (const char * buffer, size_t bufsize) -{ - int retval = ::sqlite3_bind_text (this->owner_->owner ().stmt_, - this->index_, - buffer, - bufsize, - SQLITE_TRANSIENT); - - if (retval == SQLITE_OK) - ::ADBC::Parameter::bind (buffer, bufsize); - else - throw Exception (this->owner_->owner ().parent_); -} - -// -// bind -// -void Parameter::bind (char * buffer, size_t bufsize) -{ - int retval = ::sqlite3_bind_text (this->owner_->owner ().stmt_, - this->index_, - buffer, - bufsize, - SQLITE_TRANSIENT); - - if (retval == SQLITE_OK) - ::ADBC::Parameter::bind (buffer, bufsize); - else - throw Exception (this->owner_->owner ().parent_); -} - -// -// bind -// -void Parameter::bind (::ADBC::Date_Time * date_time) -{ - // Cast the object its concrete type. - ADBC::SQLite::Date_Time * dt = - dynamic_cast < ::ADBC::SQLite::Date_Time * > (date_time); - - if (0 != dt) - this->bind (dt); - - // Throw an exception since type is invalid. - throw Exception ("value is not an ::ADBC::SQLite::Date_Time object"); -} - -// -// bind -// -void Parameter::bind (::ADBC::SQLite::Date_Time * dt) -{ - char * value = reinterpret_cast <char *> (dt->value ()); - this->bind (value, 20); - - ::ADBC::Parameter::bind (dt); -} - -// -// bind_int -// -void Parameter::bind_int (int val) -{ - int retval = ::sqlite3_bind_int (this->owner_->owner ().stmt_, - this->index_, - val); - - if (retval != SQLITE_OK) - throw Exception (this->owner_->owner ().parent_); -} - -// -// bind_double -// -void Parameter::bind_double (double val) -{ - int retval = - ::sqlite3_bind_double (this->owner_->owner ().stmt_, - this->index_, - val); - - if (retval != SQLITE_OK) - throw Exception (this->owner_->owner ().parent_); -} - -} -} diff --git a/ADBC/adbc/SQLite/Parameter.h b/ADBC/adbc/SQLite/Parameter.h deleted file mode 100644 index 94a6b56b683..00000000000 --- a/ADBC/adbc/SQLite/Parameter.h +++ /dev/null @@ -1,165 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Parameter.h - * - * $Id$ - * - * @author James H. Hill - */ -//============================================================================= - -#ifndef _ADBC_SQLITE_PARAMETER_H_ -#define _ADBC_SQLITE_PARAMETER_H_ - -#include "adbc/Parameter.h" -#include "SQLite_export.h" - -namespace ADBC -{ -namespace SQLite -{ -// Forward decl. -class Parameter_List; - -// Forward decl. -class Date_Time; - -/** - * @class Parameter - */ -class ADBC_SQLITE_Export Parameter : public ::ADBC::Parameter -{ - // Friend decl. - friend class Parameter_List; - -public: - /// Default constructor. - Parameter (void); - - /** - * Copy constructor - * - * @param[in] p Source parameter - */ - Parameter (const Parameter & p); - - /// Destructor. - virtual ~Parameter (void); - - /// Make the parameter a NULL value. - virtual void null (void); - - // Test if the parameter is NULL. - virtual bool is_null (void) const; - - /** - * Bind the parameter to a character buffer. If the size of - * the buffer is 0, then it is buffer is NULL terminated. - * - * @param[in] buffer Source character buffer. - * @param[in] bufsize Size of the buffer. - */ - virtual void bind (char * buffer, size_t bufsize); - - virtual void bind (const char * buffer, size_t bufsize); - - /** - * Bind the parameter to a short value. - * - * @param[in] buffer Source short value. - */ - virtual void bind (ACE_INT16 * value); - /** - * Bind the parameter to a unsigned short value. - * - * @param[in] buffer Source unsigned short value. - */ - virtual void bind (ACE_UINT16 * value); - - /** - * Bind the parameter to a signed long value. - * - * @param[in] buffer Source signed long value. - */ - virtual void bind (ACE_INT32 * buffer); - - /** - * Bind the parameter to a unsigned long value. - * - * @param[in] buffer Source unsigned long value. - */ - virtual void bind (ACE_UINT32 * buffer); - - virtual void bind (ACE_INT64 * buffer); - - virtual void bind (ACE_UINT64 * buffer); - - /** - * Bind the parameter to a float value. - * - * @param[in] buffer Source float value. - */ - virtual void bind (float * buffer); - - /** - * Bind the parameter to a double value. - * - * @param[in] buffer Source double value. - */ - virtual void bind (double * value); - - /** - * Bind the parameter to a data/time value. - * - * @param[in] datetime Source date/time value. - */ - virtual void bind (::ADBC::Date_Time * dt); - - /** - * Bind the parameter to a data/time value. - * - * @param[in] datetime Source date/time value. - */ - void bind (::ADBC::SQLite::Date_Time * dt); - - /** - * Get the current length/size of the parameter. - * - * @return The length/size of the parameter. - */ - virtual long length (void); - - /** - * Assignment operator - * - * @param[in] rhs Right-hand side of operator - * @param[in] Reference to this object - */ - const Parameter & operator = (const Parameter & rhs); - -private: - // Helper method for binding an integer - void bind_int (int val); - - // Helper method for binding a double. - void bind_double (double d); - - // Helper method for reseting a parameter. - void reset (const Parameter_List * owner, int index); - - /// List that owns the parameter. - const Parameter_List * owner_; - - /// NULL state of the parameter. - bool is_null_; -}; -} -} - -#if defined (__ADBC_INLINE__) -#include "Parameter.inl" -#endif - -#endif // !defined _ADBC_SQLITE_PARAMETER_H_ diff --git a/ADBC/adbc/SQLite/Parameter.inl b/ADBC/adbc/SQLite/Parameter.inl deleted file mode 100644 index 88193cdd33f..00000000000 --- a/ADBC/adbc/SQLite/Parameter.inl +++ /dev/null @@ -1,151 +0,0 @@ -// -*- C++ -*- -// $Id$ - -namespace ADBC -{ -namespace SQLite -{ -// -// Parameter -// -ADBC_INLINE -Parameter::Parameter (void) -: owner_ (0), - is_null_ (true) -{ - -} - -// -// Parameter -// -ADBC_INLINE -Parameter:: -Parameter (const Parameter & p) -: ADBC::Parameter (p), - owner_ (p.owner_), - is_null_ (p.is_null_) -{ - -} - -// -// ~Parameter -// -ADBC_INLINE -Parameter::~Parameter (void) -{ - -} - -// -// is_null -// -ADBC_INLINE -bool Parameter::is_null (void) const -{ - return this->is_null_; -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (float * value) -{ - this->bind_double (static_cast <double> (*value)); - ::ADBC::Parameter::bind (value); -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (double * value) -{ - this->bind_double (*value); - ::ADBC::Parameter::bind (value); -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (ACE_INT16 * value) -{ - this->bind_int (static_cast <int> (*value)); - ::ADBC::Parameter::bind (value); -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (ACE_UINT16 * value) -{ - this->bind_int (static_cast <int> (*value)); - ::ADBC::Parameter::bind (value); -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (ACE_INT32 * value) -{ - this->bind_int (static_cast <int> (*value)); - ::ADBC::Parameter::bind (value); -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (ACE_UINT32 * value) -{ - this->bind_int (static_cast <int> (*value)); - ::ADBC::Parameter::bind (value); -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (ACE_INT64 * value) -{ - this->bind_int (static_cast <int> (*value)); - ::ADBC::Parameter::bind (value); -} - -// -// bind -// -ADBC_INLINE -void Parameter::bind (ACE_UINT64 * value) -{ - this->bind_int (static_cast <int> (*value)); - ::ADBC::Parameter::bind (value); -} - -// -// length -// -ADBC_INLINE -long Parameter::length (void) -{ - return 0; -} - -// -// reset -// -ADBC_INLINE -void Parameter:: -reset (const Parameter_List * owner, int index) -{ - this->owner_ = owner; - this->index_ = index; -} - -} -} diff --git a/ADBC/adbc/SQLite/Parameter_List.cpp b/ADBC/adbc/SQLite/Parameter_List.cpp deleted file mode 100644 index 66be73dfcfb..00000000000 --- a/ADBC/adbc/SQLite/Parameter_List.cpp +++ /dev/null @@ -1,59 +0,0 @@ -// $Id$ - -#include "Parameter_List.h" - -#if !defined (__ADBC_INLINE__) -#include "Parameter_List.inl" -#endif - -#include "Query.h" -#include "sqlite3.h" - -namespace ADBC -{ -namespace SQLite -{ -// -// reset -// -void Parameter_List::reset (void) -{ - // Get the number of parameters in the statement. - int new_size = ::sqlite3_bind_parameter_count (this->parent_.stmt_); - - // Resize the statement. - int old_size = this->params_.size (); - this->params_.size (new_size); - - if (new_size > old_size) - for (int i = old_size; i < new_size; ++ i) - this->params_[i].reset (this, i + 1); -} - -// -// operator [] -// -ADBC_INLINE -Parameter & -Parameter_List::operator [] (const ACE_CString & name) -{ - int index = ::sqlite3_bind_parameter_index (this->parent_.stmt_, - name.c_str ()); - - return this->params_[index - 1]; -} - -// -// operator [] -// -ADBC_INLINE -const Parameter & -Parameter_List::operator [] (const ACE_CString & name) const -{ - int index = ::sqlite3_bind_parameter_index (this->parent_.stmt_, - name.c_str ()); - - return this->params_[index - 1]; -} -} -} diff --git a/ADBC/adbc/SQLite/Parameter_List.h b/ADBC/adbc/SQLite/Parameter_List.h deleted file mode 100644 index 938bc614fcd..00000000000 --- a/ADBC/adbc/SQLite/Parameter_List.h +++ /dev/null @@ -1,95 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Parameter_List.h - * - * $Id$ - * - * @author James H. Hill - */ -//============================================================================= - -#ifndef _ADBC_SQLITE_PARAMATER_LIST_H_ -#define _ADBC_SQLITE_PARAMATER_LIST_H_ - -#include "ace/Array.h" -#include "ace/SStringfwd.h" -#include "adbc/Parameter_List.h" -#include "Parameter.h" - -namespace ADBC -{ -namespace SQLite -{ -// Forward decl. -class Query; - -/** - * @class Parameter_List - */ -class ADBC_SQLITE_Export Parameter_List : - public ::ADBC::Parameter_List -{ -public: - /// Default constructor. - Parameter_List (const Query & parent); - - /// Destructor. - virtual ~Parameter_List (void); - - /// Get the size of the parameter list. - virtual size_t size (void) const; - - /// Get the owner of the parameter list. - const Query & owner (void) const; - - /// Reset the size of the parameter list. - void reset (void); - - /** - * Get parameter by index value. - * - * @param[in] index Zero-based index - */ - virtual const Parameter & operator [] (size_t index) const; - - /** - * Get parameter by index value. - * - * @param[in] index Zero-based index - */ - virtual Parameter & operator [] (size_t index); - - /** - * Get parameter by name. - * - * @param[in] name Name of the parameter. - */ - virtual const Parameter & operator [] (const ACE_CString & name) const; - - /** - * Get parameter by name. - * - * @param[in] name Name of the parameter. - */ - virtual Parameter & operator [] (const ACE_CString & name); - -private: - /// Type definition for the parameter list implementation. - typedef ACE_Array <Parameter> array_type; - - /// The owner of the parameter list. - const Query & parent_; - - /// The actual parameters for the list. - array_type params_; -}; -} -} - -#if defined (__ADBC_INLINE__) -#include "Parameter_List.inl" -#endif - -#endif // !defined _ADBC_SQLITE_PARAMATER_LIST_H_ diff --git a/ADBC/adbc/SQLite/Parameter_List.inl b/ADBC/adbc/SQLite/Parameter_List.inl deleted file mode 100644 index 8f342a7b723..00000000000 --- a/ADBC/adbc/SQLite/Parameter_List.inl +++ /dev/null @@ -1,66 +0,0 @@ -// $Id$ - -namespace ADBC -{ -namespace SQLite -{ -// -// Parameter_List -// -ADBC_INLINE -Parameter_List:: -Parameter_List (const Query & parent) -: parent_ (parent) -{ - -} - -// -// Parameter_List -// -ADBC_INLINE -Parameter_List::~Parameter_List (void) -{ - -} - -// -// size -// -ADBC_INLINE -size_t Parameter_List::size (void) const -{ - return this->params_.size (); -} - -// -// operator [] -// -ADBC_INLINE -Parameter & -Parameter_List::operator [] (size_t index) -{ - return this->params_[index]; -} - -// -// operator [] -// -ADBC_INLINE -const Parameter & -Parameter_List::operator [] (size_t index) const -{ - return this->params_[index]; -} - -// -// parent -// -ADBC_INLINE -const Query & Parameter_List::owner (void) const -{ - return this->parent_; -} - -} -} diff --git a/ADBC/adbc/SQLite/Query.cpp b/ADBC/adbc/SQLite/Query.cpp deleted file mode 100644 index 3a47187c28f..00000000000 --- a/ADBC/adbc/SQLite/Query.cpp +++ /dev/null @@ -1,122 +0,0 @@ -// $Id$ - -#include "Query.h" - -#if !defined (__ADBC_INLINE__) -#include "Query.inl" -#endif - -#include "Connection.h" -#include "Exception.h" -#include "ace/CORBA_macros.h" -#include "sqlite3.h" - -namespace ADBC -{ -namespace SQLite -{ -// -// Query -// -ADBC_INLINE -Query::Query (Connection & parent) -: parent_ (parent), - stmt_ (0), - params_ (*this), - record_ (*this) -{ - -} - -// -// prepare -// -void Query::prepare (const char * query) -{ - size_t len = ACE_OS::strlen (query); - this->prepare (query, len); -} - -// -// cancel -// -void Query::cancel (void) -{ - ::sqlite3_interrupt (this->parent_.conn_); -} - -// -// prepare -// -void Query::prepare (const char * query, size_t len) -{ - // Finalize the statement before continuing. - this->finalize (); - - // Allocate a new statement/query object. - const char * tail = 0; - int retval = ::sqlite3_prepare_v2 (this->parent_.conn_, - query, - len, - &this->stmt_, - &tail); - - if (retval != SQLITE_OK) - throw Exception (this->parent_); - - // Reset the parameters for the statement. - this->params_.reset (); -} - -// -// execute_no_record -// -void Query::execute_no_record (void) -{ - if (this->stmt_ == 0) - throw Exception ("SQL statement is not prepared"); - - // Reset the record, then execute the statement. - this->record_.reset (); - - if (!this->record_.done ()) - throw Exception ("SQL statement was a SELECT statement"); -} - -// -// execute -// -Record & Query::execute (void) -{ - if (this->stmt_ == 0) - throw Exception ("SQL statement is not prepared"); - - // Update the record's state for the new query. - this->record_.reset (); - return this->record_; -} - -// -// finalize -// -void Query::finalize (void) -{ - if (this->stmt_ == 0) - return; - - // Release the statements resources. - ::sqlite3_finalize (this->stmt_); - this->stmt_ = 0; -} - -// -// reset -// -void Query::reset (void) -{ - //::sqlite3_reset (this->stmt_); - //this->needs_reseting_ = false; -} - -} -} diff --git a/ADBC/adbc/SQLite/Query.h b/ADBC/adbc/SQLite/Query.h deleted file mode 100644 index 315eae89a6e..00000000000 --- a/ADBC/adbc/SQLite/Query.h +++ /dev/null @@ -1,140 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Query.h - * - * $Id$ - * - * @author James H. Hill - */ -//============================================================================= - -#ifndef _ADBC_SQLITE_QUERY_H_ -#define _ADBC_SQLITE_QUERY_H_ - -#include "adbc/Query.h" -#include "sqlite3.h" -#include "Record.h" -#include "Parameter_List.h" - -namespace ADBC -{ -namespace SQLite -{ -// Forward decl. -class Connection; - -/** - * @class Query - * - * Implemenation of the Query class for SQLite - */ -class ADBC_SQLITE_Export Query : public ::ADBC::Query -{ - // Friend decl. - friend class Record; - - // Friend decl. - friend class Parameter_List; - - // Friend decl. - friend class Parameter; - -public: - /// Default constructor - Query (Connection & parent); - - /// Destructor - virtual ~Query (void); - - /** - * Prepare a statement for execution. - * - * @param[in] query NULL-terminated query string. - */ - virtual void prepare (const char * query); - - /** - * Prepare a statement for execution. - * - * @param[in] query NULL-terminated query string. - */ - virtual void prepare (const char * query, size_t len); - - /** - * Directly execute a database query. - * - * @param[in] query NULL-terminated query string. - */ - virtual void execute_no_record (const char * query); - - /// Execute an already prepared query. - virtual void execute_no_record (void); - - /** - * Execute a query. This method is useful with the query is known - * to return results that will consist of multiple data rows, and - * columns. The client has the responsibility of delete the record - * once its done with it. - * - * @return Pointer to a record. - */ - virtual Record & execute (const char * query); - - /** - * Execute a prepared query. This method is useful with the query is - * known to return results that will consist of multiple data rows, - * and columns. The client has the responsibility of delete the record - * once its done with it. - * - * @return Pointer to a record. - */ - virtual Record & execute (void); - - /// Cancel the current query. - virtual void cancel (void); - - /** - * Get the last insert id. This method is only value if an - * insert was made to a table with an \a auto_increment field. - * - * @return The last id inserted. - */ - virtual long last_insert_id (void); - - // Get the number of rows affects by last SQL statement. - virtual size_t count (void) const; - - // Get a list of the parameters. - virtual Parameter_List & parameters (void); - - // Get a read-only list of the parameters. - virtual const Parameter_List & parameters (void) const; - - /// Reset the query string. - virtual void reset (void); - -private: - void finalize (void); - - /// Owner of the query. - Connection & parent_; - - /// Actual SQLite3 statement. - ::sqlite3_stmt * stmt_; - - /// Collection of parameters for this query. - Parameter_List params_; - - /// Record associated with the statement. - Record record_; -}; -} -} - -#if defined (__ADBC_INLINE__) -#include "Query.inl" -#endif - -#endif // !defined _ADBC_SQLITE_QUERY_H_ diff --git a/ADBC/adbc/SQLite/Query.inl b/ADBC/adbc/SQLite/Query.inl deleted file mode 100644 index 6b470d0a9d6..00000000000 --- a/ADBC/adbc/SQLite/Query.inl +++ /dev/null @@ -1,77 +0,0 @@ -// -*- C++ -*- -// $Id$ - -#include "Connection.h" - -namespace ADBC -{ -namespace SQLite -{ -// -// ~Query -// -ADBC_INLINE -Query::~Query (void) -{ - this->finalize (); -} - -// -// execute_no_record -// -ADBC_INLINE -void Query::execute_no_record (const char * query) -{ - this->prepare (query); - this->execute_no_record (); -} - - -// -// execute -// -ADBC_INLINE -Record & Query::execute (const char * query) -{ - this->prepare (query); - return this->execute (); -} - -// -// parameters -// -ADBC_INLINE -Parameter_List & Query::parameters (void) -{ - return this->params_; -} - -// -// parameters -// -ADBC_INLINE -const Parameter_List & Query::parameters (void) const -{ - return this->params_; -} - -// -// last_insert_id -// -ADBC_INLINE -long Query::last_insert_id (void) -{ - return static_cast <long> (::sqlite3_last_insert_rowid (this->parent_.conn_)); -} - -// -// count -// -ADBC_INLINE -size_t Query::count (void) const -{ - return ::sqlite3_changes (this->parent_.conn_); -} - -} -} diff --git a/ADBC/adbc/SQLite/Record.cpp b/ADBC/adbc/SQLite/Record.cpp deleted file mode 100644 index bd333b5294a..00000000000 --- a/ADBC/adbc/SQLite/Record.cpp +++ /dev/null @@ -1,140 +0,0 @@ -// $Id$ - -#include "Record.h" - -#if !defined (__ADBC_INLINE__) -#include "Record.inl" -#endif - -#include "Query.h" -#include "Exception.h" -#include "ace/Date_Time.h" -#include "ace/Array.h" -#include <sstream> - -namespace ADBC -{ -namespace SQLite -{ -// -// reset -// -void Record::reset (void) -{ - // Reset the cursor - if (this->state_ != SQLITE_OK) - this->state_ = ::sqlite3_reset (this->query_.stmt_); - - // Move the first element in the result. - if (this->state_ == SQLITE_OK) - this->state_ = ::sqlite3_step (this->query_.stmt_); - - // Lastly, check for any errors. - if (this->state_ == SQLITE_ERROR || this->state_ == SQLITE_MISUSE) - throw Exception (this->query_.parent_); -} - -// -// advance -// -void Record::advance (void) -{ - if (this->state_ == SQLITE_ROW) - this->state_ = ::sqlite3_step (this->query_.stmt_); - - // Lastly, check for any errors. - if (this->state_ == SQLITE_ERROR || this->state_ == SQLITE_MISUSE) - throw Exception (this->query_.parent_); -} - -// -// get_data -// -void Record::get_data (size_t column, char * buffer, size_t bufsize) -{ - // Get the size of the data in the column. - -- bufsize; - size_t size = ::sqlite3_column_bytes (this->query_.stmt_, column); - - // Keep the smaller of the two sizes - if (size > bufsize) - size = bufsize; - - // Copy the contents of the buffer. - const unsigned char * text = ::sqlite3_column_text (this->query_.stmt_, - column); - - ACE_OS::strncpy (buffer, - reinterpret_cast <const char *> (text), - size); - - buffer[size] = '\0'; -} - -// -// get_data -// -void Record::get_data (size_t column, ACE_CString & value) -{ - size_t size = ::sqlite3_column_bytes (this->query_.stmt_, column); - - const unsigned char * text = - ::sqlite3_column_text (this->query_.stmt_, column); - - value.set (reinterpret_cast <const char *> (text), size, true); -} - -// -// get_data -// -void Record::get_data (size_t column, ACE_Date_Time & datetime) -{ - long value; - const unsigned char * text = ::sqlite3_column_text (this->query_.stmt_, - column); - std::istringstream istr (std::string (reinterpret_cast <const char *> (text)), - std::istringstream::in); - - // Read the year from the string. - istr >> value; - datetime.year (value); - istr.seekg (1); - - // Read the month from the string. - istr >> value; - datetime.month (value); - istr.seekg (1); - - // Read the day from the string. - istr >> value; - datetime.day (value); - - // Read the hour from the string. - istr >> value; - datetime.hour (value); - istr.seekg (1); - - // Read the minute from the string. - istr >> value; - datetime.minute (value); - istr.seekg (1); - - // Read the second from the string. - istr >> value; - datetime.second (value); -} - -// -// column_name -// -const char * Record::column_name (size_t index) -{ - const char * result = ::sqlite3_column_name (this->query_.stmt_, index); - - if (result != 0) - return result; - - throw Exception ("index out of range"); -} -} -} diff --git a/ADBC/adbc/SQLite/Record.h b/ADBC/adbc/SQLite/Record.h deleted file mode 100644 index a1676db254f..00000000000 --- a/ADBC/adbc/SQLite/Record.h +++ /dev/null @@ -1,109 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Record.h - * - * $Id$ - * - * @author James H. Hill - */ -//============================================================================= - -#ifndef _ADBC_DB_SQLITE_RECORD_H_ -#define _ADBC_DB_SQLITE_RECORD_H_ - -#include "adbc/Record.h" -#include "SQLite_export.h" - -namespace ADBC -{ -namespace SQLite -{ -// Forward decl. -class Query; - -/** - * @class Record - * - * Implemenation of the Record for SQLite. - */ -class ADBC_SQLITE_Export Record : public ADBC::Record -{ -public: - // Friend decl. - friend class Query; - - /// Destructor - virtual ~Record (void); - - /** - * Get the number of columns in the record. - * - * @return Number of columns. - */ - virtual size_t columns (void) const; - - /** - * Get the name of the column. - * - * @param[in] index Index of the column. - * @param[in] name Name of the column. - */ - const char * column_name (size_t index); - - /// Move to the next row in the record. - virtual void advance (void); - - /// Test if reached the last row in the record. - virtual bool done (void) const; - - virtual void get_data (size_t column, char * buffer, size_t bufsize); - - virtual void get_data (size_t column, char & value); - - virtual void get_data (size_t column, unsigned char & value); - - virtual void get_data (size_t column, short & value); - - virtual void get_data (size_t column, unsigned short & value); - - virtual void get_data (size_t column, long & value); - - virtual void get_data (size_t column, unsigned long & value); - - virtual void get_data (size_t column, float & value); - - virtual void get_data (size_t column, double & value); - - virtual void get_data (size_t column, ACE_Date_Time & datetime); - - virtual void get_data (size_t column, ACE_CString & value); - - /// Reset the record. - virtual void reset (void); - -private: - /** - * Initializing constructor. The ::ADBC::SQLite::Query class is the - * only object that has access to this method. - * - * @param[in] query Parent of the record - * @param[in] state Initial state - */ - Record (const Query & query); - - /// Parent of the record. - const Query & query_; - - /// The record's state. - int state_; -}; -} -} - -#if defined (__ADBC_INLINE__) -#include "Record.inl" -#endif - -#endif // !defined _ADBC_DB_SQLITE_RECORD_H_ diff --git a/ADBC/adbc/SQLite/Record.inl b/ADBC/adbc/SQLite/Record.inl deleted file mode 100644 index 0b690eb16ca..00000000000 --- a/ADBC/adbc/SQLite/Record.inl +++ /dev/null @@ -1,125 +0,0 @@ -// $Id$ - -#include "Query.h" - -namespace ADBC -{ -namespace SQLite -{ -// -// Record -// -ADBC_INLINE -Record:: -Record (const Query & query) -: query_ (query), - state_ (SQLITE_OK) -{ - -} - -// -// ~Record -// -ADBC_INLINE -Record::~Record (void) -{ - -} - -// -// count -// -ADBC_INLINE -size_t Record::columns (void) const -{ - return ::sqlite3_column_count (this->query_.stmt_); -} - -// -// get_data -// -ADBC_INLINE -void Record::get_data (size_t column, char & value) -{ - value = *::sqlite3_column_text (this->query_.stmt_, column); -} - -// -// get_data -// -ADBC_INLINE -void Record::get_data (size_t column, unsigned char & value) -{ - value = *::sqlite3_column_text (this->query_.stmt_, column); -} - -// -// get_data -// -ADBC_INLINE -void Record::get_data (size_t column, short & value) -{ - int val = ::sqlite3_column_int (this->query_.stmt_, column); - value = static_cast <short> (val); -} - -// -// get_data -// -ADBC_INLINE -void Record::get_data (size_t column, unsigned short & value) -{ - int val = ::sqlite3_column_int (this->query_.stmt_, column); - value = static_cast <unsigned short> (val); -} - -// -// get_data -// -ADBC_INLINE -void Record::get_data (size_t column, long & value) -{ - int val = ::sqlite3_column_int (this->query_.stmt_, column); - value = static_cast <long> (val); -} - -// -// get_data -// -ADBC_INLINE -void Record::get_data (size_t column, unsigned long & value) -{ - int val = ::sqlite3_column_int (this->query_.stmt_, column); - value = static_cast <unsigned long> (val); -} - -// -// get_data -// -ADBC_INLINE -void Record::get_data (size_t column, float & value) -{ - double val = ::sqlite3_column_double (this->query_.stmt_, column); - value = static_cast <float> (val); -} - -// -// get_data -// -ADBC_INLINE -void Record::get_data (size_t column, double & value) -{ - value = ::sqlite3_column_double (this->query_.stmt_, column); -} - -// -// done -// -ADBC_INLINE -bool Record::done (void) const -{ - return this->state_ == SQLITE_DONE; -} -} -} diff --git a/ADBC/adbc/SQLite/SQLite.mpc b/ADBC/adbc/SQLite/SQLite.mpc deleted file mode 100644 index 5a4bc806f4b..00000000000 --- a/ADBC/adbc/SQLite/SQLite.mpc +++ /dev/null @@ -1,16 +0,0 @@ -// $Id$ - -project (ADBC_SQLite) : sqlite3, adbc_lib { - sharedname = ADBC_SQLite - dynamicflags += ADBC_SQLITE_BUILD_DLL - - Source_Files { - Connection.cpp - Exception.cpp - Parameter.cpp - Parameter_List.cpp - Query.cpp - Record.cpp - Types.cpp - } -} diff --git a/ADBC/adbc/SQLite/SQLite_export.h b/ADBC/adbc/SQLite/SQLite_export.h deleted file mode 100644 index cd9e8d41af6..00000000000 --- a/ADBC/adbc/SQLite/SQLite_export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl ADBC_SQLITE -// ------------------------------ -#ifndef ADBC_SQLITE_EXPORT_H -#define ADBC_SQLITE_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (ADBC_SQLITE_HAS_DLL) -# define ADBC_SQLITE_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ADBC_SQLITE_HAS_DLL */ - -#if !defined (ADBC_SQLITE_HAS_DLL) -# define ADBC_SQLITE_HAS_DLL 1 -#endif /* ! ADBC_SQLITE_HAS_DLL */ - -#if defined (ADBC_SQLITE_HAS_DLL) && (ADBC_SQLITE_HAS_DLL == 1) -# if defined (ADBC_SQLITE_BUILD_DLL) -# define ADBC_SQLITE_Export ACE_Proper_Export_Flag -# define ADBC_SQLITE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ADBC_SQLITE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* ADBC_SQLITE_BUILD_DLL */ -# define ADBC_SQLITE_Export ACE_Proper_Import_Flag -# define ADBC_SQLITE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ADBC_SQLITE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* ADBC_SQLITE_BUILD_DLL */ -#else /* ADBC_SQLITE_HAS_DLL == 1 */ -# define ADBC_SQLITE_Export -# define ADBC_SQLITE_SINGLETON_DECLARATION(T) -# define ADBC_SQLITE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* ADBC_SQLITE_HAS_DLL == 1 */ - -// Set ADBC_SQLITE_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (ADBC_SQLITE_NTRACE) -# if (ACE_NTRACE == 1) -# define ADBC_SQLITE_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define ADBC_SQLITE_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !ADBC_SQLITE_NTRACE */ - -#if (ADBC_SQLITE_NTRACE == 1) -# define ADBC_SQLITE_TRACE(X) -#else /* (ADBC_SQLITE_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define ADBC_SQLITE_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (ADBC_SQLITE_NTRACE == 1) */ - -#endif /* ADBC_SQLITE_EXPORT_H */ - -// End of auto generated file. diff --git a/ADBC/adbc/SQLite/Types.cpp b/ADBC/adbc/SQLite/Types.cpp deleted file mode 100644 index 654ae857bf1..00000000000 --- a/ADBC/adbc/SQLite/Types.cpp +++ /dev/null @@ -1,39 +0,0 @@ -// $Id$ - -#include "Types.h" - -#if !defined (__ADBC_INLINE__) -#include "Types.inl" -#endif - -#include "ace/OS_NS_stdio.h" - -namespace ADBC -{ -namespace SQLite -{ - -// -// value -// -void * Date_Time::value (void) -{ - if (this->out_of_date_) - { - ::ACE_OS::sprintf (this->buffer_, - ACE_TEXT ("%04d-%02d-%02d %02d:%02d:%02d"), - this->dt_.year (), - this->dt_.month (), - this->dt_.day (), - this->dt_.hour (), - this->dt_.minute (), - this->dt_.second ()); - - this->out_of_date_ = false; - } - - return this->buffer_; -} - -} -} diff --git a/ADBC/adbc/SQLite/Types.h b/ADBC/adbc/SQLite/Types.h deleted file mode 100644 index 4367bacf58b..00000000000 --- a/ADBC/adbc/SQLite/Types.h +++ /dev/null @@ -1,107 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Types.h - * - * $Id$ - * - * @author James H. Hill - */ -//============================================================================= - -#ifndef _ADBC_SQLITE_TYPES_H_ -#define _ADBC_SQLITE_TYPES_H_ - -#include "adbc/Types.h" -#include "ace/Date_Time.h" -#include "SQLite_export.h" - -namespace ADBC -{ -namespace SQLite -{ - -class ADBC_SQLITE_Export Date_Time : - public ::ADBC::Date_Time -{ -public: - /// Default constructor. - Date_Time (void); - - /** - * Initializing constructor. - * - * @param[in] dt Source data and time. - */ - Date_Time (const ACE_Date_Time & dt); - - /** - * Initializing constructor. - */ - Date_Time (long month, - long day, - long year, - long hour, - long min, - long sec, - long frac); - - /** - * Copy constructor. - * - * @param[in] dt Source data and time - */ - Date_Time (const Date_Time & dt); - - /// Destructor. - virtual ~Date_Time (void); - - virtual long month (void) const; - - virtual void month (long val); - - virtual long day (void) const; - - virtual void day (long val); - - virtual long year (void) const; - - virtual void year (long value); - - virtual long hour (void) const; - - virtual void hour (long); - - virtual long minute (void) const; - - virtual void minute (long value); - - virtual long second (void) const; - - virtual void second (long value); - - virtual long fraction (void) const; - - virtual void fraction (long val); - - virtual void * value (void); - -private: - /// Binary version of the date time. - ACE_Date_Time dt_; - - /// String version of the time. - char buffer_[20]; - - /// The string version is out of date. - bool out_of_date_; -}; -} -} - -#if defined (__ADBC_INLINE__) -#include "Types.inl" -#endif - -#endif // !defined _ADBC_DB_SQLITE_TYPES_H_ diff --git a/ADBC/adbc/SQLite/Types.inl b/ADBC/adbc/SQLite/Types.inl deleted file mode 100644 index 9d4ba15df9a..00000000000 --- a/ADBC/adbc/SQLite/Types.inl +++ /dev/null @@ -1,124 +0,0 @@ -// $Id$ - -namespace ADBC -{ -namespace SQLite -{ - -// -// Date_Time -// -ADBC_INLINE -Date_Time::Date_Time (void) -: out_of_date_ (true) -{ - -} - -ADBC_INLINE -Date_Time:: -Date_Time (const ACE_Date_Time & dt) -: dt_ (dt), - out_of_date_ (true) -{ - -} - -ADBC_INLINE -Date_Time::~Date_Time (void) -{ - -} - -ADBC_INLINE -long Date_Time::month (void) const -{ - return this->dt_.month (); -} - -ADBC_INLINE -void Date_Time::month (long val) -{ - this->dt_.month (val); - this->out_of_date_ = true; -} - -ADBC_INLINE -long Date_Time::day (void) const -{ - return this->dt_.day (); -} - -ADBC_INLINE -void Date_Time::day (long value) -{ - this->dt_.day (value); - this->out_of_date_ = true; -} - -ADBC_INLINE -long Date_Time::year (void) const -{ - return this->dt_.year (); -} - -ADBC_INLINE -void Date_Time::year (long value) -{ - this->dt_.year (value); - this->out_of_date_ = true; -} - -ADBC_INLINE -long Date_Time::hour (void) const -{ - return this->dt_.hour (); -} - -ADBC_INLINE -void Date_Time::hour (long value) -{ - this->dt_.hour (value); - this->out_of_date_ = true; -} - -ADBC_INLINE -long Date_Time::minute (void) const -{ - return this->dt_.minute (); -} - -ADBC_INLINE -void Date_Time::minute (long value) -{ - this->dt_.minute (value); - this->out_of_date_ = true; -} - -ADBC_INLINE -long Date_Time::second (void) const -{ - return this->dt_.second (); -} - -ADBC_INLINE -void Date_Time::second (long value) -{ - this->dt_.second (value); - this->out_of_date_ = true; -} - -ADBC_INLINE -long Date_Time::fraction (void) const -{ - return this->dt_.microsec (); -} - -ADBC_INLINE -void Date_Time::fraction (long val) -{ - this->dt_.microsec (val); - this->out_of_date_ = true; -} -} -} diff --git a/ADBC/adbc/Types.cpp b/ADBC/adbc/Types.cpp deleted file mode 100644 index cf7aa3ad7ca..00000000000 --- a/ADBC/adbc/Types.cpp +++ /dev/null @@ -1,7 +0,0 @@ -// $Id$ - -#include "Types.h" - -#if !defined (__ADBC_INLINE__) -#include "Types.inl" -#endif diff --git a/ADBC/adbc/Types.h b/ADBC/adbc/Types.h deleted file mode 100644 index fff7c58cbe1..00000000000 --- a/ADBC/adbc/Types.h +++ /dev/null @@ -1,151 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Types.h - * - * $Id$ - * - * @author James H. Hill - */ -//============================================================================= - -#ifndef _ADBC_TYPES_H_ -#define _ADBC_TYPES_H_ - -#include "ADBC_export.h" -#include "config.h" - -namespace ADBC -{ -/** - * @class Date_Time - * - * Interface definition for date/time database data types. - */ -class ADBC_Export Date_Time -{ -public: - /// Default constructor. - Date_Time (void); - - /// Destructor. - virtual ~Date_Time (void); - - /** - * Get the month. This value should be within the range of - * 1-12. - * - * @return The month. - */ - virtual long month (void) const = 0; - - /** - * Set the month. - * - * @param[in] val The new month value. - */ - virtual void month (long val) = 0; - - /** - * Get the current day. - * - * @return The day. - */ - virtual long day (void) const = 0; - - /** - * Set the current day. - * - * @param[in] val The new day value. - */ - virtual void day (long val) = 0; - - /** - * Get the current year. - * - * @return The year. - */ - virtual long year (void) const = 0; - - /** - * Set the current year. - * - * @param[in] val The new day value. - */ - virtual void year (long value) = 0; - - /** - * Get the current hour. - * - * @return The current hour. - */ - virtual long hour (void) const = 0; - - /** - * Set the current hour. - * - * @param[in] value The new hour value. - */ - virtual void hour (long) = 0; - - /** - * Get the current minute value. - * - * @return The current minute value. - */ - virtual long minute (void) const = 0; - - /** - * Set the current minute. - * - * @param[in] value The new hour value. - */ - virtual void minute (long value) = 0; - - /** - * Get the current second. - * - * @return The current second value. - */ - virtual long second (void) const = 0; - - /** - * Set the current second. - * - * @param[in] value The new hour value. - */ - virtual void second (long value) = 0; - - /** - * Get the fraction value. - * - * @return The fraction value. - */ - virtual long fraction (void) const = 0; - - /** - * Set the fraction value. - * - * @param[in] val The new fraction value. - */ - virtual void fraction (long val) = 0; - - /** - * Get a pointer to the raw data. - * - * @return Pointer to the data. - */ - virtual void * value (void) = 0; - -private: - Date_Time (const Date_Time &); - const Date_Time & operator = (const Date_Time &); -}; -} - -#if defined (__ADBC_INLINE__) -#include "Types.inl" -#endif - -#endif // !defined _ADBC_TYPES_H_ diff --git a/ADBC/adbc/Types.inl b/ADBC/adbc/Types.inl deleted file mode 100644 index 9297f83d3c8..00000000000 --- a/ADBC/adbc/Types.inl +++ /dev/null @@ -1,23 +0,0 @@ -// -*- C++ -*- -// $Id$ - -namespace ADBC -{ -// -// Date_Time. -// -ADBC_INLINE -Date_Time::Date_Time (void) -{ - -} - -// -// Date_Time -// -ADBC_INLINE -Date_Time::~Date_Time (void) -{ - -} -} diff --git a/ADBC/adbc/config.h b/ADBC/adbc/config.h deleted file mode 100644 index e1a0dbb62b8..00000000000 --- a/ADBC/adbc/config.h +++ /dev/null @@ -1,24 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file config.h - * - * $Id$ - * - * @author James H. Hill - */ -//============================================================================= - -#ifndef _ADBC_CONFIG_H_ -#define _ADBC_CONFIG_H_ - -#include "ace/config.h" - -#if defined (__ADBC_INLINE__) -#define ADBC_INLINE inline -#else -#define ADBC_INLINE -#endif - -#endif // !defined _ADBC_CONFIG_H_ diff --git a/ADBC/adbc/destroy_t.h b/ADBC/adbc/destroy_t.h deleted file mode 100644 index 0e7c2f1cfef..00000000000 --- a/ADBC/adbc/destroy_t.h +++ /dev/null @@ -1,36 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file destroy_t.h - * - * $Id$ - * - * @author James H. Hill - */ -//============================================================================= - -#ifndef _ADBC_DESTROY_T_H_ -#define _ADBC_DESTROY_T_H_ - -namespace ADBC -{ -/** - * @struct destroy_t - * - * Functor for calling the destroy function of a pointer. - */ -template <typename T> -struct destroy_t -{ - /// Type definition of the pointer's type. - typedef T type; - - void operator () (T * ptr) const - { - ptr->destroy (); - } -}; -} - -#endif // !defined _ADBC_DESTORY_T_H_ diff --git a/ADBC/default.features.tmpl b/ADBC/default.features.tmpl deleted file mode 100644 index 71aef0b7a82..00000000000 --- a/ADBC/default.features.tmpl +++ /dev/null @@ -1,22 +0,0 @@ -// $Id$ - -// @feature sqlite3 -// -// Enable this feature to build the SQLite3 backend. - -sqlite3=0 - -// @feature unixodbc -// -// Enable this feature to build the UnixODBC backend. This should -// be set to 0 when building on Windows platforms. - -unixodbc=0 - -// @feature iodbc -// -// Enable this feature to build the iODBC backend. This should be -// set to 0 when building on Windows platforms. - -iodbc=0 - diff --git a/ADBC/examples/ODBC/static/static.cpp b/ADBC/examples/ODBC/static/static.cpp deleted file mode 100644 index a4683864b88..00000000000 --- a/ADBC/examples/ODBC/static/static.cpp +++ /dev/null @@ -1,85 +0,0 @@ -// -*- C++ -*- - -#include "ace/streams.h" -#include "adbc/ODBC/ODBC_Connection.h" -#include "adbc/ODBC/ODBC_Exception.h" - -static const char * __DROP_STMT__ = -"DROP TABLE IF EXISTS signup_sheet"; - -static const char * __CREATE_STMT__ = -"CREATE TABLE IF NOT EXISTS signup_sheet(" -"uid INTEGER PRIMARY KEY AUTOINCREMENT," -"timeofday DATETIME," -"firstname VARCHAR(15)," -"middlename VARCHAR(15)," -"surname VARCHAR(15)" -")"; - -static const char * __INSERT_STMT__ = -"INSERT INTO signup_sheet (timeofday, firstname, middlename, surname) " -"VALUES (NOW(), 'James', 'H.', 'Hill')"; - -static const char * __SELECT_STMT__ = -"SELECT * FROM signup_sheet"; - -// -// main -// -int ACE_TMAIN (int argc, char * argv []) -{ - try - { - // Open a connection to a MySQL database. - ::ADBC::ODBC::Connection conn; - conn.connect ("simple.db"); - - // Allocate a new query. Future versions will allow you to - // declare a query on the stack. - ::ADBC::ODBC::Query query (conn); - - // Execute queries that have no record. - query.execute_no_record (__DROP_STMT__); - query.execute_no_record (__CREATE_STMT__); - query.execute_no_record (__INSERT_STMT__); - - // Execute a query that has a record. - ::ADBC::ODBC::Record & record = query.execute (__SELECT_STMT__); - - // View the results of the query. - ACE_CString timeofday, firstname, middlename, surname; - - for ( ; !record.done (); record.advance ()) - { - //record.get_data (1, timeofday); - //record.get_data (2, firstname); - //record.get_data (3, middlename); - //record.get_data (4, surname); - - std::cout << timeofday << " - " - << firstname << " " << middlename << " " << surname - << std::endl; - } - - return 0; - } - catch (const ::ADBC::ODBC::Exception & ex) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%T (%t) - %M - %s\n"), - ex.message ().c_str ())); - } - catch (const ::ADBC::Exception & ex) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%T (%t) - %M - %s\n"), - ex.message ().c_str ())); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%T (%t) - %M - caught unknown exception\n"))); - } - - return 1; -} diff --git a/ADBC/examples/ODBC/static/static.mpc b/ADBC/examples/ODBC/static/static.mpc deleted file mode 100644 index 2b94de3e9e8..00000000000 --- a/ADBC/examples/ODBC/static/static.mpc +++ /dev/null @@ -1,10 +0,0 @@ -// $Id$ - -project (static) : adbc_odbc { - exename = static - install = . - - Source_Files { - static.cpp - } -} diff --git a/ADBC/examples/ODBC/static/static.mwc b/ADBC/examples/ODBC/static/static.mwc deleted file mode 100644 index e753c8eec08..00000000000 --- a/ADBC/examples/ODBC/static/static.mwc +++ /dev/null @@ -1,6 +0,0 @@ -// $Id$ - -workspace { - cmdline += -include $ADBC_ROOT/MPC/config \ - -feature_file $ADBC_ROOT/default.features -} diff --git a/ADBC/examples/SQLite/dynamic/dynamic.cpp b/ADBC/examples/SQLite/dynamic/dynamic.cpp deleted file mode 100644 index 46762086685..00000000000 --- a/ADBC/examples/SQLite/dynamic/dynamic.cpp +++ /dev/null @@ -1,92 +0,0 @@ -// -*- C++ -*- - -#include "ace/Auto_Functor.h" -#include "ace/streams.h" -#include "adbc/SQLite/Connection.h" -#include "adbc/SQLite/Exception.h" -#include "adbc/destroy_t.h" - -static const char * __DROP_STMT__ = -"DROP TABLE IF EXISTS signup_sheet"; - -static const char * __CREATE_STMT__ = -"CREATE TABLE IF NOT EXISTS signup_sheet(" -"uid INTEGER PRIMARY KEY AUTOINCREMENT," -"timeofday DATETIME," -"firstname TEXT," -"middlename TEXT," -"surname TEXT" -")"; - -static const char * __INSERT_STMT__ = -"INSERT INTO signup_sheet (timeofday, firstname, middlename, surname) " -"VALUES (DATETIME('NOW'), 'James', 'H.', 'Hill')"; - -static const char * __SELECT_STMT__ = -"SELECT * FROM signup_sheet"; - -// -// main -// -int ACE_TMAIN (int argc, char * argv []) -{ - try - { - // Open a connection to the database, which is a SQLite3 file. - ::ADBC::SQLite::Connection conn; - conn.connect ("simple.db"); - - // Allocate a new query. Future versions will allow you to - // declare a query on the stack. - ::ADBC::SQLite::Query * query = conn.create_query (); - - // Make sure that we delete the query. - ACE_Utils::Auto_Functor <::ADBC::SQLite::Query, - ::ADBC::destroy_t <::ADBC::SQLite::Query> > - auto_destroy (query); - - // Execute queries that have no record. - query->execute_no_record (__DROP_STMT__); - query->execute_no_record (__CREATE_STMT__); - query->execute_no_record (__INSERT_STMT__); - - // Execute a query that has a record. - ::ADBC::SQLite::Record & record = query->execute (__SELECT_STMT__); - - // View the results of the query. - ACE_CString timeofday, firstname, middlename, surname; - - for ( ; !record.done (); record.advance ()) - { - record.get_data (1, timeofday); - record.get_data (2, firstname); - record.get_data (3, middlename); - record.get_data (4, surname); - - std::cout << timeofday << " - " - << firstname << " " << middlename << " " << surname - << std::endl; - } - - return 0; - } - catch (const ::ADBC::SQLite::Exception & ex) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%T (%t) - %M - %s\n"), - ex.message ().c_str ())); - } - catch (const ::ADBC::Exception & ex) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%T (%t) - %M - %s\n"), - ex.message ().c_str ())); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%T (%t) - %M - caught unknown exception\n"))); - } - - return 1; -} diff --git a/ADBC/examples/SQLite/dynamic/dynamic.mpc b/ADBC/examples/SQLite/dynamic/dynamic.mpc deleted file mode 100644 index 60e42da52c9..00000000000 --- a/ADBC/examples/SQLite/dynamic/dynamic.mpc +++ /dev/null @@ -1,10 +0,0 @@ -// $Id$ - -project (dynamic) : adbc_sqlite { - exename = dynamic - install = . - - Source_Files { - dynamic.cpp - } -} diff --git a/ADBC/examples/SQLite/dynamic/dynamic.mwc b/ADBC/examples/SQLite/dynamic/dynamic.mwc deleted file mode 100644 index 85c7f5eb15a..00000000000 --- a/ADBC/examples/SQLite/dynamic/dynamic.mwc +++ /dev/null @@ -1,5 +0,0 @@ -// $Id$ - -workspace { - cmdline += -include $ADBC_ROOT/MPC/config -} diff --git a/ADBC/examples/SQLite/simple/simple.cpp b/ADBC/examples/SQLite/simple/simple.cpp deleted file mode 100644 index 756ebf20d20..00000000000 --- a/ADBC/examples/SQLite/simple/simple.cpp +++ /dev/null @@ -1,86 +0,0 @@ -// -*- C++ -*- - -#include "ace/Auto_Functor.h" -#include "ace/streams.h" -#include "adbc/SQLite/Connection.h" -#include "adbc/SQLite/Exception.h" - -static const char * __DROP_STMT__ = -"DROP TABLE IF EXISTS signup_sheet"; - -static const char * __CREATE_STMT__ = -"CREATE TABLE IF NOT EXISTS signup_sheet(" -"uid INTEGER PRIMARY KEY AUTOINCREMENT," -"timeofday DATETIME," -"firstname TEXT," -"middlename TEXT," -"surname TEXT" -")"; - -static const char * __INSERT_STMT__ = -"INSERT INTO signup_sheet (timeofday, firstname, middlename, surname) " -"VALUES (DATETIME('NOW'), 'James', 'H.', 'Hill')"; - -static const char * __SELECT_STMT__ = -"SELECT * FROM signup_sheet"; - -// -// main -// -int ACE_TMAIN (int argc, char * argv []) -{ - try - { - // Open a connection to the database, which is a SQLite3 file. - ::ADBC::SQLite::Connection conn; - conn.connect ("simple.db"); - - // Allocate a new query. Future versions will allow you to - // declare a query on the stack. - ::ADBC::SQLite::Query query (conn); - - // Execute queries that have no record. - query.execute_no_record (__DROP_STMT__); - query.execute_no_record (__CREATE_STMT__); - query.execute_no_record (__INSERT_STMT__); - - // Execute a query that has a record. - ::ADBC::SQLite::Record & record = query.execute (__SELECT_STMT__); - - // View the results of the query. - ACE_CString timeofday, firstname, middlename, surname; - - for ( ; !record.done (); record.advance ()) - { - record.get_data (1, timeofday); - record.get_data (2, firstname); - record.get_data (3, middlename); - record.get_data (4, surname); - - std::cout << timeofday << " - " - << firstname << " " << middlename << " " << surname - << std::endl; - } - - return 0; - } - catch (const ::ADBC::SQLite::Exception & ex) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%T (%t) - %M - %s\n"), - ex.message ().c_str ())); - } - catch (const ::ADBC::Exception & ex) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%T (%t) - %M - %s\n"), - ex.message ().c_str ())); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%T (%t) - %M - caught unknown exception\n"))); - } - - return 1; -} diff --git a/ADBC/examples/SQLite/simple/simple.mpc b/ADBC/examples/SQLite/simple/simple.mpc deleted file mode 100644 index d2dcb8d892c..00000000000 --- a/ADBC/examples/SQLite/simple/simple.mpc +++ /dev/null @@ -1,10 +0,0 @@ -// $Id$ - -project (simple) : adbc_sqlite { - exename = simple - install = . - - Source_Files { - simple.cpp - } -} diff --git a/ADBC/examples/SQLite/simple/simple.mwc b/ADBC/examples/SQLite/simple/simple.mwc deleted file mode 100644 index 85c7f5eb15a..00000000000 --- a/ADBC/examples/SQLite/simple/simple.mwc +++ /dev/null @@ -1,5 +0,0 @@ -// $Id$ - -workspace { - cmdline += -include $ADBC_ROOT/MPC/config -} |