From: helge Date: Wed, 29 Aug 2007 21:23:23 +0000 (+0000) Subject: committed sources of the Inverse Oracle8 adaptor X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92d4fa0b79b4ff7df0fcee4b16b5529d296a9b20;p=sope committed sources of the Inverse Oracle8 adaptor git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1535 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- diff --git a/sope-gdl1/Oracle8/COPYING.LIB b/sope-gdl1/Oracle8/COPYING.LIB new file mode 100644 index 00000000..eb685a5e --- /dev/null +++ b/sope-gdl1/Oracle8/COPYING.LIB @@ -0,0 +1,481 @@ + GNU LIBRARY GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the library GPL. It is + numbered 2 because it goes with version 2 of the ordinary GPL.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Library General Public License, applies to some +specially designated Free Software Foundation software, and to any +other libraries whose authors decide to use it. You can use it for +your libraries, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if +you distribute copies of the library, or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link a program with the library, you must provide +complete object files to the recipients so that they can relink them +with the library, after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + Our method of protecting your rights has two steps: (1) copyright +the library, and (2) offer you this license which gives you legal +permission to copy, distribute and/or modify the library. + + Also, for each distributor's protection, we want to make certain +that everyone understands that there is no warranty for this free +library. If the library is modified by someone else and passed on, we +want its recipients to know that what they have is not the original +version, so that any problems introduced by others will not reflect on +the original authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that companies distributing free +software will individually obtain patent licenses, thus in effect +transforming the program into proprietary software. To prevent this, +we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + + Most GNU software, including some libraries, is covered by the ordinary +GNU General Public License, which was designed for utility programs. This +license, the GNU Library General Public License, applies to certain +designated libraries. This license is quite different from the ordinary +one; be sure to read it in full, and don't assume that anything in it is +the same as in the ordinary license. + + The reason we have a separate public license for some libraries is that +they blur the distinction we usually make between modifying or adding to a +program and simply using it. Linking a program with a library, without +changing the library, is in some sense simply using the library, and is +analogous to running a utility program or application program. However, in +a textual and legal sense, the linked executable is a combined work, a +derivative of the original library, and the ordinary General Public License +treats it as such. + + Because of this blurred distinction, using the ordinary General +Public License for libraries did not effectively promote software +sharing, because most developers did not use the libraries. We +concluded that weaker conditions might promote sharing better. + + However, unrestricted linking of non-free programs would deprive the +users of those programs of all benefit from the free status of the +libraries themselves. This Library General Public License is intended to +permit developers of non-free programs to use free libraries, while +preserving your freedom as a user of such programs to change the free +libraries that are incorporated in them. (We have not seen how to achieve +this as regards changes in header files, but we have achieved it as regards +changes in the actual functions of the Library.) The hope is that this +will lead to faster development of free libraries. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, while the latter only +works together with the library. + + Note that it is possible for a library to be covered by the ordinary +General Public License rather than by this special one. + + GNU LIBRARY GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library which +contains a notice placed by the copyright holder or other authorized +party saying it may be distributed under the terms of this Library +General Public License (also called "this License"). Each licensee is +addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also compile or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + c) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + d) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the source code distributed need not include anything that is normally +distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Library General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/sope-gdl1/Oracle8/ChangeLog b/sope-gdl1/Oracle8/ChangeLog new file mode 100644 index 00000000..419dd155 --- /dev/null +++ b/sope-gdl1/Oracle8/ChangeLog @@ -0,0 +1,11 @@ +2007-08-29 Helge Hess + + * Changed bundle name from Oracle to Oracle8 to avoid clashes with + older adaptors. + +2007-07-25 Ludovic Marcotte + + * Initial version of the SOPE GDL1 Oracle connector which + makes use of the new Oracle OCI API. The initial + version has been tested extensively with the Inverse + edition of SOGo. See the READMe file for all details. diff --git a/sope-gdl1/Oracle8/EOAttribute+Oracle.h b/sope-gdl1/Oracle8/EOAttribute+Oracle.h new file mode 100644 index 00000000..bce5846a --- /dev/null +++ b/sope-gdl1/Oracle8/EOAttribute+Oracle.h @@ -0,0 +1,39 @@ +/* +** EOAttribute+Oracle.h +** +** Copyright (c) 2007 Inverse groupe conseil inc. and Ludovic Marcotte +** +** Author: Ludovic Marcotte +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License as published by the Free Software Foundation; either +** version 2.1 of the License, or (at your option) any later version. +** +** This library is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public +** License along with this library; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#ifndef _OracleEOAttribute_H +#define _OracleEOAttribute_H + +#import + +#include + +@interface EOAttribute (OracleExtensions) + ++ (id) attributeWithOracleType: (ub2) theType + name: (text *) theName + length: (ub4) theLength + width: (ub4) theWidth; + +@end + +#endif diff --git a/sope-gdl1/Oracle8/EOAttribute+Oracle.m b/sope-gdl1/Oracle8/EOAttribute+Oracle.m new file mode 100644 index 00000000..07271685 --- /dev/null +++ b/sope-gdl1/Oracle8/EOAttribute+Oracle.m @@ -0,0 +1,95 @@ +/* +** OracleEOAttribute.m +** +** Copyright (c) 2007 Inverse groupe conseil inc. and Ludovic Marcotte +** +** Author: Ludovic Marcotte +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License as published by the Free Software Foundation; either +** version 2.1 of the License, or (at your option) any later version. +** +** This library is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public +** License along with this library; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#import "EOAttribute+Oracle.h" + +@implementation EOAttribute (OracleExtensions) + ++ (id) attributeWithOracleType: (ub2) theType + name: (text *) theName + length: (ub4) theLength + width: (ub4) theWidth +{ + EOAttribute *attr; + NSString *s; + + attr = [[EOAttribute alloc] init]; + s = AUTORELEASE([[NSString alloc] initWithBytes: theName length: theLength encoding: NSASCIIStringEncoding]); + + // Oracle returns us the column names using uppercase strings. + // We change that to avoid lameness in other parts of GDL. + s = [s lowercaseString]; + + [attr setName: s]; + [attr setColumnName: s]; + [attr setWidth: (unsigned)theWidth]; + + switch (theType) + { + case SQLT_CHR: + [attr setExternalType: @"VARCHAR2"]; + [attr setValueClassName: @"NSString"]; + break; + case SQLT_CLOB: + [attr setExternalType: @"CLOB"]; + [attr setValueClassName: @"NSString"]; + break; + case SQLT_DAT: + // char[7] that contains the date and time but no time zone information. + [attr setExternalType: @"DATE"]; + [attr setValueClassName: @"NSDate"]; + break; + case SQLT_INT: + [attr setExternalType: @"INTEGER"]; + [attr setValueClassName: @"NSNumber"]; + [attr setValueType: @"d"]; + break; + case SQLT_NUM: + // char[22] + [attr setExternalType: @"NUMBER"]; + [attr setValueClassName: @"NSNumber"]; + [attr setValueType: @"d"]; + break; + case SQLT_STR: + [attr setExternalType: @"STRING"]; + [attr setValueClassName: @"NSString"]; + break; + case SQLT_TIMESTAMP: + [attr setExternalType: @"TIMESTAMP"]; + [attr setValueClassName: @"NSCalendarDate"]; + break; + case SQLT_TIMESTAMP_TZ: + [attr setExternalType: @"TIMESTAMP WITH TIME ZONE"]; + [attr setValueClassName: @"NSCalendarDate"]; + break; + case SQLT_TIMESTAMP_LTZ: + [attr setExternalType: @"TIMESTAMP WITH LOCAL TIME ZONE"]; + [attr setValueClassName: @"NSCalendarDate"]; + break; + default: + NSLog(@"Unsupported type! %d\n", theType); + } + + return AUTORELEASE(attr); +} + +@end diff --git a/sope-gdl1/Oracle8/GNUmakefile b/sope-gdl1/Oracle8/GNUmakefile new file mode 100644 index 00000000..09b6a526 --- /dev/null +++ b/sope-gdl1/Oracle8/GNUmakefile @@ -0,0 +1,67 @@ +# +# GNUmakefile +# +# Copyright (c) 2007 Inverse groupe conseil inc. and Ludovic Marcotte +# +# Author: Ludovic Marcotte +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +-include ../../config.make +include $(GNUSTEP_MAKEFILES)/common.make +include ../Version +include ./Version + +# Global properties and dependancies +SOPE_ROOT=../.. + +ADDITIONAL_INCLUDE_DIRS += -I../GDLAccess -I.. -I/usr/include/oracle/10.2.0.3/client + +ifneq ($(frameworks),yes) +Oracle8_BUNDLE_LIBS += -L/usr/lib/oracle/10.2.0.3/client/lib/ -locci -lociei -lclntsh -lnnz10 -lGDLAccess -lEOControl +otest_TOOL_LIBS += -L/usr/lib/oracle/10.2.0.3/client/lib/ -locci -lociei -lclntsh -lnnz10 -lGDLAccess -lEOControl +else +Oracle8_BUNDLE_LIBS += -L/usr/lib/oracle/10.2.0.3/client/lib/ -locci -lociei -lclntsh -lnnz10 -framework GDLAccess -framework EOControl +otest_TOOL_LIBS += -L/usr/lib/oracle/10.2.0.3/client/lib/ -locci -lociei -lclntsh -lnnz10 -framework GDLAccess -framework EOControl +endif + +# Bundle +BUNDLE_NAME = Oracle8 +ifeq ($(frameworks),yes) +BUNDLE_INSTALL_DIR := $(FRAMEWORK_INSTALL_DIR)/GDLAccess.framework/Resources/GDLAdaptors/ +else +BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/GDLAdaptors-$(MAJOR_VERSION).$(MINOR_VERSION)/ +endif + +Oracle8_OBJC_FILES = \ + EOAttribute+Oracle.m \ + OracleAdaptor.m \ + OracleAdaptorChannel.m \ + OracleAdaptorContext.m \ + OracleSQLExpression.m \ + OracleValues.m + +Oracle8_PRINCIPAL_CLASS = OracleAdaptor + +BUNDLE_INSTALL = Oracle8 +BUNDLE_EXTENSION = .gdladaptor +Oracle8_RESOURCE_FILES += Version + +# Tool +TOOL_NAME = otest +otest_OBJC_FILES = otest.m + +include $(GNUSTEP_MAKEFILES)/bundle.make +include $(GNUSTEP_MAKEFILES)/tool.make \ No newline at end of file diff --git a/sope-gdl1/Oracle8/OracleAdaptor.h b/sope-gdl1/Oracle8/OracleAdaptor.h new file mode 100644 index 00000000..2ac90cb5 --- /dev/null +++ b/sope-gdl1/Oracle8/OracleAdaptor.h @@ -0,0 +1,41 @@ +/* +** OracleAdaptor.h +** +** Copyright (c) 2007 Inverse groupe conseil inc. and Ludovic Marcotte +** +** Author: Ludovic Marcotte +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License as published by the Free Software Foundation; either +** version 2.1 of the License, or (at your option) any later version. +** +** This library is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public +** License along with this library; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#ifndef _OracleAdaptor_H +#define _OracleAdaptor_H + +#import +#import + +@interface OracleAdaptor : EOAdaptor +{ +} + +- (NSString *) serverName; +- (NSString *) loginName; +- (NSString *) loginPassword; +- (NSString *) databaseName; +- (NSString *) port; + +@end + +#endif diff --git a/sope-gdl1/Oracle8/OracleAdaptor.m b/sope-gdl1/Oracle8/OracleAdaptor.m new file mode 100644 index 00000000..f5b30c98 --- /dev/null +++ b/sope-gdl1/Oracle8/OracleAdaptor.m @@ -0,0 +1,223 @@ +/* +** OracleAdaptor.h +** +** Copyright (c) 2007 Inverse groupe conseil inc. Ludovic Marcotte +** +** Author: Ludovic Marcotte +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License as published by the Free Software Foundation; either +** version 2.1 of the License, or (at your option) any later version. +** +** This library is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public +** License along with this library; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include "OracleAdaptor.h" + +#import "OracleAdaptorChannel.h" +#import "OracleAdaptorContext.h" +#import "OracleSQLExpression.h" +#import "OracleValues.h" + +// +// +// +@interface OracleAdaptor (Private) + +- (ub2) typeForName: (NSString *) theName; + +@end + +@implementation OracleAdaptor (Private) + +- (ub2) typeForName: (NSString *) theName +{ + ub2 t; + + theName = [theName uppercaseString]; + + if ([theName isEqualToString: @"VARCHAR"]) + { + t = SQLT_CHR; + } + else if ([theName isEqualToString: @"CLOB"]) + { + t = SQLT_CLOB; + } + else if ([theName isEqualToString: @"DATE"]) + { + t = SQLT_DAT; + } + else if ([theName isEqualToString: @"INTEGER"]) + { + t = SQLT_INT; + } + else if ([theName isEqualToString: @"NUMBER"]) + { + t = SQLT_NUM; + } + else if ([theName isEqualToString: @"STRING"]) + { + t = SQLT_STR; + } + else if ([theName isEqualToString: @"TIMESTAMP"]) + { + t = SQLT_TIMESTAMP; + } + else if ([theName isEqualToString: @"TIMESTAMP WITH TIME ZONE"]) + { + t = SQLT_TIMESTAMP_TZ; + } + else if ([theName isEqualToString: @"TIMESTAMP WITH LOCAL TIME ZONE"]) + { + t = SQLT_TIMESTAMP_LTZ; + } + + return t; +} + +@end + + +// +// +// +@implementation OracleAdaptor + +- (id) initWithName: (NSString *) theName +{ + if ((self = [super initWithName: theName])) + { + // On Oracle, we must set the NLS_LANG in order to let Oracle perform + // charset transformations for us. Since, when we write data to the database + // and when we read data from it we assume that we are using UTF-8, we + // set NLS_LANG to the proper value. + setenv("NLS_LANG", "AMERICAN_AMERICA.UTF8", 1); + + return self; + } + + return nil; +} + +// +// +// +- (id) copyWithZone: (NSZone *) theZone +{ + return [self retain]; +} + +// +// +// +- (Class) adaptorContextClass +{ + return [OracleAdaptorContext class]; +} + +// +// +// +- (Class) adaptorChannelClass +{ + return [OracleAdaptorChannel class]; +} + +// +// +// +- (Class) expressionClass +{ + return [OracleSQLExpression class]; +} + +// +// +// +- (EOAdaptorContext *) createAdaptorContext +{ + return AUTORELEASE([[OracleAdaptorContext alloc] initWithAdaptor: self]); +} + +// +// +// +- (NSString *) databaseName +{ + return [[self connectionDictionary] objectForKey: @"databaseName"]; +} + +// +// +// +- (id) formatValue: (id) theValue forAttribute: (EOAttribute *) theAttribute +{ + NSString *s; + + s = [theValue stringValueForOracleType: [self typeForName: [theAttribute externalType]] + attribute: theAttribute]; + + NSLog(@"Formatted %@ (%@) to %@ (NSString)", theValue, NSStringFromClass([theValue class]), s); + + return s; +} + +// +// We don't check the values inside the connection +// dictionary for now.s +// +- (BOOL) hasValidConnectionDictionary +{ + return ([self connectionDictionary] ? YES : NO); +} + +// +// +// +- (BOOL) isValidQualifierType: (NSString *) theTypeName +{ + return YES; +} + +// +// +// +- (NSString *) loginName; +{ + return [[self connectionDictionary] objectForKey: @"userName"]; +} + +// +// +// +- (NSString *) loginPassword +{ + return [[self connectionDictionary] objectForKey: @"password"]; +} + +// +// +// +- (NSString *) port +{ + return [[self connectionDictionary] objectForKey: @"port"]; +} + +// +// +// +- (NSString *) serverName +{ + return [[self connectionDictionary] objectForKey: @"hostName"]; +} + +@end diff --git a/sope-gdl1/Oracle8/OracleAdaptorChannel.h b/sope-gdl1/Oracle8/OracleAdaptorChannel.h new file mode 100644 index 00000000..7c6a4f02 --- /dev/null +++ b/sope-gdl1/Oracle8/OracleAdaptorChannel.h @@ -0,0 +1,53 @@ +/* +** OracleAdaptorChannel.h +** +** Copyright (c) 2007 Inverse groupe conseil inc. and Ludovic Marcotte +** +** Author: Ludovic Marcotte +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License as published by the Free Software Foundation; either +** version 2.1 of the License, or (at your option) any later version. +** +** This library is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public +** License along with this library; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#ifndef _OracleAdaptorChannel_H +#define _OracleAdaptorChannel_H + +#include + +#import + +#import "../GDLContentStore/EOAdaptorChannel+GCS.h" + +@class NSMutableArray; + +@interface OracleAdaptorChannel : EOAdaptorChannel +{ +@private + // Oracle's related ivars + OCIEnv* _oci_env; + OCISvcCtx* _oci_ctx; + OCIError* _oci_err; + OCIStmt* _current_stm; + + // ... + NSMutableArray *_resultSetProperties; + NSMutableArray *_row_buffer; +} + +- (OCISvcCtx *) serviceContext; +- (OCIError *) errorHandle; + +@end + +#endif diff --git a/sope-gdl1/Oracle8/OracleAdaptorChannel.m b/sope-gdl1/Oracle8/OracleAdaptorChannel.m new file mode 100644 index 00000000..65530f71 --- /dev/null +++ b/sope-gdl1/Oracle8/OracleAdaptorChannel.m @@ -0,0 +1,573 @@ +/* +** OracleAdaptorChannel.m +** +** Copyright (c) 2007 Inverse groupe conseil inc. and Ludovic Marcotte +** +** Author: Ludovic Marcotte +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License as published by the Free Software Foundation; either +** version 2.1 of the License, or (at your option) any later version. +** +** This library is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public +** License along with this library; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#import "OracleAdaptorChannel.h" + +#import "OracleAdaptor.h" +#import "OracleAdaptorContext.h" +#import "EOAttribute+Oracle.h" + +#import + +typedef struct +{ + OCIDefine *def; // The define information handle of the column + dvoid *value; // The value of the column (the buffer size is max_width bytes) + ub2 type; // The type of the column + ub2 width; // The current width of the value that has been read + sb4 max_width; // The maximum width of the column +} column_info; + + +// +// +// +@interface OracleAdaptorChannel (Private) + +- (void) _cleanup; + +@end + +@implementation OracleAdaptorChannel (Private) + +- (void) _cleanup +{ + column_info *info; + int c; + + [_resultSetProperties removeAllObjects]; + + c = [_row_buffer count]; + + while (c--) + { + info = [[_row_buffer objectAtIndex: c] pointerValue]; + [_row_buffer removeObjectAtIndex: c]; + + free(info->value); + free(info); + } + + OCIHandleFree(_current_stm, OCI_HTYPE_STMT); + _current_stm = (OCIStmt *)0; +} + +@end + + +// +// +// +@implementation OracleAdaptorChannel + +- (id) initWithAdaptorContext: (EOAdaptorContext *) theAdaptorContext +{ + if ((self = [super initWithAdaptorContext: theAdaptorContext])) + { + _resultSetProperties = [[NSMutableArray alloc] init]; + _row_buffer = [[NSMutableArray alloc] init]; + + _oci_env = (OCIEnv *)0; + _oci_err = (OCIError *)0; + _current_stm = (OCIStmt *)0; + return self; + } + + return nil; +} + +// +// +// +- (id) copyWithZone: (NSZone *) theZone +{ + return [self retain]; +} + +// +// +// +- (void) cancelFetch +{ + // Oracle's doc says: "If you call OCIStmtFetch2() with the nrows parameter set to 0, this cancels the cursor." + if (OCIStmtFetch2(_current_stm, _oci_err, (ub4)0, (ub4)OCI_FETCH_NEXT, (sb4)0, (ub4)OCI_DEFAULT)) + { + [self logWithFormat: @"Fetch cancellation failed"]; + } + + [self _cleanup]; + [super cancelFetch]; +} + +// +// +// +- (void) closeChannel +{ + if ([self isOpen]) + { + [super closeChannel]; + + // We logoff from the database. + if (OCILogoff(_oci_ctx, _oci_err)) + { + [self logWithFormat: @"FAILED: OCILogoff()"]; + } + } +} + +// +// +// +- (void) dealloc +{ + //NSLog(@"OracleAdaptorChannel: -dealloc"); + + [self _cleanup]; + + RELEASE(_resultSetProperties); + + OCIHandleFree(_oci_ctx, OCI_HTYPE_SVCCTX); + OCIHandleFree(_oci_err, OCI_HTYPE_ERROR); + OCIHandleFree(_oci_env, OCI_HTYPE_ENV); + + [super dealloc]; +} + +// +// TODO later +// +- (EOModel*) describeModelWithTableNames: (NSArray *) theTableNames +{ + return nil; +} + +// +// TODO later +// +- (NSArray *) describeTableNames +{ + return nil; +} + +// +// This breaks EOF 4.5 support. +// +- (NSArray *) describeResults: (BOOL) theBOOL +{ + return [NSArray arrayWithArray: _resultSetProperties]; +} + +// +// This breaks EOF 4.5 support. +// +// We must: 1. send the database request +// 2. process the results +// 3. call -adaptorChannel:didEvaluateExpression: +// +- (BOOL) evaluateExpression: (NSString *) theExpression +{ + EOAttribute *attribute; + OCIParam *param; + + column_info *info; + ub4 i, clen, count; + text *sql, *cname; + sword status; + ub2 type; + + [self _cleanup]; + + if (!theExpression || ![theExpression length]) + { + [NSException raise: @"OracleInvalidExpressionException" + format: @"Passed an invalid (nil or length == 0) SQL expression"]; + } + + if (![self isOpen]) + { + [NSException raise: @"OracleChannelNotOpenException" + format: @"Called -evaluateExpression: prior to -openChannel"]; + } + + sql = (text *)[theExpression UTF8String]; + + // We alloc our statement handle + if (OCIHandleAlloc((dvoid *)_oci_env, (dvoid **)&_current_stm, (ub4)OCI_HTYPE_STMT, (CONST size_t) 0, (dvoid **) 0)) + { + [self logWithFormat: @"Can't allocate statement."]; + return NO; + } + + // We prepare our statement + if (OCIStmtPrepare(_current_stm, _oci_err, sql, strlen((const char *)sql), OCI_NTV_SYNTAX, OCI_DEFAULT)) + { + [self logWithFormat: @"Prepare failed: OCI_ERROR"]; + return NO; + } + + // We check if we're doing a SELECT and if so, we're fetching data! + OCIAttrGet(_current_stm, OCI_HTYPE_STMT, &type, 0, OCI_ATTR_STMT_TYPE, _oci_err); + self->isFetchInProgress = (type == OCI_STMT_SELECT ? YES : NO); + + // We execute our statement. Not that we _MUST_ set iter to 0 for non-SELECT statements. + if (OCIStmtExecute(_oci_ctx, _current_stm, _oci_err, (self->isFetchInProgress ? (ub4)0 : (ub4)1), (ub4)0, (CONST OCISnapshot *)NULL, (OCISnapshot *)NULL, + ([(OracleAdaptorContext *)[self adaptorContext] autoCommit] ? OCI_COMMIT_ON_SUCCESS :OCI_DEFAULT))) + { + [self logWithFormat: @"Statement execute failed (OCI_ERROR): %@", theExpression]; + return NO; + } + + // We check the number of params (ie., columns) + if (OCIAttrGet((dvoid *)_current_stm, OCI_HTYPE_STMT, (dvoid *)&count, (ub4 *)0, OCI_ATTR_PARAM_COUNT, _oci_err)) + { + [self logWithFormat: @"Attribute get failed (OCI_ERROR): %@", theExpression]; + return NO; + } + + // We decode the columns' types + for (i = 1; i < count+1; i++) + { + // We alloc our info structure. This will hold the values being + // read when we fetch data from the result set. + info = (void *)malloc(sizeof(column_info)); + + // We fetch the parameter + status = OCIParamGet((dvoid *)_current_stm, OCI_HTYPE_STMT, _oci_err, (dvoid **)¶m, (ub4)i); + + // We get the param's type + status = OCIAttrGet((dvoid*)param, (ub4)OCI_DTYPE_PARAM, (dvoid*)&(info->type), (ub4 *)0, (ub4)OCI_ATTR_DATA_TYPE, (OCIError *)_oci_err); + + // We read the column's name (name of the param) and name's length + clen = 0; + status = OCIAttrGet((dvoid*)param, (ub4)OCI_DTYPE_PARAM, (dvoid**)&cname, (ub4 *)&clen, (ub4)OCI_ATTR_NAME, (OCIError *)_oci_err); + + // We read the maximum width of a column + info->max_width = 0; + status = OCIAttrGet((dvoid*)param, (ub4)OCI_DTYPE_PARAM, (dvoid*)&(info->max_width), (ub4 *)0, (ub4)OCI_ATTR_DATA_SIZE, (OCIError *)_oci_err); + + attribute = [EOAttribute attributeWithOracleType: info->type name: cname length: clen width: info->max_width]; + [_resultSetProperties addObject: attribute]; + + // We now must bind our column name with a buffer in which we'll read into + info->value = calloc(info->max_width, 1); + + // + // Oracle's doc says: "SQLT_CHAR and SQLT_LNG can be specified for CLOB columns, and SQLT_BIN sand SQLT_LBI for BLOB columns." + // Also, for LOB, it says: "The bind of more than 4 kilobytes of data to a LOB column uses space from the temporary tablespace." + // + // For now, we read - SQLT_CLOB as SQLT_CHR + // - SQLT_NUM as SQLT_INT + // + switch (info->type) + { + case SQLT_CLOB: + type = SQLT_CHR; + break; + + case SQLT_NUM: + type = SQLT_INT; + info->max_width = 4; + break; + + default: + type = info->type; + } + + // + // Oracle's documentation says:"For a LOB, the buffer pointer must be a pointer to a LOB locator of type OCILobLocator. + // Give the address of the pointer." + // + info->def = (OCIDefine*)0; + + if ((status = OCIDefineByPos(_current_stm, &(info->def), _oci_err, i, (dvoid *)info->value, info->max_width, type, + (dvoid *)0, (ub2 *)&(info->width), (ub2 *)0, OCI_DEFAULT))) + { + NSLog(@"OCIDefineByPos FAILED"); + abort(); + } + + [_row_buffer addObject: [NSValue valueWithPointer: info]]; + + // We free up our param handle. + OCIHandleFree((dvoid*)param, OCI_HTYPE_STMT); + } + + return YES; +} + +// +// +// +- (OCIError *) errorHandle +{ + return _oci_err; +} + +// +// +// +- (BOOL) isOpen +{ + return (_oci_env ? YES : NO); +} + +// +// This breaks EOF 4.5 support. +// +- (BOOL) openChannel +{ + OracleAdaptor *o; + + const char *username, *password, *database; + + if (![super openChannel] || [self isOpen]) + { + return NO; + } + + // We Initialize the OCI process environment. + if (OCIInitialize((ub4)OCI_DEFAULT, (dvoid *)0, + (dvoid * (*)(dvoid *, size_t)) 0, + (dvoid * (*)(dvoid *, dvoid *, size_t))0, + (void (*)(dvoid *, dvoid *)) 0 )) + { + [self logWithFormat: @"FAILED: OCIInitialize()"]; + return NO; + } + + if (OCIEnvInit((OCIEnv **)&_oci_env, (ub4)OCI_DEFAULT, (size_t)0, (dvoid **)0)) + { + [self logWithFormat: @"FAILED: OCIEnvInit()"]; + return NO; + } + + if (OCIHandleAlloc((dvoid *)_oci_env, (dvoid *)&_oci_err, (ub4)OCI_HTYPE_ERROR, (size_t)0, (dvoid **)0)) + { + [self logWithFormat: @"FAILED: OCIHandleAlloc() on errhp"]; + return NO; + } + + o = (OracleAdaptor *)[[self adaptorContext] adaptor]; + username = [[o loginName] UTF8String]; + password = [[o loginPassword] UTF8String]; + + // Under Oracle 10g, the third parameter of OCILogon() has the form: [//]host[:port][/service_name] + // See http://download-west.oracle.com/docs/cd/B12037_01/network.101/b10775/naming.htm#i498306 for + // all juicy details. + database = [[NSString stringWithFormat:@"%@:%@", [o serverName], [o port]] UTF8String]; + + // We logon to the database. + if (OCILogon(_oci_env, _oci_err, &_oci_ctx, (const OraText*)username, strlen(username), + (const OraText*)password, strlen(password), (const OraText*)database, strlen(database))) + { + [self logWithFormat: @"FAILED: OCILogon(). username = %s password = %s" + @" database = %s", username, password, database]; + return NO; + } + + return YES; +} + +// +// We map the attributes to the values. +// +// For now, we ignore the passed attributes and we initialize the full row. +// +- (NSMutableDictionary *) primaryFetchAttributes: (NSArray *) theAttributes + withZone: (NSZone *) theZone +{ + sword status; + + status = OCIStmtFetch2(_current_stm, _oci_err, (ub4)1, (ub4)OCI_FETCH_NEXT, (sb4)0, (ub4)OCI_DEFAULT); + + if (status == OCI_NO_DATA) + { + //NSLog(@"No DATA!"); + self->isFetchInProgress = NO; + } + else + { + NSMutableDictionary *row; + column_info *info; + int i, c; + id o; + + c = [_resultSetProperties count]; + row = [NSMutableDictionary dictionaryWithCapacity: c]; + + // We decode all column values we got in our result set + for (i = 0; i < c; i++) + { + info = [[_row_buffer objectAtIndex: i] pointerValue]; + + //NSLog(@"========== NEW COLUMN =============="); + //NSLog(@"Read type %d, width %d at %d", info->type, info->width, info->value); + o = nil; + + // On Oracle, if we've read a lenght of 0, it means that we got a NULL. + if (info->width == 0) + { + o = [NSNull null]; + } + else + { + switch (info->type) + { + case SQLT_CHR: + case SQLT_CLOB: + case SQLT_STR: + o = AUTORELEASE([[NSString alloc] initWithBytes: info->value length: info->width encoding: NSUTF8StringEncoding]); + break; + + case SQLT_DAT: + { + signed char *buf; + + buf = (signed char*)info->value; + o = [NSCalendarDate dateWithYear: (buf[0]-100)*100+buf[1]-100 + month: buf[2] + day: buf[3] + hour: buf[4]-1 + minute: buf[5]-1 + second: buf[6]-1 + timeZone: [NSTimeZone timeZoneWithAbbreviation:@"GMT"]]; + + } + break; + + case SQLT_INT: + case SQLT_NUM: + switch (info->width) + { + case 1: + o = [NSNumber numberWithChar: *(char*)(info->value)]; + break; + case 2: + o = [NSNumber numberWithShort: *(short*)(info->value)]; + break; + case 8: + o = [NSNumber numberWithLongLong: *(long long*)(info->value)]; + break; + case 4: + default: + o = [NSNumber numberWithInt: *(int*)(info->value)]; + break; + } + break; + + case SQLT_TIMESTAMP: + case SQLT_TIMESTAMP_TZ: + case SQLT_TIMESTAMP_LTZ: + { + // FIXME implement + //o = [NSDate date]; + } + break; + + default: + NSLog(@"Unknown type! %d", info->type); + } + } + + if (!o) o = [NSNull null]; + [row setObject: o forKey: [[_resultSetProperties objectAtIndex: i] name]]; + } + + return row; + } + + return nil; +} + +// +// TODO later +// +#if 0 +- (NSDictionary *) primaryKeyForNewRowWithEntity: (EOEntity *) theEntity +{ + +} +#endif + +// +// TODO later +// +#if 0 +- (BOOL) readTypesForEntity: (EOEntity *) theEntity +{ + return NO; +} +#endif + +// +// TODO later +// +#if 0 +- (BOOL) readTypeForAttribute: (EOAttribute *) theAttribute +{ + return NO; +} +#endif + +// +// +// +- (OCISvcCtx *) serviceContext +{ + return _oci_ctx; +} + +/* GCSEOAdaptorChannel protocol */ +static NSString *sqlFolderFormat = (@"CREATE TABLE %@ (\n" \ + @" c_name VARCHAR2 (256) NOT NULL,\n" + @" c_content CLOB NOT NULL,\n" + @" c_creationdate INTEGER NOT NULL,\n" + @" c_lastmodified INTEGER NOT NULL,\n" + @" c_version INTEGER NOT NULL,\n" + @" c_deleted INTEGER NOT NULL\n" + @")"); +static NSString *sqlFolderACLFormat = (@"CREATE TABLE %@ (\n" \ + @" c_uid VARCHAR (256) NOT NULL,\n" + @" c_object VARCHAR (256) NOT NULL,\n" + @" c_role VARCHAR (80) NOT NULL\n" + @")"); + +- (NSException *) createGCSFolderTableWithName: (NSString *) tableName +{ + NSString *sql; + + sql = [NSString stringWithFormat: sqlFolderFormat, tableName]; + + return [self evaluateExpressionX: sql]; +} + +- (NSException *) createGCSFolderACLTableWithName: (NSString *) tableName +{ + NSString *sql; + + sql = [NSString stringWithFormat: sqlFolderACLFormat, tableName]; + + return [self evaluateExpressionX: sql]; +} + +@end diff --git a/sope-gdl1/Oracle8/OracleAdaptorContext.h b/sope-gdl1/Oracle8/OracleAdaptorContext.h new file mode 100644 index 00000000..5f171ead --- /dev/null +++ b/sope-gdl1/Oracle8/OracleAdaptorContext.h @@ -0,0 +1,40 @@ +/* +** OracleAdaptorContext.h +** +** Copyright (c) 2007 Inverse groupe conseil inc. and Ludovic Marcotte +** +** Author: Ludovic Marcotte +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License as published by the Free Software Foundation; either +** version 2.1 of the License, or (at your option) any later version. +** +** This library is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public +** License along with this library; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#ifndef _OracleAdaptorContext_H +#define _OracleAdaptorContext_H + +#import +#import + +@interface OracleAdaptorContext : EOAdaptorContext +{ + @private + BOOL _autocommit; +} + +- (BOOL) autoCommit; +- (void) setAutoCommit: (BOOL) theBOOL; + +@end + +#endif diff --git a/sope-gdl1/Oracle8/OracleAdaptorContext.m b/sope-gdl1/Oracle8/OracleAdaptorContext.m new file mode 100644 index 00000000..c4aea002 --- /dev/null +++ b/sope-gdl1/Oracle8/OracleAdaptorContext.m @@ -0,0 +1,133 @@ +/* +** OracleAdaptorContext.m +** +** Copyright (c) 2007 Inverse groupe conseil inc. and Ludovic Marcotte +** +** Author: Ludovic Marcotte +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License as published by the Free Software Foundation; either +** version 2.1 of the License, or (at your option) any later version. +** +** This library is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public +** License along with this library; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#import "OracleAdaptorContext.h" + +#import "OracleAdaptorChannel.h" + +#define DEFAULT_TRANSACTION_TIMEOUT 60 + +// +// +// +@implementation OracleAdaptorContext + +- (id) copyWithZone: (NSZone *) theZone +{ + return [self retain]; +} + +// +// +// +- (BOOL) canNestTransactions +{ + return NO; +} + +// +// +// +- (void) channelDidInit: (id) theChannel +{ + if ([[self channels] count] > 0) + { + [NSException raise: @"OracleContextException" + format: @"Channel already initiated for the actual context"]; + } + + [super channelDidInit: theChannel]; +} + +// +// +// +- (EOAdaptorChannel *) createAdaptorChannel +{ + return AUTORELEASE([[OracleAdaptorChannel alloc] initWithAdaptorContext: self]); +} + +// +// +// +- (id) initWithAdaptor: (EOAdaptor *) theAdaptor +{ + self = [super initWithAdaptor: theAdaptor]; + + _autocommit = YES; + + return self; +} + +// +// +// +- (BOOL) primaryBeginTransaction +{ + id o; + + o = [[self channels] lastObject]; + + return (OCITransStart([o serviceContext], [o errorHandle], (uword)DEFAULT_TRANSACTION_TIMEOUT, OCI_TRANS_NEW) == OCI_ERROR ? NO : YES); +} + +// +// +// +- (BOOL) primaryCommitTransaction +{ + id o; + + o = [[self channels] lastObject]; + + return (OCITransCommit([o serviceContext], [o errorHandle], OCI_DEFAULT) == OCI_ERROR ? NO : YES); +} + +// +// +// +- (BOOL) primaryRollbackTransaction +{ + id o; + + o = [[self channels] lastObject]; + + return (OCITransRollback([o serviceContext], [o errorHandle], OCI_DEFAULT) == OCI_ERROR ? NO : YES); +} + +// +// +// +- (BOOL) autoCommit +{ + return _autocommit; +} + +// +// +// +- (void) setAutoCommit: (BOOL) theBOOL +{ + _autocommit = theBOOL; +} + +@end diff --git a/sope-gdl1/Oracle8/OracleSQLExpression.h b/sope-gdl1/Oracle8/OracleSQLExpression.h new file mode 100644 index 00000000..e0920a31 --- /dev/null +++ b/sope-gdl1/Oracle8/OracleSQLExpression.h @@ -0,0 +1,35 @@ +/* +** OracleSQLExpression.h +** +** Copyright (c) 2007 Inverse groupe conseil inc. and Ludovic Marcotte +** +** Author: Ludovic Marcotte +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License as published by the Free Software Foundation; either +** version 2.1 of the License, or (at your option) any later version. +** +** This library is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public +** License along with this library; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#ifndef _OracleSQLExpression_H +#define _OracleSQLExpression_H + +#import +#import + +@interface OracleSQLExpression : EOSQLExpression +{ +} + +@end + +#endif diff --git a/sope-gdl1/Oracle8/OracleSQLExpression.m b/sope-gdl1/Oracle8/OracleSQLExpression.m new file mode 100644 index 00000000..df8eb3e2 --- /dev/null +++ b/sope-gdl1/Oracle8/OracleSQLExpression.m @@ -0,0 +1,27 @@ +/* +** OracleSQLExpression.m +** +** Copyright (c) 2007 Inverse groupe conseil inc. and Ludovic Marcotte +** +** Author: Ludovic Marcotte +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License as published by the Free Software Foundation; either +** version 2.1 of the License, or (at your option) any later version. +** +** This library is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public +** License along with this library; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#import "OracleSQLExpression.h" + +@implementation OracleSQLExpression + +@end diff --git a/sope-gdl1/Oracle8/OracleValues.h b/sope-gdl1/Oracle8/OracleValues.h new file mode 100644 index 00000000..851a9380 --- /dev/null +++ b/sope-gdl1/Oracle8/OracleValues.h @@ -0,0 +1,43 @@ +/* +** OracleValues.h +** +** Copyright (c) 2007 Inverse groupe conseil inc. and Ludovic Marcotte +** +** Author: Ludovic Marcotte +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License as published by the Free Software Foundation; either +** version 2.1 of the License, or (at your option) any later version. +** +** This library is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public +** License along with this library; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#ifndef _OracleValues_H +#define _OracleValues_H + +#import +#import + +#include + +@interface NSNumber (OracleExtensions) + +- (NSString *) stringValueForOracleType: (ub2) theType + attribute: (EOAttribute *) theAttribute; +@end + +@interface NSString (OracleExtensions) + +- (NSString *) stringValueForOracleType: (ub2) theType + attribute: (EOAttribute *) theAttribute; +@end + +#endif diff --git a/sope-gdl1/Oracle8/OracleValues.m b/sope-gdl1/Oracle8/OracleValues.m new file mode 100644 index 00000000..4d116827 --- /dev/null +++ b/sope-gdl1/Oracle8/OracleValues.m @@ -0,0 +1,49 @@ +/* +** OracleValues.m +** +** Copyright (c) 2007 Inverse groupe conseil inc. and Ludovic Marcotte +** +** Author: Ludovic Marcotte +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License as published by the Free Software Foundation; either +** version 2.1 of the License, or (at your option) any later version. +** +** This library is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser General Public +** License along with this library; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include "OracleValues.h" + +// +// +// +@implementation NSNumber (OracleExtensions) + +- (NSString *) stringValueForOracleType: (ub2) theType + attribute: (EOAttribute *) theAttribute +{ + return [self stringValue]; +} + +@end + +// +// +// +@implementation NSString (OracleExtensions) + +- (NSString *) stringValueForOracleType: (ub2) theType + attribute: (EOAttribute *) theAttribute +{ + return self; +} + +@end diff --git a/sope-gdl1/Oracle8/README b/sope-gdl1/Oracle8/README new file mode 100644 index 00000000..ba23d225 --- /dev/null +++ b/sope-gdl1/Oracle8/README @@ -0,0 +1,70 @@ +Oracle 10g GDL Adaptor +Copyright (c) 2007 Inverse groupe conseil inc. and Ludovic Marcotte +==================================================================== + +This adaptor allows you to use an Oracle 10g (or above/below) server togeter +with GDL. It makes use of the new OCI API from Oracle. In order to compile +and use this adaptor, you must install the Oracle Instant Client. + +For Linux-based operating systems, please refer to the following page +for installation instructions: + +http://www.oracle.com/technology/software/tech/oci/instantclient/htdocs/linuxsoft.html + +You'll have to install the following packages from Oracle: + + * oracle-instantclient-basic + * oracle-instantclient-devel + +Once you've installed the requirements, follow the installation and configuration +instructions to get the adaptor working. + + +Installation and Configuration +============================== + +1- Based on where you've installed the Oracle dependancies, modify the + GNUmakefile so gnustep-make can fin the location of Oracle's headers + and client librairies. + +2- Compile and install the adaptor: + % make + % make install + + +Testing the Oracle Adaptor +========================== + +The adaptor comes with a simple testing tool called 'otest'. + +To try it, first modify the database connection parameters specified in the +'condict.plist' file. + +Then, simply run the tool: + +% ./obj/otest + +This will do a simple "SELECT * FROM all_tables" + + +Current limitations +=================== + +The adaptor currently supports only the following data types: + + - CLOB + - DATE + - INTEGER + - NUMBER + - STRING + - VARCHAR2 + +CLOB are read as strings. + +The adaptor does not yet support the EOModel kungfu. The following +improvements are also coming soon: + + - primary key generation support + - schema selection support + - delegate calls, when required + - more datatypes support diff --git a/sope-gdl1/Oracle8/Version b/sope-gdl1/Oracle8/Version new file mode 100644 index 00000000..648edbe2 --- /dev/null +++ b/sope-gdl1/Oracle8/Version @@ -0,0 +1,3 @@ +# Version file + +SUBMINOR_VERSION:=2 diff --git a/sope-gdl1/Oracle8/condict.plist b/sope-gdl1/Oracle8/condict.plist new file mode 100644 index 00000000..88523aed --- /dev/null +++ b/sope-gdl1/Oracle8/condict.plist @@ -0,0 +1,7 @@ +{ + hostName = "oracle"; + userName = "focus"; + password = "focusrocks"; + databaseName = "oracle"; + port = 1521; +} diff --git a/sope-gdl1/Oracle8/otest.m b/sope-gdl1/Oracle8/otest.m new file mode 100644 index 00000000..4378c4da --- /dev/null +++ b/sope-gdl1/Oracle8/otest.m @@ -0,0 +1,79 @@ +/* +** otest.m +** +** Copyright (c) 2007 Inverse groupe conseil inc. and Ludovic Marcotte +** +** Author: Ludovic Marcotte +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#import +#import + +// +// +// +void evaluate(EOAdaptorChannel *c, NSString *s) +{ + NSLog(@"Evaluating:\t%@",s); + if ([c evaluateExpression: s]) + { + NSDictionary *record; + NSArray *attributes; + + attributes = [c describeResults]; + NSLog(@"attributes = %@", [attributes description]); + + while ((record = [c fetchAttributes: attributes withZone: NULL])) + { + NSLog(@"record = %@", record); + } + } +} + +// +// +// +int main (int argc, char **argv, char **env) +{ + NSAutoreleasePool *pool; + + EOAdaptorChannel *channel; + EOAdaptorContext *ctx; + EOAdaptor *adaptor; + + pool = [[NSAutoreleasePool alloc] init]; + [NSProcessInfo initializeWithArguments: argv count: argc environment: env]; + + adaptor = [EOAdaptor adaptorWithName: @"Oracle"]; + [adaptor setConnectionDictionary: [NSDictionary dictionaryWithContentsOfFile: @"condict.plist"]]; + ctx = [adaptor createAdaptorContext]; + channel = [ctx createAdaptorChannel]; + + [channel openChannel]; + [ctx beginTransaction]; + + //evaluate(channel, @"SELECT * FROM all_tables"); + evaluate(channel, @"SELECT COUNT(*) FROM all_tables"); + evaluate(channel, @"SELECT 1 FROM dual"); + evaluate(channel, @"SELECT sysdate FROM dual"); + + [ctx commitTransaction]; + [channel closeChannel]; + [pool release]; + + return 0; +}