diff --git a/COPYING b/COPYING deleted file mode 100644 --- a/COPYING +++ /dev/null @@ -1,510 +0,0 @@ - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 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 Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - 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 Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations -below. - - When we speak of free software, we are referring to freedom of use, -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 and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -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 other code 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. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it -becomes a de-facto standard. To achieve this, non-free programs must -be allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - 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, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser 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 combine 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) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) 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. - - d) 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. - - e) 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 materials to be 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 with -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 Lesser 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 - - 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 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 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/COPYRIGHT b/COPYRIGHT deleted file mode 100644 --- a/COPYRIGHT +++ /dev/null @@ -1,18 +0,0 @@ -Copyright (C) 2005-2009 John Goerzen - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Please see COPYING for the license. - diff --git a/Database/HDBC/ODBC.hs b/Database/HDBC/ODBC.hs --- a/Database/HDBC/ODBC.hs +++ b/Database/HDBC/ODBC.hs @@ -1,25 +1,7 @@ -{- -Copyright (C) 2005 John Goerzen - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA --} - {- | Module : Database.HDBC.ODBC Copyright : Copyright (C) 2005 John Goerzen - License : GNU LGPL, version 2.1 or above + License : BSD3 Maintainer : John Goerzen Stability : provisional diff --git a/Database/HDBC/ODBC/Connection.hsc b/Database/HDBC/ODBC/Connection.hsc --- a/Database/HDBC/ODBC/Connection.hsc +++ b/Database/HDBC/ODBC/Connection.hsc @@ -1,23 +1,6 @@ -- -*- mode: haskell; -*- {-# CFILES hdbc-odbc-helper.c #-} -- Above line for hugs -{- -Copyright (C) 2005-2009 John Goerzen - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA --} module Database.HDBC.ODBC.Connection (connectODBC, Impl.Connection) where diff --git a/Database/HDBC/ODBC/ConnectionImpl.hs b/Database/HDBC/ODBC/ConnectionImpl.hs --- a/Database/HDBC/ODBC/ConnectionImpl.hs +++ b/Database/HDBC/ODBC/ConnectionImpl.hs @@ -1,21 +1,3 @@ -{- -Copyright (C) 2007 John Goerzen - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA --} - module Database.HDBC.ODBC.ConnectionImpl where import qualified Database.HDBC.Statement as Types diff --git a/Database/HDBC/ODBC/Statement.hsc b/Database/HDBC/ODBC/Statement.hsc --- a/Database/HDBC/ODBC/Statement.hsc +++ b/Database/HDBC/ODBC/Statement.hsc @@ -1,30 +1,23 @@ -- -*- mode: haskell; -*- {-# CFILES hdbc-odbc-helper.c #-} -- Above line for hugs -{- -Copyright (C) 2005-2006 John Goerzen - - 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. +{-# LANGUAGE EmptyDataDecls #-} - 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. +module Database.HDBC.ODBC.Statement ( + fGetQueryInfo, + newSth, + fgettables, + fdescribetable + ) where - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA --} -module Database.HDBC.ODBC.Statement where import Database.HDBC.Types import Database.HDBC import Database.HDBC.DriverUtils import Database.HDBC.ODBC.Types import Database.HDBC.ODBC.Utils import Database.HDBC.ODBC.TypeConv + +import Foreign.C.String (castCUCharToChar) import Foreign.C.Types import Foreign.ForeignPtr import Foreign.Ptr @@ -33,18 +26,22 @@ import Foreign.Marshal import Foreign.Storable import Control.Monad -import Data.List import Data.Word +import Data.Time.Calendar (fromGregorian) +import Data.Time.LocalTime (TimeOfDay(TimeOfDay), LocalTime(LocalTime)) import Data.Int -import Control.Exception -import System.IO -import Data.Maybe +import Data.Maybe (catMaybes, fromMaybe) import qualified Data.ByteString as B import qualified Data.ByteString.UTF8 as BUTF8 import qualified Data.ByteString.Unsafe as B +import Unsafe.Coerce (unsafeCoerce) +import System.IO (hPutStrLn, stderr) +import Debug.Trace + +l :: String -> IO () l _ = return () ---l m = hPutStrLn stderr ("\n" ++ m) +-- l m = hPutStrLn stderr ("\n" ++ m) #ifdef mingw32_HOST_OS #include @@ -57,12 +54,16 @@ #else #let CALLCONV = "ccall" #endif + +fGetQueryInfo :: Conn -> ChildList -> String + -> IO ([SqlColDesc], [(String, SqlColDesc)]) fGetQueryInfo iconn children query = do l "in fGetQueryInfo" sstate <- newSState iconn query addChild children (wrapStmt sstate) -- We get error if we forget this one. Not sure why. fakeExecute' sstate +fakeExecute' :: SState -> IO ([SqlColDesc], [(String, SqlColDesc)]) fakeExecute' sstate = withConn (dbo sstate) $ \cconn -> withCStringLen (squery sstate) $ \(cquery, cqlen) -> alloca $ \(psthptr::Ptr (Ptr CStmt)) -> @@ -85,41 +86,51 @@ colInfo <- fgetcolinfo sthptr return (parmInfo, colInfo) -data SState = - SState { stomv :: MVar (Maybe Stmt), - dbo :: Conn, - squery :: String, - colinfomv :: MVar [(String, SqlColDesc)]} +-- | The Stament State +data SState = SState + { stomv :: MVar (Maybe Stmt) + , dbo :: Conn + , squery :: String + , colinfomv :: MVar [(String, SqlColDesc)] + , bindColsMV :: MVar (Maybe [(BindCol, Ptr #{type SQLLEN})]) + } -- FIXME: we currently do no prepare optimization whatsoever. newSState :: Conn -> String -> IO SState newSState indbo query = - do newstomv <- newMVar Nothing + do newstomv <- newMVar Nothing newcolinfomv <- newMVar [] - return SState {stomv = newstomv, - dbo = indbo, squery = query, - colinfomv = newcolinfomv} + newBindCols <- newMVar Nothing + return SState + { stomv = newstomv + , dbo = indbo + , squery = query + , colinfomv = newcolinfomv + , bindColsMV = newBindCols + } wrapStmt :: SState -> Statement -wrapStmt sstate = - Statement {execute = fexecute sstate, - executeMany = fexecutemany sstate, - finish = public_ffinish sstate, - fetchRow = ffetchrow sstate, - originalQuery = (squery sstate), - getColumnNames = readMVar (colinfomv sstate) - >>= (return . map fst), - describeResult = readMVar (colinfomv sstate)} +wrapStmt sstate = Statement + { execute = fexecute sstate + , executeRaw = return () + , executeMany = fexecutemany sstate + , finish = public_ffinish sstate + , fetchRow = ffetchrow sstate + , originalQuery = (squery sstate) + , getColumnNames = readMVar (colinfomv sstate) >>= (return . map fst) + , describeResult = readMVar (colinfomv sstate) + } -newSth :: Conn -> ChildList -> String -> IO Statement -newSth indbo mchildren query = +newSth :: Conn -> ChildList -> String -> IO Statement +newSth indbo mchildren query = do l "in newSth" sstate <- newSState indbo query let retval = wrapStmt sstate addChild mchildren retval return retval +makesth :: Conn -> [Char] -> IO (ForeignPtr WrappedCStmt) makesth iconn name = alloca $ \(psthptr::Ptr (Ptr CStmt)) -> withConn iconn $ \cconn -> withCString "" $ \emptycs -> @@ -131,6 +142,7 @@ checkError (name ++ " allocHandle") (DbcHandle cconn) rc1 return fsthptr +wrapTheStmt :: Conn -> Stmt -> IO (Statement, SState) wrapTheStmt iconn fsthptr = do sstate <- newSState iconn "" sstate <- newSState iconn "" @@ -138,6 +150,7 @@ let sth = wrapStmt sstate return (sth, sstate) +fgettables :: Conn -> IO [String] fgettables iconn = do fsthptr <- makesth iconn "fgettables" l "fgettables: after makesth" @@ -154,6 +167,7 @@ l ("fgettables: results: " ++ (show results)) return $ map (\x -> fromSql (x !! 2)) results +fdescribetable :: Conn -> String -> IO [(String, SqlColDesc)] fdescribetable iconn tablename = B.useAsCStringLen (BUTF8.fromString tablename) $ \(cs, csl) -> do fsthptr <- makesth iconn "fdescribetable" @@ -170,12 +184,13 @@ {- For now, we try to just handle things as simply as possible. FIXME lots of room for improvement here (types, etc). -} -fexecute sstate args = withConn (dbo sstate) $ \cconn -> - B.useAsCStringLen (BUTF8.fromString (squery sstate)) $ - \(cquery, cqlen) -> - alloca $ \(psthptr::Ptr (Ptr CStmt)) -> +fexecute :: SState -> [SqlValue] -> IO Integer +fexecute sstate args = + withConn (dbo sstate) $ \cconn -> + B.useAsCStringLen (BUTF8.fromString (squery sstate)) $ \(cquery, cqlen) -> + alloca $ \(psthptr::Ptr (Ptr CStmt)) -> do l $ "in fexecute: " ++ show (squery sstate) ++ show args - public_ffinish sstate + public_ffinish sstate rc1 <- sqlAllocStmtHandle #{const SQL_HANDLE_STMT} cconn psthptr sthptr <- peek psthptr wrappedsthptr <- withRawConn (dbo sstate) @@ -186,22 +201,17 @@ sqlPrepare sthptr cquery (fromIntegral cqlen) >>= checkError "execute prepare" (StmtHandle sthptr) - argsToFree <- zipWithM (bindCol sthptr) args [1..] - + bindArgs <- zipWithM (bindParam sthptr) args [1..] l $ "Ready for sqlExecute: " ++ show (squery sstate) ++ show args r <- sqlExecute sthptr - - -- Our bound columns must be valid through this point, - -- but we don't care after here. - mapM_ (\(x, y) -> touchForeignPtr x >> touchForeignPtr y) - (concat argsToFree) + mapM_ (\(x, y) -> free x >> free y) (catMaybes bindArgs) case r of #{const SQL_NO_DATA} -> return () -- Update that did nothing x -> checkError "execute execute" (StmtHandle sthptr) x rc <- getNumResultCols sthptr - + case rc of 0 -> do rowcount <- getSqlRowCount sthptr ffinish fsthptr @@ -213,14 +223,16 @@ touchForeignPtr fsthptr return 0 +getNumResultCols :: Ptr CStmt -> IO #{type SQLSMALLINT} getNumResultCols sthptr = alloca $ \pcount -> do sqlNumResultCols sthptr pcount >>= checkError "SQLNumResultCols" (StmtHandle sthptr) peek pcount - --- Bind a parameter column before execution. -bindCol sthptr arg icol = alloca $ \pdtype -> +-- Bind a parameter column before execution. +bindParam :: Ptr CStmt -> SqlValue -> Word16 + -> IO (Maybe (Ptr #{type SQLLEN}, Ptr CChar)) +bindParam sthptr arg icol = alloca $ \pdtype -> alloca $ \pcolsize -> alloca $ \pdecdigits -> alloca $ \pnullable -> @@ -235,8 +247,7 @@ control passes out of this function. -} do l $ "Binding col " ++ show icol ++ ": " ++ show arg - rc1 <- sqlDescribeParam sthptr icol pdtype pcolsize pdecdigits - pnullable + rc1 <- sqlDescribeParam sthptr icol pdtype pcolsize pdecdigits pnullable l $ "rc1 is " ++ show (isOK rc1) when (not (isOK rc1)) $ -- Some drivers don't support that call do poke pdtype #{const SQL_CHAR} @@ -255,7 +266,7 @@ nullPtr 0 nullDataHDBC checkError ("bindparameter NULL " ++ show icol) (StmtHandle sthptr) rc2 - return [] + return Nothing x -> do -- Otherwise, we have to allocate RAM, make sure it's -- not freed now, and pass it along... (csptr, cslen) <- cstrUtf8BString (fromSql x) @@ -268,24 +279,21 @@ csptr (fromIntegral cslen + 1) pcslen if isOK rc2 then do -- We bound it. Make foreignPtrs and return. - fp1 <- newForeignPtr finalizerFree pcslen - fp2 <- newForeignPtr finalizerFree csptr - return [(fp1, fp2)] + return $ Just (pcslen, csptr) else do -- Binding failed. Free the data and raise -- error. free pcslen free csptr checkError ("bindparameter " ++ show icol) (StmtHandle sthptr) rc2 - return [] -- will never get hit - + return Nothing -- will never get hit + +getSqlRowCount :: Ptr CStmt -> IO Int32 getSqlRowCount cstmt = alloca $ \prows -> do sqlRowCount cstmt prows >>= checkError "SQLRowCount" (StmtHandle cstmt) peek prows + --note: As of ODBC-3.52, the row count is only a C int, ie 32bit. -{- General algorithm: find out how many columns we have, check the type -of each to see if it's NULL. If it's not, fetch it as text and return that. --} cstrUtf8BString :: B.ByteString -> IO CStringLen cstrUtf8BString bs = do @@ -298,64 +306,516 @@ -- return ptr return (res, len) - ffetchrow :: SState -> IO (Maybe [SqlValue]) -ffetchrow sstate = modifyMVar (stomv sstate) $ \stmt -> - case stmt of - Nothing -> l "ffr nos" >> return (stmt, Nothing) - Just cmstmt -> withStmt cmstmt $ \cstmt -> - do rc <- sqlFetch cstmt - if rc == #{const SQL_NO_DATA} - then do l "no more rows" - -- Don't use public_ffinish here - ffinish cmstmt - return (Nothing, Nothing) - else do l "getting stuff" - checkError "sqlFetch" (StmtHandle cstmt) rc - ncols <- getNumResultCols cstmt - l $ "ncols: " ++ show ncols - res <- mapM (getCol cstmt ) - [1..ncols] - return (stmt, Just res) - where getCol cstmt icol = - do let defaultLen = 128 - colinfo <- readMVar (colinfomv sstate) - l $ "getCol: colinfo is " ++ show colinfo ++ ", icol " ++ show icol - let cBinding = case colType (snd (colinfo !! ((fromIntegral icol) - 1))) of - SqlBinaryT -> #{const SQL_C_BINARY} - SqlVarBinaryT -> #{const SQL_C_BINARY} - SqlLongVarBinaryT -> #{const SQL_C_BINARY} - _ -> #{const SQL_CHAR} - alloca $ \plen -> - allocaBytes defaultLen $ \buf -> - do res <- sqlGetData cstmt (fromIntegral icol) cBinding - buf (fromIntegral defaultLen) plen - case res of - #{const SQL_SUCCESS} -> - do len <- peek plen - case len of - #{const SQL_NULL_DATA} -> return SqlNull - #{const SQL_NO_TOTAL} -> fail $ "Unexpected SQL_NO_TOTAL" - len -> do bs <- B.packCStringLen (buf, fromIntegral len) - l $ "col is: " ++ show (BUTF8.toString bs) - return (SqlByteString bs) - #{const SQL_SUCCESS_WITH_INFO} -> - do len <- peek plen - allocaBytes (fromIntegral len + 1) $ \buf2 -> - do sqlGetData cstmt (fromIntegral icol) cBinding - buf2 (fromIntegral len + 1) plen - >>= checkError "sqlGetData" (StmtHandle cstmt) - len2 <- peek plen - let firstbuf = case cBinding of - #{const SQL_C_BINARY} -> defaultLen - _ -> defaultLen - 1 -- strip off NUL - bs <- liftM2 (B.append) (B.packCStringLen (buf, firstbuf)) - (B.packCStringLen (buf2, fromIntegral len2)) - l $ "col is: " ++ (BUTF8.toString bs) - return (SqlByteString bs) - res -> raiseError "sqlGetData" res (StmtHandle cstmt) +ffetchrow sstate = modifyMVar (stomv sstate) $ \stmt -> do + l $ "ffetchrow" + case stmt of + Nothing -> do + l "ffetchrow: no statement" + return (stmt, Nothing) + Just cmstmt -> withStmt cmstmt $ \cstmt -> do + bindCols <- getBindCols sstate cstmt + l "ffetchrow: fetching" + rc <- sqlFetch cstmt + if rc == #{const SQL_NO_DATA} + then do + l "ffetchrow: no more rows" + ffinish cmstmt + return (Nothing, Nothing) + else do + l "ffetchrow: fetching data" + checkError "sqlFetch" (StmtHandle cstmt) rc + sqlValues <- if rc == #{const SQL_SUCCESS} || rc == #{const SQL_SUCCESS_WITH_INFO} + then mapM (bindColToSqlValue cstmt) bindCols + else raiseError "sqlGetData" rc (StmtHandle cstmt) + return (stmt, Just sqlValues) +getBindCols :: SState -> Ptr CStmt -> IO [(BindCol, Ptr #{type SQLLEN})] +getBindCols sstate cstmt = do + l "getBindCols" + modifyMVar (bindColsMV sstate) $ \mBindCols -> + case mBindCols of + Nothing -> do + cols <- getNumResultCols cstmt + pBindCols <- mapM (mkBindCol sstate cstmt) [1 .. cols] + return (Just pBindCols, pBindCols) + Just bindCols -> do + return (mBindCols, bindCols) +-- TODO: This code does not deal well with data that is extremely large, +-- where multiple fetches are required. +getColData cstmt cBinding icol = do + alloca $ \plen -> + allocaBytes colBufSizeDefault $ \buf -> + do res <- sqlGetData cstmt (fromIntegral icol) cBinding + buf (fromIntegral colBufSizeDefault) plen + case res of + #{const SQL_SUCCESS} -> + do len <- peek plen + case len of + #{const SQL_NULL_DATA} -> return SqlNull + #{const SQL_NO_TOTAL} -> fail $ "Unexpected SQL_NO_TOTAL" + _ -> do bs <- B.packCStringLen (buf, fromIntegral len) + l $ "col is: " ++ show (BUTF8.toString bs) + return (SqlByteString bs) + #{const SQL_SUCCESS_WITH_INFO} -> + do len <- peek plen + allocaBytes (fromIntegral len + 1) $ \buf2 -> + do sqlGetData cstmt (fromIntegral icol) cBinding + buf2 (fromIntegral len + 1) plen + >>= checkError "sqlGetData" (StmtHandle cstmt) + len2 <- peek plen + let firstbuf = case cBinding of + #{const SQL_C_BINARY} -> colBufSizeDefault + _ -> colBufSizeDefault - 1 -- strip off NUL + bs <- liftM2 (B.append) (B.packCStringLen (buf, firstbuf)) + (B.packCStringLen (buf2, fromIntegral len2)) + l $ "col is: " ++ (BUTF8.toString bs) + return (SqlByteString bs) + _ -> raiseError "sqlGetData" res (StmtHandle cstmt) + +-- | ffetchrowBaseline is used for benchmarking fetches without the +-- overhead of marshalling values. +ffetchrowBaseline sstate = do + Just cmstmt <- readMVar (stomv sstate) + withStmt cmstmt $ \cstmt -> do + rc <- sqlFetch cstmt + if rc == #{const SQL_NO_DATA} + then do ffinish cmstmt + return Nothing + else do return (Just []) + +data ColBuf + +-- These correspond to the C type identifiers found here: +-- http://msdn.microsoft.com/en-us/library/ms714556(v=VS.85).aspx +-- The Ptr values point to the appropriate C types +data BindCol + = BindColString (Ptr CChar) #{type SQLLEN} #{type SQLUSMALLINT} + | BindColWString (Ptr CWchar) #{type SQLLEN} #{type SQLUSMALLINT} + | BindColBit (Ptr CUChar) + | BindColTinyInt (Ptr CChar) + | BindColShort (Ptr CShort) + | BindColLong (Ptr CLong) + | BindColBigInt (Ptr #{type SQLBIGINT}) + | BindColFloat (Ptr CFloat) + | BindColDouble (Ptr CDouble) + | BindColBinary (Ptr CUChar) #{type SQLLEN} #{type SQLUSMALLINT} + | BindColDate (Ptr StructDate) + | BindColTime (Ptr StructTime) + | BindColTimestamp (Ptr StructTimestamp) + | BindColGetData #{type SQLUSMALLINT} + + +-- Intervals and GUIDs have not been implemented, since there is no +-- equivalent SqlValue for these. +-- +-- | BindColInterval +-- typedef struct tagSQL_INTERVAL_STRUCT +-- { +-- SQLINTERVAL interval_type; +-- SQLSMALLINT interval_sign; +-- union { +-- SQL_YEAR_MONTH_STRUCT year_month; +-- SQL_DAY_SECOND_STRUCT day_second; +-- } intval; +-- } SQL_INTERVAL_STRUCT; +-- typedef enum +-- { +-- SQL_IS_YEAR = 1, +-- SQL_IS_MONTH = 2, +-- SQL_IS_DAY = 3, +-- SQL_IS_HOUR = 4, +-- SQL_IS_MINUTE = 5, +-- SQL_IS_SECOND = 6, +-- SQL_IS_YEAR_TO_MONTH = 7, +-- SQL_IS_DAY_TO_HOUR = 8, +-- SQL_IS_DAY_TO_MINUTE = 9, +-- SQL_IS_DAY_TO_SECOND = 10, +-- SQL_IS_HOUR_TO_MINUTE = 11, +-- SQL_IS_HOUR_TO_SECOND = 12, +-- SQL_IS_MINUTE_TO_SECOND = 13 +-- } SQLINTERVAL; +-- +-- typedef struct tagSQL_YEAR_MONTH +-- { +-- SQLUINTEGER year; +-- SQLUINTEGER month; +-- } SQL_YEAR_MONTH_STRUCT; +-- +-- typedef struct tagSQL_DAY_SECOND +-- { +-- SQLUINTEGER day; +-- SQLUINTEGER hour; +-- SQLUINTEGER minute; +-- SQLUINTEGER second; +-- SQLUINTEGER fraction; +-- } SQL_DAY_SECOND_STRUCT; +-- | BindColGUID (Ptr StructGUID) + + +-- | StructDate is used to marshal the DATE_STRUCT +-- This struct, and the ones which follow, are described here: +-- http://msdn.microsoft.com/en-us/library/ms714556(v=VS.85).aspx +data StructDate = StructDate + #{type SQLSMALLINT} -- ^ year + #{type SQLUSMALLINT} -- ^ month + #{type SQLUSMALLINT} -- ^ day + deriving Show + +instance Storable StructDate where + sizeOf _ = #{size DATE_STRUCT} + alignment _ = alignment (undefined :: CLong) + poke p (StructDate year month day) = do + #{poke DATE_STRUCT, year} p year + #{poke DATE_STRUCT, month} p month + #{poke DATE_STRUCT, day} p day + peek p = return StructDate + `ap` (#{peek DATE_STRUCT, year} p) + `ap` (#{peek DATE_STRUCT, month} p) + `ap` (#{peek DATE_STRUCT, day} p) + + +-- | StructTime is used to marshals the TIME_STRUCT: +data StructTime = StructTime + #{type SQLUSMALLINT} -- ^ hour + #{type SQLUSMALLINT} -- ^ minute + #{type SQLUSMALLINT} -- ^ second + +instance Storable StructTime where + sizeOf _ = #{size TIME_STRUCT} + alignment _ = alignment (undefined :: CLong) + poke p (StructTime hour minute second) = do + #{poke TIME_STRUCT, hour} p hour + #{poke TIME_STRUCT, minute} p minute + #{poke TIME_STRUCT, second} p second + peek p = return StructTime + `ap` (#{peek TIME_STRUCT, hour} p) + `ap` (#{peek TIME_STRUCT, minute} p) + `ap` (#{peek TIME_STRUCT, second} p) + +-- | StructTimestamp is used to marshal the TIMESTAMP_STRUCT; +data StructTimestamp = StructTimestamp + #{type SQLSMALLINT} -- ^ year + #{type SQLUSMALLINT} -- ^ month + #{type SQLUSMALLINT} -- ^ day + #{type SQLUSMALLINT} -- ^ hour + #{type SQLUSMALLINT} -- ^ minute + #{type SQLUSMALLINT} -- ^ second + #{type SQLUINTEGER} -- ^ fraction + +instance Storable StructTimestamp where + sizeOf _ = #{size TIMESTAMP_STRUCT} + alignment _ = alignment (undefined :: CLong) + poke p (StructTimestamp year month day hour minute second fraction) = do + #{poke TIMESTAMP_STRUCT, year} p year + #{poke TIMESTAMP_STRUCT, month} p month + #{poke TIMESTAMP_STRUCT, day} p day + #{poke TIMESTAMP_STRUCT, hour} p hour + #{poke TIMESTAMP_STRUCT, minute} p minute + #{poke TIMESTAMP_STRUCT, second} p second + #{poke TIMESTAMP_STRUCT, fraction} p fraction + peek p = return StructTimestamp + `ap` (#{peek TIMESTAMP_STRUCT, year} p) + `ap` (#{peek TIMESTAMP_STRUCT, month} p) + `ap` (#{peek TIMESTAMP_STRUCT, day} p) + `ap` (#{peek TIMESTAMP_STRUCT, hour} p) + `ap` (#{peek TIMESTAMP_STRUCT, minute} p) + `ap` (#{peek TIMESTAMP_STRUCT, second} p) + `ap` (#{peek TIMESTAMP_STRUCT, fraction} p) + +-- | StructGUID +-- data StructGUID = StructGUID +-- #{type DWORD} -- ^ Data1 +-- #{type WORD} -- ^ Data2 +-- #{type WORD} -- ^ Data3 +-- [#{type BYTE}] -- ^ Data4[8] +-- +-- instance Storable StructGUID where +-- sizeOf _ = #{size SQLGUID} +-- alignment _ = alignment (undefined :: CLong) +-- poke p (StructGUID data1 data2 data3 data4) = do +-- #{poke SQLGUID, Data1} p data1 +-- #{poke SQLGUID, Data2} p data2 +-- #{poke SQLGUID, Data3} p data3 +-- pokeArray (p `plusPtr` #{offset SQLGUID, Data4}) data4 +-- peek p = return StructGUID +-- `ap` (#{peek SQLGUID, Data1} p) +-- `ap` (#{peek SQLGUID, Data2} p) +-- `ap` (#{peek SQLGUID, Data3} p) +-- `ap` (peekArray 8 (p `plusPtr` #{offset SQLGUID, Data4})) + + +-- | This function binds the data in a column to a value of type +-- BindCol, using the default conversion scheme described here: +-- http://msdn.microsoft.com/en-us/library/ms716298(v=VS.85).aspx +-- The corresponding C types are here: +-- http://msdn.microsoft.com/en-us/library/ms714556(v=VS.85).aspx +-- These values are then ready for fetching. +-- Documentation about SQLBindCol can be found here: +-- http://msdn.microsoft.com/en-us/library/ms711010(v=vs.85).aspx +-- +-- Our implementation follows this code: +-- http://publib.boulder.ibm.com/infocenter/iseries/v5r3/index.jsp?topic=%2Fcli%2Frzadpfndecol.htm +-- We have to make use of the column type and length information. +-- These are given by SQLDescribeCol, which is stored in colinfomv. +-- SQLDescribeCol can tell use the data type, and the size of a column (in +-- characters, so add 1 for the null terminator), or the number of decimal +-- digits that can be held. +-- To find out type, and how much memory to allocate, we could also use: +-- SQLColAttribute( ..., SQL_DESC_TYPE , ... ) +-- SQLColAttribute( ..., SQL_DESC_OCTET_LENGTH , ... ) +-- +-- Further examples of how to use SQLBindCol are here, though these make use +-- of SQLDescribeCol: +-- http://msdn.microsoft.com/en-us/library/ms710118(v=vs.85).aspx +-- This implementation makes use of Column-Wise binding. Further improvements +-- might be had by using Row-Wise binding. +mkBindCol :: SState -> Ptr CStmt -> #{type SQLSMALLINT} -> IO (BindCol, Ptr #{type SQLLEN}) +mkBindCol sstate cstmt col = do + l "mkBindCol" + colInfo <- readMVar (colinfomv sstate) + let colDesc = (snd (colInfo !! ((fromIntegral col) -1))) + case colType colDesc of + SqlCharT -> mkBindColString cstmt col' (colSize colDesc) + SqlVarCharT -> mkBindColString cstmt col' (colSize colDesc) + SqlLongVarCharT -> mkBindColString cstmt col' (colSize colDesc) + SqlWCharT -> mkBindColWString cstmt col' (colSize colDesc) + SqlWVarCharT -> mkBindColWString cstmt col' (colSize colDesc) + SqlWLongVarCharT -> mkBindColWString cstmt col' (colSize colDesc) + SqlDecimalT -> mkBindColString cstmt col' (colSize colDesc) + SqlNumericT -> mkBindColString cstmt col' (colSize colDesc) + SqlBitT -> mkBindColBit cstmt col' (colSize colDesc) + SqlTinyIntT -> mkBindColTinyInt cstmt col' (colSize colDesc) + SqlSmallIntT -> mkBindColShort cstmt col' (colSize colDesc) + SqlIntegerT -> mkBindColLong cstmt col' (colSize colDesc) + SqlBigIntT -> mkBindColBigInt cstmt col' (colSize colDesc) + SqlRealT -> mkBindColFloat cstmt col' (colSize colDesc) + SqlFloatT -> mkBindColDouble cstmt col' (colSize colDesc) + SqlDoubleT -> mkBindColDouble cstmt col' (colSize colDesc) + SqlBinaryT -> mkBindColBinary cstmt col' (colSize colDesc) + SqlVarBinaryT -> mkBindColBinary cstmt col' (colSize colDesc) + SqlLongVarBinaryT -> mkBindColBinary cstmt col' (colSize colDesc) + SqlDateT -> mkBindColDate cstmt col' (colSize colDesc) + SqlTimeT -> mkBindColTime cstmt col' (colSize colDesc) + SqlTimestampT -> mkBindColTimestamp cstmt col' (colSize colDesc) +-- SqlIntervalT i -> mkBindColInterval cstmt col' (colSize colDesc) i +-- SqlGUIDT -> mkBindColGUID cstmt col' (colSize colDesc) + _ -> mkBindColGetData col' +-- The following are not supported by ODBC: +-- SqlUTCDateTimeT +-- SqlUTCTimeT +-- SqlTimeWithZoneT +-- SqlTimestampWithZoneT + where + col' = fromIntegral col + +colBufSizeDefault = 1024 +colBufSizeMaximum = 4096 + +-- The functions that follow do the marshalling from C into a Haskell type +mkBindColString cstmt col mColSize = do + l "mkBindCol: BindColString" + let colSize = min colBufSizeMaximum $ fromMaybe colBufSizeDefault mColSize + let bufLen = sizeOf (undefined :: CChar) * (colSize + 1) + buf <- mallocBytes bufLen + pStrLen <- malloc + sqlBindCol cstmt col (#{const SQL_C_CHAR}) (castPtr buf) (fromIntegral bufLen) pStrLen + return (BindColString buf (fromIntegral bufLen) col, pStrLen) +mkBindColWString cstmt col mColSize = do + l "mkBindCol: BindColWString" + let colSize = min colBufSizeMaximum $ fromMaybe colBufSizeDefault mColSize + let bufLen = sizeOf (undefined :: CWchar) * (colSize + 1) + buf <- mallocBytes bufLen + pStrLen <- malloc + sqlBindCol cstmt col (#{const SQL_C_CHAR}) (castPtr buf) (fromIntegral bufLen) pStrLen + return (BindColWString buf (fromIntegral bufLen) col, pStrLen) +mkBindColBit cstmt col mColSize = do + l "mkBindCol: BindColBit" + let bufLen = sizeOf (undefined :: CChar) + buf <- malloc + pStrLen <- malloc + sqlBindCol cstmt col (#{const SQL_C_BIT}) (castPtr buf) (fromIntegral bufLen) pStrLen + return (BindColBit buf, pStrLen) +mkBindColTinyInt cstmt col mColSize = do + l "mkBindCol: BindColTinyInt" + let bufLen = sizeOf (undefined :: CUChar) + buf <- malloc + pStrLen <- malloc + sqlBindCol cstmt col (#{const SQL_C_STINYINT}) (castPtr buf) (fromIntegral bufLen) pStrLen + return (BindColTinyInt buf, pStrLen) +mkBindColShort cstmt col mColSize = do + l "mkBindCol: BindColShort" + let bufLen = sizeOf (undefined :: CShort) + buf <- malloc + pStrLen <- malloc + sqlBindCol cstmt col (#{const SQL_C_SSHORT}) (castPtr buf) (fromIntegral bufLen) pStrLen + return (BindColShort buf, pStrLen) +mkBindColLong cstmt col mColSize = do + l "mkBindCol: BindColSize" + let bufLen = sizeOf (undefined :: CLong) + buf <- malloc + pStrLen <- malloc + sqlBindCol cstmt col (#{const SQL_C_SLONG}) (castPtr buf) (fromIntegral bufLen) pStrLen + return (BindColLong buf, pStrLen) +mkBindColBigInt cstmt col mColSize = do + l "mkBindCol: BindColBigInt" + let bufLen = sizeOf (undefined :: CInt) + buf <- malloc + pStrLen <- malloc + sqlBindCol cstmt col (#{const SQL_C_SBIGINT}) (castPtr buf) (fromIntegral bufLen) pStrLen + return (BindColBigInt buf, pStrLen) +mkBindColFloat cstmt col mColSize = do + l "mkBindCol: BindColFloat" + let bufLen = sizeOf (undefined :: CFloat) + buf <- malloc + pStrLen <- malloc + sqlBindCol cstmt col (#{const SQL_C_FLOAT}) (castPtr buf) (fromIntegral bufLen) pStrLen + return (BindColFloat buf, pStrLen) +mkBindColDouble cstmt col mColSize = do + l "mkBindCol: BindColDouble" + let bufLen = sizeOf (undefined :: CDouble) + buf <- malloc + pStrLen <- malloc + sqlBindCol cstmt col (#{const SQL_C_DOUBLE}) (castPtr buf) (fromIntegral bufLen) pStrLen + return (BindColDouble buf, pStrLen) +mkBindColBinary cstmt col mColSize = do + l "mkBindCol: BindColBinary" + let colSize = min colBufSizeMaximum $ fromMaybe colBufSizeDefault mColSize + let bufLen = sizeOf (undefined :: CUChar) * (colSize + 1) + buf <- malloc + pStrLen <- malloc + sqlBindCol cstmt col (#{const SQL_C_BINARY}) (castPtr buf) (fromIntegral bufLen) pStrLen + return (BindColBinary buf (fromIntegral bufLen) col, pStrLen) +mkBindColDate cstmt col mColSize = do + l "mkBindCol: BindColDate" + let bufLen = sizeOf (undefined :: StructDate) + buf <- malloc + pStrLen <- malloc + sqlBindCol cstmt col (#{const SQL_C_TYPE_DATE}) (castPtr buf) (fromIntegral bufLen) pStrLen + return (BindColDate buf, pStrLen) +mkBindColTime cstmt col mColSize = do + l "mkBindCol: BindColTime" + let bufLen = sizeOf (undefined :: StructTime) + buf <- malloc + pStrLen <- malloc + sqlBindCol cstmt col (#{const SQL_C_TYPE_TIME}) (castPtr buf) (fromIntegral bufLen) pStrLen + return (BindColTime buf, pStrLen) +mkBindColTimestamp cstmt col mColSize = do + l "mkBindCol: BindColTimestamp" + let bufLen = sizeOf (undefined :: StructTimestamp) + buf <- malloc + pStrLen <- malloc + sqlBindCol cstmt col (#{const SQL_C_TYPE_TIMESTAMP}) (castPtr buf) (fromIntegral bufLen) pStrLen + return (BindColTimestamp buf, pStrLen) +mkBindColGetData col = do + l "mkBindCol: BindColGetData" + return (BindColGetData col, nullPtr) + +freeBindCol :: BindCol -> IO () +freeBindCol (BindColString buf _ _) = free buf +freeBindCol (BindColWString buf _ _) = free buf +freeBindCol (BindColBit buf) = free buf +freeBindCol (BindColTinyInt buf) = free buf +freeBindCol (BindColShort buf) = free buf +freeBindCol (BindColLong buf) = free buf +freeBindCol (BindColBigInt buf) = free buf +freeBindCol (BindColFloat buf) = free buf +freeBindCol (BindColDouble buf) = free buf +freeBindCol (BindColBinary buf _ _) = free buf +freeBindCol (BindColDate buf) = free buf +freeBindCol (BindColTime buf) = free buf +freeBindCol (BindColTimestamp buf) = free buf +freeBindCol (BindColGetData _ ) = return () + +-- | This assumes that SQL_ATTR_MAX_LENGTH is set to zero, otherwise, we +-- cannot detect truncated columns. See "returning Data in Bound Columns": +-- http://msdn.microsoft.com/en-us/library/ms712424(v=vs.85).aspx +-- Also note that the strLen value of SQL_NTS denotes a null terminated string, +-- but is only valid as input, so we don't make use of it here: +-- http://msdn.microsoft.com/en-us/library/ms713532(v=VS.85).aspx +bindColToSqlValue :: Ptr CStmt -> (BindCol, Ptr #{type SQLLEN}) -> IO SqlValue +bindColToSqlValue pcstmt (BindColGetData col, _) = do + l "bindColToSqlValue: BindColGetData" + getColData pcstmt #{const SQL_CHAR} col +bindColToSqlValue pcstmt (bindCol, pStrLen) = do + l "bindColToSqlValue" + strLen <- peek pStrLen + case strLen of + #{const SQL_NULL_DATA} -> return SqlNull + #{const SQL_NO_TOTAL} -> fail $ "Unexpected SQL_NO_TOTAL" + _ -> bindColToSqlValue' pcstmt bindCol strLen + +-- | This is a worker function for `bindcolToSqlValue`. Note that the case +-- where the data is null should already be handled by this stage. +bindColToSqlValue' :: Ptr CStmt -> BindCol -> #{type SQLLEN} -> IO SqlValue +bindColToSqlValue' pcstmt (BindColString buf bufLen col) strLen + | bufLen >= strLen = do + bs <- B.packCStringLen (buf, fromIntegral strLen) + l $ "bindColToSqlValue BindColString " ++ show bs ++ " " ++ show strLen + return $ SqlByteString bs + | otherwise = getColData pcstmt #{const SQL_CHAR} col +bindColToSqlValue' pcstmt (BindColWString buf bufLen col) strLen + | bufLen >= strLen = do + bs <- B.packCStringLen (castPtr buf, fromIntegral strLen) + l $ "bindColToSqlValue BindColWString " ++ show bs ++ " " ++ show strLen + return $ SqlByteString bs + | otherwise = getColData pcstmt #{const SQL_CHAR} col +bindColToSqlValue' _ (BindColBit buf) strLen = do + bit <- peek buf + l $ "bindColToSqlValue BindColBit " ++ show bit + return $ SqlChar (castCUCharToChar bit) +bindColToSqlValue' _ (BindColTinyInt buf) strLen = do + tinyInt <- peek buf + l $ "bindColToSqlValue BindColTinyInt " ++ show tinyInt + return $ SqlChar (castCCharToChar tinyInt) +bindColToSqlValue' _ (BindColShort buf) strLen = do + short <- peek buf + l $ "bindColToSqlValue BindColShort" ++ show short + return $ SqlInt32 (fromIntegral short) +bindColToSqlValue' _ (BindColLong buf) strLen = do + long <- peek buf + l $ "bindColToSqlValue BindColLong " ++ show long + return $ SqlInt32 (fromIntegral long) +bindColToSqlValue' _ (BindColBigInt buf) strLen = do + bigInt <- peek buf + l $ "bindColToSqlValue BindColBigInt " ++ show bigInt + return $ SqlInt64 (fromIntegral bigInt) +bindColToSqlValue' _ (BindColFloat buf) strLen = do + float <- peek buf + l $ "bindColToSqlValue BindColFloat " ++ show float + return $ SqlDouble (realToFrac float) +bindColToSqlValue' _ (BindColDouble buf) strLen = do + double <- peek buf + l $ "bindColToSqlValue BindColDouble " ++ show double + return $ SqlDouble (realToFrac double) +bindColToSqlValue' pcstmt (BindColBinary buf bufLen col) strLen + | bufLen >= strLen = do + bs <- B.packCStringLen (castPtr buf, fromIntegral strLen) + l $ "bindColToSqlValue BindColBinary " ++ show bs + return $ SqlByteString bs + | otherwise = getColData pcstmt (#{const SQL_C_BINARY}) col +bindColToSqlValue' _ (BindColDate buf) strLen = do + StructDate year month day <- peek buf + l $ "bindColToSqlValue BindColDate" + return $ SqlLocalDate $ fromGregorian + (fromIntegral year) (fromIntegral month) (fromIntegral day) +bindColToSqlValue' _ (BindColTime buf) strLen = do + StructTime hour minute second <- peek buf + l $ "bindColToSqlValue BindColTime" + return $ SqlLocalTimeOfDay $ TimeOfDay + (fromIntegral hour) (fromIntegral minute) (fromIntegral second) +bindColToSqlValue' _ (BindColTimestamp buf) strLen = do + StructTimestamp year month day hour minute second nanosecond <- peek buf + l $ "bindColToSqlValue BindColTimestamp" + return $ SqlLocalTime $ LocalTime + (fromGregorian (fromIntegral year) (fromIntegral month) (fromIntegral day)) + (TimeOfDay (fromIntegral hour) (fromIntegral minute) + (fromIntegral second + (fromIntegral nanosecond / 1000000000))) +bindColToSqlValue' _ (BindColGetData _) _ = + error "bindColToSqlValue': unexpected BindColGetData!" + +fgetcolinfo :: Ptr CStmt -> IO [(String, SqlColDesc)] fgetcolinfo cstmt = do ncols <- getNumResultCols cstmt mapM getname [1..ncols] @@ -380,14 +840,22 @@ mapM_ (fexecute sstate) arglist >> return () -- Finish and change state -public_ffinish sstate = - do l "public_ffinish" - modifyMVar_ (stomv sstate) worker - where worker Nothing = return Nothing - worker (Just sth) = ffinish sth >> return Nothing +public_ffinish :: SState -> IO () +public_ffinish sstate = do + l "public_ffinish" + modifyMVar_ (stomv sstate) freeMStmt + modifyMVar_ (bindColsMV sstate) freeBindCols + where + freeMStmt Nothing = return Nothing + freeMStmt (Just sth) = ffinish sth >> return Nothing + freeBindCols Nothing = return Nothing + freeBindCols (Just bindCols) = do + l "public_ffinish: freeing bindcols" + mapM_ (\(bindCol, pSqlLen) -> freeBindCol bindCol >> free pSqlLen) bindCols + return Nothing ffinish :: Stmt -> IO () -ffinish p = withRawStmt p $ sqlFreeHandleSth_app +ffinish stmt = withRawStmt stmt $ sqlFreeHandleSth_app foreign import ccall unsafe "hdbc-odbc-helper.h wrapobjodbc" @@ -414,6 +882,15 @@ -> Ptr (#{type SQLLEN}) -> IO #{type SQLRETURN} +foreign import #{CALLCONV} unsafe "sql.h SQLBindCol" + sqlBindCol :: Ptr CStmt -- ^ statement handle + -> #{type SQLUSMALLINT} -- ^ Column number + -> #{type SQLSMALLINT} -- ^ target type + -> Ptr ColBuf -- ^ target value pointer (void * in C) + -> #{type SQLLEN} -- ^ buffer len + -> Ptr (#{type SQLLEN}) -- ^ strlen_or_indptr + -> IO #{type SQLRETURN} + foreign import ccall unsafe "hdbc-odbc-helper.h sqlFreeHandleSth_app" sqlFreeHandleSth_app :: Ptr WrappedCStmt -> IO () @@ -473,6 +950,7 @@ simpleSqlColumns :: Ptr CStmt -> Ptr CChar -> #{type SQLSMALLINT} -> IO #{type SQLRETURN} +fgetparminfo :: Ptr CStmt -> IO [SqlColDesc] fgetparminfo cstmt = do ncols <- getNumParams cstmt mapM getname [1..ncols] @@ -492,6 +970,7 @@ nullable <- peek nullableptr return $ snd $ fromOTypeInfo "" datatype colsize nullable +getNumParams :: Ptr CStmt -> IO Int16 getNumParams sthptr = alloca $ \pcount -> do sqlNumParams sthptr pcount >>= checkError "SQLNumResultCols" (StmtHandle sthptr) diff --git a/Database/HDBC/ODBC/TypeConv.hsc b/Database/HDBC/ODBC/TypeConv.hsc --- a/Database/HDBC/ODBC/TypeConv.hsc +++ b/Database/HDBC/ODBC/TypeConv.hsc @@ -1,23 +1,6 @@ -- -*- mode: haskell; -*- {-# CFILES hdbc-odbc-helper.c #-} -- Above line for hugs -{- -Copyright (C) 2006 John Goerzen - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA --} module Database.HDBC.ODBC.TypeConv(fromOTypeInfo, fromOTypeCol) where import Database.HDBC.Types import Database.HDBC diff --git a/Database/HDBC/ODBC/Utils.hsc b/Database/HDBC/ODBC/Utils.hsc --- a/Database/HDBC/ODBC/Utils.hsc +++ b/Database/HDBC/ODBC/Utils.hsc @@ -1,19 +1,4 @@ {- -*- mode: haskell; -*- -Copyright (C) 2005-2009 John Goerzen - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -} module Database.HDBC.ODBC.Utils where diff --git a/HDBC-odbc.cabal b/HDBC-odbc.cabal --- a/HDBC-odbc.cabal +++ b/HDBC-odbc.cabal @@ -1,18 +1,16 @@ Name: HDBC-odbc -Version: 2.2.3.2 +Version: 2.3.1.0 Cabal-Version: >=1.2.3 Build-type: Simple -License: LGPL -Maintainer: John Goerzen +License: BSD3 +Maintainer: Nicolas Wu Author: John Goerzen -Copyright: Copyright (c) 2005-2009 John Goerzen -license-file: COPYRIGHT -extra-source-files: COPYING, hdbc-odbc-helper.h, +Copyright: Copyright (c) 2005-2011 John Goerzen +license-file: LICENSE +extra-source-files: LICENSE, hdbc-odbc-helper.h, Makefile, README.txt, TODO, - testsrc/COPYING, - testsrc/COPYRIGHT, testsrc/TestTime.hs homepage: http://software.complete.org/hdbc-odbc Category: Database @@ -38,8 +36,13 @@ Extensions: ExistentialQuantification, ForeignFunctionInterface, - PatternSignatures - Build-Depends: base >= 4 && < 5, mtl, HDBC>=2.1.0, utf8-string, bytestring + ScopedTypeVariables + Build-Depends: base >= 4.3.1.0 && < 5 + , mtl + , HDBC>=2.1.0 + , time>=1.2.0.3 + , utf8-string + , bytestring GHC-Options: -O2 C-Sources: hdbc-odbc-helper.c if os(mingw32) || os(win32) diff --git a/LICENSE b/LICENSE new file mode 100644 --- /dev/null +++ b/LICENSE @@ -0,0 +1,27 @@ +Copyright (c) 2005-2011, John Goerzen +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, this + list of conditions and the following disclaimer in the documentation and/or + other materials provided with the distribution. + +* Neither the name of John Goerzen nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/testsrc/COPYING b/testsrc/COPYING deleted file mode 100644 --- a/testsrc/COPYING +++ /dev/null @@ -1,510 +0,0 @@ - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 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 Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - 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 Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations -below. - - When we speak of free software, we are referring to freedom of use, -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 and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -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 other code 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. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it -becomes a de-facto standard. To achieve this, non-free programs must -be allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - 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, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser 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 combine 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) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) 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. - - d) 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. - - e) 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 materials to be 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 with -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 Lesser 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 - - 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 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 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/testsrc/COPYRIGHT b/testsrc/COPYRIGHT deleted file mode 100644 --- a/testsrc/COPYRIGHT +++ /dev/null @@ -1,4 +0,0 @@ -Copyright (c) 2005 John Goerzen - -Please see COPYING for the license. - diff --git a/testsrc/SpecificDB.hs b/testsrc/SpecificDB.hs --- a/testsrc/SpecificDB.hs +++ b/testsrc/SpecificDB.hs diff --git a/testsrc/Tests.hs b/testsrc/Tests.hs --- a/testsrc/Tests.hs +++ b/testsrc/Tests.hs @@ -1,19 +1,4 @@ {- arch-tag: Tests main file -Copyright (C) 2004-2005 John Goerzen - -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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -} module Tests(tests) where diff --git a/testsrc/runtests.hs b/testsrc/runtests.hs --- a/testsrc/runtests.hs +++ b/testsrc/runtests.hs @@ -1,19 +1,4 @@ {- arch-tag: Test runner -Copyright (C) 2004 John Goerzen - -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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -} module Main where