diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,20 @@ +# Changelog + +#### 2.4.0.4 + +* Zero-prefix years when parsing dates. + +#### 2.4.0.3 + +* Compatibility with GHC 8.8/time 1.9 + +#### 2.4.0.2 + +* Compatibility with GHC 8.2/time 1.8 + +#### 2.4.0.1 + +* Compatibility with time 1.5. +* Minor documentation fixes. + + 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-2008 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.hs b/Database/HDBC.hs --- a/Database/HDBC.hs +++ b/Database/HDBC.hs @@ -1,26 +1,7 @@ -{- -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. - - 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 - Copyright : Copyright (C) 2005-2007 John Goerzen - License : GNU LGPL, version 2.1 or above + Copyright : Copyright (C) 2005-2011 John Goerzen + License : BSD3 Maintainer : John Goerzen Stability : provisional @@ -42,8 +23,8 @@ -- $drivers -- * Typing of transfer data - SqlType(..), nToSql, iToSql, SqlValue(..), + toSql, fromSql, safeFromSql, nToSql, iToSql, posixToSql, -- * Database Connections IConnection, @@ -51,7 +32,7 @@ -- ** Wrapped Connections ConnWrapper(..), withWConn, -- ** Preparing Queries - run, sRun, prepare, quickQuery', quickQuery, + run, runRaw, sRun, prepare, quickQuery', quickQuery, -- ** Transaction Handling -- $transactions @@ -65,7 +46,7 @@ -- * Statements Statement, -- ** Execution - execute, sExecute, executeMany, sExecuteMany, + execute, executeRaw, sExecute, executeMany, sExecuteMany, -- ** Fetching Results fetchRow, fetchRowAL, fetchRowMap, sFetchRow, fetchAllRows, fetchAllRows', fetchAllRowsAL, fetchAllRowsAL', @@ -78,6 +59,7 @@ -- * Exceptions SqlError(..), + throwSqlError, catchSql, handleSql, sqlExceptions, handleSqlError, -- * Column Types @@ -88,9 +70,6 @@ -- * Threading -- $threading - - -- * Copyright and License - -- $legal ) where @@ -102,7 +81,7 @@ quickQuery, fetchRowMap, fetchAllRowsMap, quickQuery', fetchAllRowsMap', fetchRowAL, fetchAllRowsAL, - fetchAllRowsAL') + fetchAllRowsAL', throwSqlError) import Database.HDBC.Types import Database.HDBC.ColTypes @@ -149,42 +128,31 @@ * Support for querying database server properties * Add-on package (hdbc-missingh) to integrate with MissingH, - providing a database backend for AnyDBM. + providing a database backend for AnyDBM - * Support for querying metadata such as column names. + * Support for querying metadata such as column names * Support for querying additional metadata (column types, etc.) -} {- $drivers -Here is a list of known drivers as of March 28, 2006: - -[@Sqlite v3@] Available from . Or, to -participate in development, use -@darcs get --partial @ +Here is a list of known drivers as of May 6, 2019: -[@PostgreSQL@] Available from . Or, to -participate in development, use -@darcs get --partial @ +[@Sqlite v3@] Available from . -[@ODBC@] Available from . Or, to -partitipace in development, use -@darcs get --partial @ +[@PostgreSQL@] Available from . -[@MySQL@] MySQL users are encouraged to use the ODBC driver, which works -and has been tested against MySQL on both Linux\/Unix and Windows platforms. +[@ODBC@] Available from . -In addition, there is one integration package: /hdbc-anydbm/. This -integrates with the AnyDBM library . -It lets any HDBC database act as a backend for the -AnyDBM interface. Available from . Or, -to participate in development, use -@darcs get --partial @ +[@MySQL@] MySQL users have two choices: the first is the ODBC driver, which works +and has been tested against MySQL on both Linux\/Unix and Windows platforms. There is +also an alpha-quality native MySQL driver available for download at + with a homepage +at . The latest version of HDBC itself is available from -. Or, to participate in development, use -@darcs get --partial @. +. -} {- $transactions @@ -252,24 +220,4 @@ only get real multithreading when databases really support it. Details of thread support should be documented in the HDBC driver for each specific database. --} - -{- $legal -Copyright (C) 2005-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 - -Please see COPYING in the source distribution for the full license. -} diff --git a/Database/HDBC/ColTypes.hs b/Database/HDBC/ColTypes.hs --- a/Database/HDBC/ColTypes.hs +++ b/Database/HDBC/ColTypes.hs @@ -1,25 +1,7 @@ -{- -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.ColTypes - Copyright : Copyright (C) 2006 John Goerzen - License : GNU LGPL, version 2.1 or above + Copyright : Copyright (C) 2006-2011 John Goerzen + License : BSD3 Maintainer : John Goerzen Stability : provisional @@ -30,6 +12,7 @@ Written by John Goerzen, jgoerzen\@complete.org -} +{-# LANGUAGE DeriveDataTypeable #-} module Database.HDBC.ColTypes (SqlColDesc(..), SqlTypeId(..), @@ -60,13 +43,7 @@ ,colDecDigits :: Maybe Int -- ^ Digits to the right of the period ,colNullable :: Maybe Bool -- ^ Whether NULL is acceptable } - deriving (Eq, Read, Show) - -sqlColDescTc :: TyCon -sqlColDescTc = mkTyCon "Database.HDBC.SqlColDesc" - -instance Typeable SqlColDesc where - typeOf _ = mkTyConApp sqlColDescTc [] + deriving (Eq, Read, Show, Typeable) {- | The type identifier for a given column. @@ -96,21 +73,17 @@ | SqlVarBinaryT -- ^ Variable-length binary data | SqlLongVarBinaryT -- ^ Variable-length binary data, max length implementation dependant | SqlDateT -- ^ A date - | SqlTimeT -- ^ A time - | SqlTimestampT -- ^ Combined date and time + | SqlTimeT -- ^ A time, no timezone + | SqlTimeWithZoneT -- ^ A time, with timezone + | SqlTimestampT -- ^ Combined date and time, no timezone + | SqlTimestampWithZoneT -- ^ Combined date and time, with timezone | SqlUTCDateTimeT -- ^ UTC date\/time | SqlUTCTimeT -- ^ UTC time | SqlIntervalT SqlInterval -- ^ A time or date difference | SqlGUIDT -- ^ Global unique identifier | SqlUnknownT String -- ^ A type not represented here; implementation-specific information in the String - deriving (Eq, Show, Read) - -sqlTypeIdTc :: TyCon -sqlTypeIdTc = mkTyCon "Database.HDBC.SqlTypeId" - -instance Typeable SqlTypeId where - typeOf _ = mkTyConApp sqlTypeIdTc [] + deriving (Eq, Show, Read, Typeable) {- | The different types of intervals in SQL. -} data SqlInterval = @@ -127,10 +100,4 @@ | SqlIntervalHourToMinuteT -- ^ Difference in hours+minutes | SqlIntervalHourToSecondT -- ^ Difference in hours+seconds | SqlIntervalMinuteToSecondT -- ^ Difference in minutes+seconds - deriving (Eq, Show, Read) - -sqlIntervalTc :: TyCon -sqlIntervalTc = mkTyCon "Database.HDBC.SqlInterval" - -instance Typeable SqlInterval where - typeOf _ = mkTyConApp sqlIntervalTc [] + deriving (Eq, Show, Read, Typeable) diff --git a/Database/HDBC/DriverUtils.hs b/Database/HDBC/DriverUtils.hs --- a/Database/HDBC/DriverUtils.hs +++ b/Database/HDBC/DriverUtils.hs @@ -1,25 +1,7 @@ -{- -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.DriverUtils Copyright : Copyright (C) 2006 John Goerzen - License : GNU LGPL, version 2.1 or above + License : BSD3 Maintainer : John Goerzen Stability : provisional diff --git a/Database/HDBC/Locale.hs b/Database/HDBC/Locale.hs new file mode 100644 --- /dev/null +++ b/Database/HDBC/Locale.hs @@ -0,0 +1,34 @@ +{-# LANGUAGE CPP #-} +module Database.HDBC.Locale + ( + defaultTimeLocale, + iso8601DateFormat, + oldIso8601DateFormat + ) + +where + +#ifdef MIN_TIME_15 +import Data.Time.Format (defaultTimeLocale) +#else +import System.Locale (defaultTimeLocale) +#endif + +-- | As the semantic of System.Locale.iso8601DateFormat has changed with +-- old-locale-1.0.0.2 in a non-compatible way, we now define our own +-- (compatible) version of it. +iso8601DateFormat :: Maybe String -> String +iso8601DateFormat mTimeFmt = + "%0Y-%m-%d" ++ case mTimeFmt of + Nothing -> "" + Just fmt -> ' ' : fmt + +-- | HDBC would in versions up to and including 2.4.0.3 use this time format +-- string to serialize timestamps. To keep being able to deserialize timestamps +-- serialized on database engines that keep the representation intact (e.g. +-- SQLite) we keep this format string around, such that we can fall back to it. +oldIso8601DateFormat :: Maybe String -> String +oldIso8601DateFormat mTimeFmt = + "%Y-%m-%d" ++ case mTimeFmt of + Nothing -> "" + Just fmt -> ' ' : fmt diff --git a/Database/HDBC/SqlValue.hs b/Database/HDBC/SqlValue.hs new file mode 100644 --- /dev/null +++ b/Database/HDBC/SqlValue.hs @@ -0,0 +1,973 @@ +{-# LANGUAGE DeriveDataTypeable #-} +{-# LANGUAGE StandaloneDeriving #-} +module Database.HDBC.SqlValue + ( + -- * SQL value marshalling + SqlValue(..), + safeFromSql, toSql, fromSql, + nToSql, iToSql, posixToSql + ) + +where +import Control.Applicative ((<|>)) +import Data.Dynamic +import qualified Data.ByteString.UTF8 as BUTF8 +import qualified Data.ByteString as B +import qualified Data.ByteString.Lazy as BSL +import Data.Char(ord,toUpper) +import Data.Word +import Data.Int +import qualified System.Time as ST +import Data.Time ( Day (ModifiedJulianDay), DiffTime, LocalTime, NominalDiffTime, ParseTime + , TimeOfDay, TimeZone, UTCTime, ZonedTime, formatTime, localDay, localTimeOfDay + , timeOfDayToTime, timeToTimeOfDay, toModifiedJulianDay, utc + , utcToZonedTime, zonedTimeToLocalTime, zonedTimeToUTC, zonedTimeZone +#if MIN_TIME_15 + , parseTimeM +#else + , parseTime +#endif + ) +import Data.Time.Clock.POSIX +import Database.HDBC.Locale (defaultTimeLocale, iso8601DateFormat, oldIso8601DateFormat) +import Data.Ratio +import Data.Convertible +import Data.Fixed +import qualified Data.Text as TS +import qualified Data.Text.Lazy as TL + +quickError :: (Typeable a, Convertible SqlValue a) => SqlValue -> ConvertResult a +quickError sv = convError "incompatible types" sv + +{- | Convert a value to an 'SqlValue'. This function is simply +a restricted-type wrapper around 'convert'. See extended notes on 'SqlValue'. -} +toSql :: Convertible a SqlValue => a -> SqlValue +toSql = convert + +{- | Conversions to and from 'SqlValue's and standard Haskell types. + +This function converts from an 'SqlValue' to a Haskell value. Many people will use the simpler + 'fromSql' instead. This function is simply a restricted-type wrapper around + 'safeConvert'. -} +safeFromSql :: Convertible SqlValue a => SqlValue -> ConvertResult a +safeFromSql = safeConvert + +{- | Convert from an 'SqlValue' to a Haskell value. Any problem is indicated by + calling 'error'. This function is simply a restricted-type wrapper around + 'convert'. See extended notes on 'SqlValue'. -} +fromSql :: Convertible SqlValue a => SqlValue -> a +fromSql = convert + +{- | Converts any Integral type to a 'SqlValue' by using toInteger. -} +nToSql :: Integral a => a -> SqlValue +nToSql n = SqlInteger (toInteger n) + +{- | Convenience function for using numeric literals in your program. -} +iToSql :: Int -> SqlValue +iToSql = toSql + +{- | Convenience function for converting 'POSIXTime' to a 'SqlValue', because +'toSql' cannot do the correct thing in this instance. -} +posixToSql :: POSIXTime -> SqlValue +posixToSql x = SqlPOSIXTime x + +{- | 'SqlValue' is the main type for expressing Haskell values to SQL databases. + +/INTRODUCTION TO SQLVALUE/ + +This type is used to marshall Haskell data to and from database APIs. +HDBC driver interfaces will do their best to use the most accurate and +efficient way to send a particular value to the database server. + +Values read back from the server are constructed with the most appropriate 'SqlValue' +constructor. 'fromSql' or 'safeFromSql' +can then be used to convert them into whatever type +is needed locally in Haskell. + +Most people will use 'toSql' and 'fromSql' instead of manipulating +'SqlValue's directly. + +/EASY CONVERSIONS BETWEEN HASKELL TYPES/ + +Conversions are powerful; for instance, you can call 'fromSql' on a SqlInt32 +and get a String or a Double out of it. This class attempts to Do +The Right Thing whenever possible, and will raise an error when asked to +do something incorrect. In particular, when converting to any type +except a Maybe, 'SqlNull' as the input will cause an error to be raised. + +Conversions are implemented in terms of the "Data.Convertible" module, part of the +convertible package. You can refer to its documentation, and import that module, +if you wish to parse the Left result from 'safeFromSql' yourself, or write your +own conversion instances. + +Here are some notes about conversion: + + * Fractions of a second are not preserved on time values + + * There is no @safeToSql@ because 'toSql' never fails. + +See also 'toSql', 'safeFromSql', 'fromSql', 'nToSql', 'iToSql', 'posixToSql'. + +/ERROR CONDITIONS/ + +There may sometimes be an error during conversion. For instance, if you have a +'SqlString' and are attempting to convert it to an Integer, but it doesn't parse as +an Integer, you will get an error. This will be indicated as an exception if using +'fromSql', or a Left result if using 'safeFromSql'. + +/SPECIAL NOTE ON POSIXTIME/ + +Note that a 'NominalDiffTime' or 'POSIXTime' is converted to 'SqlDiffTime' by +'toSql'. HDBC cannot differentiate between 'NominalDiffTime' and 'POSIXTime' +since they are the same underlying type. You must construct 'SqlPOSIXTime' +manually or via 'posixToSql', or use 'SqlUTCTime'. + +/DETAILS ON SQL TYPES/ + +HDBC database backends are expected to marshal date and time data back and +forth using the appropriate representation for the underlying database engine. +Databases such as PostgreSQL with builtin date and time types should see automatic +conversion between these Haskell types to database types. Other databases will be +presented with an integer or a string. Care should be taken to use the same type on +the Haskell side as you use on the database side. For instance, if your database +type lacks timezone information, you ought not to use ZonedTime, but +instead LocalTime or UTCTime. Database type systems are not always as rich +as Haskell. For instance, for data stored in a TIMESTAMP +WITHOUT TIME ZONE column, HDBC may not be able to tell if it is intended +as UTCTime or LocalTime data, and will happily convert it to both, +upon your request. It is +your responsibility to ensure that you treat timezone issues with due care. + +This behavior also exists for other types. For instance, many databases do not +have a Rational type, so they will just use the show function and +store a Rational as a string. + +The conversion between Haskell types and database types is complex, +and generic code in HDBC or its backends cannot possibly accomodate +every possible situation. In some cases, you may be best served by converting your +Haskell type to a String, and passing that to the database. + +/UNICODE AND BYTESTRINGS/ + +Beginning with HDBC v2.0, interactions with a database are presumed to occur in UTF-8. + +To accomplish this, whenever a ByteString must be converted to or from a String, +the ByteString is assumed to be in UTF-8 encoding, and will be decoded or encoded +as appropriate. Database drivers will generally present text or string data they have +received from the database as a SqlValue holding a ByteString, which 'fromSql' will +automatically convert to a String, and thus automatically decode UTF-8, when +you need it. In the other direction, database drivers will generally convert +a 'SqlString' to a ByteString in UTF-8 encoding before passing it to the +database engine. + +If you are handling some sort of binary data that is not in UTF-8, you can of course +work with the ByteString directly, which will bypass any conversion. + +Due to lack of support by database engines, lazy ByteStrings are not passed to database +drivers. When you use 'toSql' on a lazy ByteString, it will be converted to a strict +ByteString for storage. Similarly, 'fromSql' will convert a strict ByteString to +a lazy ByteString if you demand it. + +/EQUALITY OF SQLVALUE/ + +Two SqlValues are considered to be equal if one of these hold. The +first comparison that can be made is controlling; if none of these +comparisons can be made, then they are not equal: + + * Both are NULL + + * Both represent the same type and the encapsulated values are considered equal + by applying (==) to them + + * The values of each, when converted to a string, are equal + +/STRING VERSIONS OF TIMES/ + +Default string representations are given as comments below where such are non-obvious. +These are used for 'fromSql' when a 'String' is desired. They are also defaults for +representing data to SQL backends, though individual backends may override them +when a different format is demanded by the underlying database. Date and time formats +use ISO8601 date format, with HH:MM:SS added for time, and -HHMM added for timezone +offsets. + +/DEPRECATED CONSTRUCTORS/ + +'SqlEpochTime' and 'SqlTimeDiff' are no longer created automatically by any +'toSql' or 'fromSql' functions or database backends. They may still be manually +constructed, but are +expected to be removed in a future version. Although these two constructures will +be removed, support for marshalling to and from the old System.Time data will be +maintained as long as System.Time is, simply using the newer data types for conversion. +-} +data SqlValue = SqlString String + | SqlByteString B.ByteString + | SqlWord32 Word32 + | SqlWord64 Word64 + | SqlInt32 Int32 + | SqlInt64 Int64 + | SqlInteger Integer + | SqlChar Char + | SqlBool Bool + | SqlDouble Double + | SqlRational Rational + | SqlLocalDate Day -- ^ Local YYYY-MM-DD (no timezone). + | SqlLocalTimeOfDay TimeOfDay -- ^ Local HH:MM:SS (no timezone). + | SqlZonedLocalTimeOfDay TimeOfDay TimeZone -- ^ Local HH:MM:SS -HHMM. Converts to and from (TimeOfDay, TimeZone). + | SqlLocalTime LocalTime -- ^ Local YYYY-MM-DD HH:MM:SS (no timezone). + | SqlZonedTime ZonedTime -- ^ Local YYYY-MM-DD HH:MM:SS -HHMM. Considered equal if both convert to the same UTC time. + | SqlUTCTime UTCTime -- ^ UTC YYYY-MM-DD HH:MM:SS. + | SqlDiffTime NominalDiffTime -- ^ Calendar diff between seconds. Rendered as Integer when converted to String, but greater precision may be preserved for other types or to underlying database. + | SqlPOSIXTime POSIXTime -- ^ Time as seconds since midnight Jan 1 1970 UTC. Integer rendering as for 'SqlDiffTime'. + | SqlEpochTime Integer -- ^ DEPRECATED Representation of ClockTime or CalendarTime. Use SqlPOSIXTime instead. + | SqlTimeDiff Integer -- ^ DEPRECATED Representation of TimeDiff. Use SqlDiffTime instead. + | SqlNull -- ^ NULL in SQL or Nothing in Haskell. + deriving (Show, Typeable) + +instance Eq SqlValue where + SqlString a == SqlString b = a == b + SqlByteString a == SqlByteString b = a == b + SqlWord32 a == SqlWord32 b = a == b + SqlWord64 a == SqlWord64 b = a == b + SqlInt32 a == SqlInt32 b = a == b + SqlInt64 a == SqlInt64 b = a == b + SqlInteger a == SqlInteger b = a == b + SqlChar a == SqlChar b = a == b + SqlBool a == SqlBool b = a == b + SqlDouble a == SqlDouble b = a == b + SqlRational a == SqlRational b = a == b + SqlLocalTimeOfDay a == SqlLocalTimeOfDay b = a == b + SqlZonedLocalTimeOfDay a b == SqlZonedLocalTimeOfDay c d = a == c && b == d + SqlLocalTime a == SqlLocalTime b = a == b + SqlLocalDate a == SqlLocalDate b = a == b + SqlZonedTime a == SqlZonedTime b = zonedTimeToUTC a == zonedTimeToUTC b + SqlUTCTime a == SqlUTCTime b = a == b + SqlPOSIXTime a == SqlPOSIXTime b = a == b + SqlDiffTime a == SqlDiffTime b = a == b + SqlEpochTime a == SqlEpochTime b = a == b + SqlTimeDiff a == SqlTimeDiff b = a == b + SqlNull == SqlNull = True + SqlNull == _ = False + _ == SqlNull = False + a == b = ((safeFromSql a)::ConvertResult String) == + ((safeFromSql b)::ConvertResult String) + +deriving instance Typeable ST.ClockTime +deriving instance Typeable ST.TimeDiff + +instance Convertible SqlValue SqlValue where + safeConvert = return + +instance Convertible String SqlValue where + safeConvert = return . SqlString +instance Convertible SqlValue String where + safeConvert (SqlString x) = return x + safeConvert (SqlByteString x) = return . BUTF8.toString $ x + safeConvert (SqlInt32 x) = return . show $ x + safeConvert (SqlInt64 x) = return . show $ x + safeConvert (SqlWord32 x) = return . show $ x + safeConvert (SqlWord64 x) = return . show $ x + safeConvert (SqlInteger x) = return . show $ x + safeConvert (SqlChar x) = return [x] + safeConvert (SqlBool x) = return . show $ x + safeConvert (SqlDouble x) = return . show $ x + safeConvert (SqlRational x) = return . show $ x + safeConvert (SqlLocalDate x) = + return . formatTime defaultTimeLocale (iso8601DateFormat Nothing) $ x + safeConvert (SqlLocalTimeOfDay x) = + return . formatTime defaultTimeLocale "%T%Q" $ x + safeConvert (SqlZonedLocalTimeOfDay tod tz) = + return $ formatTime defaultTimeLocale "%T%Q " tod ++ + formatTime defaultTimeLocale "%z" tz + safeConvert (SqlLocalTime x) = + return . formatTime defaultTimeLocale (iso8601DateFormat (Just "%T%Q")) $ x + safeConvert (SqlZonedTime x) = + return . formatTime defaultTimeLocale (iso8601DateFormat (Just "%T%Q %z")) $ x + safeConvert (SqlUTCTime x) = + return . formatTime defaultTimeLocale (iso8601DateFormat (Just "%T%Q")) $ x + safeConvert (SqlDiffTime x) = return $ showFixed True fixedval + where fixedval :: Pico + fixedval = fromRational . toRational $ x + safeConvert (SqlPOSIXTime x) = return $ showFixed True fixedval + where fixedval :: Pico + fixedval = fromRational . toRational $ x + safeConvert (SqlEpochTime x) = return . show $ x + safeConvert (SqlTimeDiff x) = return . show $ x + safeConvert y@(SqlNull) = quickError y + +instance Convertible TS.Text SqlValue where + safeConvert = return . SqlString . TS.unpack + +instance Convertible SqlValue TS.Text where + safeConvert = fmap TS.pack . safeConvert + +instance Convertible TL.Text SqlValue where + safeConvert = return . SqlString . TL.unpack + +instance Convertible SqlValue TL.Text where + safeConvert = fmap TL.pack . safeConvert + +#ifdef __HUGS__ +instance Typeable B.ByteString where + typeOf _ = mkTypeName "ByteString" +#endif + +instance Convertible B.ByteString SqlValue where + safeConvert = return . SqlByteString +instance Convertible SqlValue B.ByteString where + safeConvert (SqlByteString x) = return x + safeConvert y@(SqlNull) = quickError y + safeConvert x = safeConvert x >>= return . BUTF8.fromString + +instance Convertible BSL.ByteString SqlValue where + safeConvert = return . SqlByteString . B.concat . BSL.toChunks +instance Convertible SqlValue BSL.ByteString where + safeConvert x = do bs <- safeConvert x + return (BSL.fromChunks [bs]) + +instance Convertible Int SqlValue where + safeConvert x = + do i <- ((safeConvert x)::ConvertResult Int64) + return $ SqlInt64 i +instance Convertible SqlValue Int where + safeConvert (SqlString x) = read' x + safeConvert (SqlByteString x) = (read' . BUTF8.toString) x + safeConvert (SqlInt32 x) = safeConvert x + safeConvert (SqlInt64 x) = safeConvert x + safeConvert (SqlWord32 x) = safeConvert x + safeConvert (SqlWord64 x) = safeConvert x + safeConvert (SqlInteger x) = safeConvert x + safeConvert (SqlChar x) = safeConvert x + safeConvert (SqlBool x) = return (if x then 1 else 0) + safeConvert (SqlDouble x) = safeConvert x + safeConvert (SqlRational x) = safeConvert x + safeConvert y@(SqlLocalDate _) = viaInteger y fromIntegral + safeConvert y@(SqlLocalTimeOfDay _) = viaInteger y fromIntegral + safeConvert y@(SqlZonedLocalTimeOfDay _ _) = quickError y + safeConvert y@(SqlLocalTime _) = viaInteger y fromIntegral + safeConvert y@(SqlZonedTime _) = viaInteger y fromIntegral + safeConvert (SqlUTCTime x) = safeConvert x + safeConvert (SqlDiffTime x) = safeConvert x + safeConvert (SqlPOSIXTime x) = safeConvert x + safeConvert (SqlEpochTime x) = safeConvert x + safeConvert (SqlTimeDiff x) = safeConvert x + safeConvert y@(SqlNull) = quickError y + +instance Convertible Int32 SqlValue where + safeConvert = return . SqlInt32 +instance Convertible SqlValue Int32 where + safeConvert (SqlString x) = read' x + safeConvert (SqlByteString x) = (read' . BUTF8.toString) x + safeConvert (SqlInt32 x) = return x + safeConvert (SqlInt64 x) = safeConvert x + safeConvert (SqlWord32 x) = safeConvert x + safeConvert (SqlWord64 x) = safeConvert x + safeConvert (SqlInteger x) = safeConvert x + safeConvert (SqlChar x) = safeConvert x + safeConvert (SqlBool x) = return (if x then 1 else 0) + safeConvert (SqlDouble x) = safeConvert x + safeConvert (SqlRational x) = safeConvert x + safeConvert y@(SqlLocalDate _) = viaInteger y fromIntegral + safeConvert y@(SqlLocalTimeOfDay _) = viaInteger y fromIntegral + safeConvert y@(SqlZonedLocalTimeOfDay _ _) = quickError y + safeConvert y@(SqlLocalTime _) = viaInteger y fromIntegral + safeConvert y@(SqlZonedTime _) = viaInteger y fromIntegral + safeConvert y@(SqlUTCTime _) = viaInteger y fromIntegral + safeConvert y@(SqlDiffTime _) = viaInteger y fromIntegral + safeConvert y@(SqlPOSIXTime _) = viaInteger y fromIntegral + safeConvert (SqlEpochTime x) = safeConvert x + safeConvert (SqlTimeDiff x) = safeConvert x + safeConvert y@(SqlNull) = quickError y + +instance Convertible Int64 SqlValue where + safeConvert = return . SqlInt64 +instance Convertible SqlValue Int64 where + safeConvert (SqlString x) = read' x + safeConvert (SqlByteString x) = (read' . BUTF8.toString) x + safeConvert (SqlInt32 x) = safeConvert x + safeConvert (SqlInt64 x) = return x + safeConvert (SqlWord32 x) = safeConvert x + safeConvert (SqlWord64 x) = safeConvert x + safeConvert (SqlInteger x) = safeConvert x + safeConvert (SqlChar x) = safeConvert x + safeConvert (SqlBool x) = return (if x then 1 else 0) + safeConvert (SqlDouble x) = safeConvert x + safeConvert (SqlRational x) = safeConvert x + safeConvert y@(SqlLocalDate _) = viaInteger y fromIntegral + safeConvert y@(SqlLocalTimeOfDay _) = viaInteger y fromIntegral + safeConvert y@(SqlZonedLocalTimeOfDay _ _) = quickError y + safeConvert y@(SqlLocalTime _) = viaInteger y fromIntegral + safeConvert y@(SqlZonedTime _) = viaInteger y fromIntegral + safeConvert y@(SqlUTCTime _) = viaInteger y fromIntegral + safeConvert y@(SqlDiffTime _) = viaInteger y fromIntegral + safeConvert y@(SqlPOSIXTime _) = viaInteger y fromIntegral + safeConvert (SqlEpochTime x) = safeConvert x + safeConvert (SqlTimeDiff x) = safeConvert x + safeConvert y@(SqlNull) = quickError y + +instance Convertible Word32 SqlValue where + safeConvert = return . SqlWord32 +instance Convertible SqlValue Word32 where + safeConvert (SqlString x) = read' x + safeConvert (SqlByteString x) = (read' . BUTF8.toString) x + safeConvert (SqlInt32 x) = safeConvert x + safeConvert (SqlInt64 x) = safeConvert x + safeConvert (SqlWord32 x) = return x + safeConvert (SqlWord64 x) = safeConvert x + safeConvert (SqlInteger x) = safeConvert x + safeConvert (SqlChar x) = safeConvert x + safeConvert (SqlBool x) = return (if x then 1 else 0) + safeConvert (SqlDouble x) = safeConvert x + safeConvert (SqlRational x) = safeConvert x + safeConvert y@(SqlLocalDate _) = viaInteger y fromIntegral + safeConvert y@(SqlLocalTimeOfDay _) = viaInteger y fromIntegral + safeConvert y@(SqlZonedLocalTimeOfDay _ _) = quickError y + safeConvert y@(SqlLocalTime _) = viaInteger y fromIntegral + safeConvert y@(SqlZonedTime _) = viaInteger y fromIntegral + safeConvert y@(SqlUTCTime _) = viaInteger y fromIntegral + safeConvert y@(SqlDiffTime _) = viaInteger y fromIntegral + safeConvert y@(SqlPOSIXTime _) = viaInteger y fromIntegral + safeConvert (SqlEpochTime x) = safeConvert x + safeConvert (SqlTimeDiff x) = safeConvert x + safeConvert y@(SqlNull) = quickError y + +instance Convertible Word64 SqlValue where + safeConvert = return . SqlWord64 +instance Convertible SqlValue Word64 where + safeConvert (SqlString x) = read' x + safeConvert (SqlByteString x) = (read' . BUTF8.toString) x + safeConvert (SqlInt32 x) = safeConvert x + safeConvert (SqlInt64 x) = safeConvert x + safeConvert (SqlWord32 x) = safeConvert x + safeConvert (SqlWord64 x) = return x + safeConvert (SqlInteger x) = safeConvert x + safeConvert (SqlChar x) = safeConvert x + safeConvert (SqlBool x) = return (if x then 1 else 0) + safeConvert (SqlDouble x) = safeConvert x + safeConvert (SqlRational x) = safeConvert x + safeConvert y@(SqlLocalDate _) = viaInteger y fromIntegral + safeConvert y@(SqlLocalTimeOfDay _) = viaInteger y fromIntegral + safeConvert y@(SqlZonedLocalTimeOfDay _ _) = quickError y + safeConvert y@(SqlLocalTime _) = viaInteger y fromIntegral + safeConvert y@(SqlZonedTime _) = viaInteger y fromIntegral + safeConvert y@(SqlUTCTime _) = viaInteger y fromIntegral + safeConvert y@(SqlDiffTime _) = viaInteger y fromIntegral + safeConvert y@(SqlPOSIXTime _) = viaInteger y fromIntegral + safeConvert (SqlEpochTime x) = safeConvert x + safeConvert (SqlTimeDiff x) = safeConvert x + safeConvert y@(SqlNull) = quickError y + +instance Convertible Integer SqlValue where + safeConvert = return . SqlInteger +instance Convertible SqlValue Integer where + safeConvert (SqlString x) = read' x + safeConvert (SqlByteString x) = (read' . BUTF8.toString) x + safeConvert (SqlInt32 x) = safeConvert x + safeConvert (SqlInt64 x) = safeConvert x + safeConvert (SqlWord32 x) = safeConvert x + safeConvert (SqlWord64 x) = safeConvert x + safeConvert (SqlInteger x) = return x + safeConvert (SqlChar x) = safeConvert x + safeConvert (SqlBool x) = return (if x then 1 else 0) + safeConvert (SqlDouble x) = safeConvert x + safeConvert (SqlRational x) = safeConvert x + safeConvert (SqlLocalDate x) = return . toModifiedJulianDay $ x + safeConvert (SqlLocalTimeOfDay x) = + return . fromIntegral . fromEnum . timeOfDayToTime $ x + safeConvert y@(SqlZonedLocalTimeOfDay _ _) = quickError y + safeConvert y@(SqlLocalTime _) = quickError y + safeConvert (SqlZonedTime x) = + return . truncate . utcTimeToPOSIXSeconds . zonedTimeToUTC $ x + safeConvert (SqlUTCTime x) = safeConvert x + safeConvert (SqlDiffTime x) = safeConvert x + safeConvert (SqlPOSIXTime x) = safeConvert x + safeConvert (SqlEpochTime x) = return x + safeConvert (SqlTimeDiff x) = return x + safeConvert y@(SqlNull) = quickError y + +instance Convertible Bool SqlValue where + safeConvert = return . SqlBool +instance Convertible SqlValue Bool where + safeConvert y@(SqlString x) = + case map toUpper x of + "TRUE" -> Right True + "T" -> Right True + "FALSE" -> Right False + "F" -> Right False + "0" -> Right False + "1" -> Right True + _ -> convError "Cannot parse given String as Bool" y + safeConvert (SqlByteString x) = (safeConvert . SqlString . BUTF8.toString) x + safeConvert (SqlInt32 x) = numToBool x + safeConvert (SqlInt64 x) = numToBool x + safeConvert (SqlWord32 x) = numToBool x + safeConvert (SqlWord64 x) = numToBool x + safeConvert (SqlInteger x) = numToBool x + safeConvert (SqlChar x) = numToBool (ord x) + safeConvert (SqlBool x) = return x + safeConvert (SqlDouble x) = numToBool x + safeConvert (SqlRational x) = numToBool x + safeConvert y@(SqlLocalDate _) = quickError y + safeConvert y@(SqlLocalTimeOfDay _) = quickError y + safeConvert y@(SqlZonedLocalTimeOfDay _ _) = quickError y + safeConvert y@(SqlLocalTime _) = quickError y + safeConvert y@(SqlZonedTime _) = quickError y + safeConvert y@(SqlUTCTime _) = quickError y + safeConvert y@(SqlDiffTime _) = quickError y + safeConvert y@(SqlPOSIXTime _) = quickError y + safeConvert (SqlEpochTime x) = numToBool x + safeConvert (SqlTimeDiff x) = numToBool x + safeConvert y@(SqlNull) = quickError y + +numToBool :: (Eq a, Num a) => a -> ConvertResult Bool +numToBool x = Right (x /= 0) + +instance Convertible Char SqlValue where + safeConvert = return . SqlChar +instance Convertible SqlValue Char where + safeConvert (SqlString [x]) = return x + safeConvert y@(SqlString _) = convError "String length /= 1" y + safeConvert (SqlByteString x) = + safeConvert . SqlString . BUTF8.toString $ x + safeConvert y@(SqlInt32 _) = quickError y + safeConvert y@(SqlInt64 _) = quickError y + safeConvert y@(SqlWord32 _) = quickError y + safeConvert y@(SqlWord64 _) = quickError y + safeConvert y@(SqlInteger _) = quickError y + safeConvert (SqlChar x) = return x + safeConvert (SqlBool x) = return (if x then '1' else '0') + safeConvert y@(SqlDouble _) = quickError y + safeConvert y@(SqlRational _) = quickError y + safeConvert y@(SqlLocalDate _) = quickError y + safeConvert y@(SqlLocalTimeOfDay _) = quickError y + safeConvert y@(SqlZonedLocalTimeOfDay _ _) = quickError y + safeConvert y@(SqlLocalTime _) = quickError y + safeConvert y@(SqlZonedTime _) = quickError y + safeConvert y@(SqlUTCTime _) = quickError y + safeConvert y@(SqlDiffTime _) = quickError y + safeConvert y@(SqlPOSIXTime _) = quickError y + safeConvert y@(SqlEpochTime _) = quickError y + safeConvert y@(SqlTimeDiff _) = quickError y + safeConvert y@(SqlNull) = quickError y + +instance Convertible Double SqlValue where + safeConvert = return . SqlDouble +instance Convertible SqlValue Double where + safeConvert (SqlString x) = read' x + safeConvert (SqlByteString x) = (read' . BUTF8.toString) x + safeConvert (SqlInt32 x) = safeConvert x + safeConvert (SqlInt64 x) = safeConvert x + safeConvert (SqlWord32 x) = safeConvert x + safeConvert (SqlWord64 x) = safeConvert x + safeConvert (SqlInteger x) = safeConvert x + safeConvert (SqlChar x) = return . fromIntegral . fromEnum $ x + safeConvert (SqlBool x) = return (if x then 1.0 else 0.0) + safeConvert (SqlDouble x) = return x + safeConvert (SqlRational x) = safeConvert x + safeConvert y@(SqlLocalDate _) = ((safeConvert y)::ConvertResult Integer) >>= + (return . fromIntegral) + safeConvert (SqlLocalTimeOfDay x) = + return . fromRational . toRational . timeOfDayToTime $ x + safeConvert y@(SqlZonedLocalTimeOfDay _ _) = quickError y + safeConvert y@(SqlLocalTime _) = quickError y + safeConvert (SqlZonedTime x) = + safeConvert . SqlUTCTime . zonedTimeToUTC $ x + safeConvert (SqlUTCTime x) = + return . fromRational . toRational . utcTimeToPOSIXSeconds $ x + safeConvert (SqlDiffTime x) = safeConvert x + safeConvert (SqlPOSIXTime x) = safeConvert x + safeConvert (SqlEpochTime x) = safeConvert x + safeConvert (SqlTimeDiff x) = safeConvert x + safeConvert y@(SqlNull) = quickError y + +instance Convertible Rational SqlValue where + safeConvert = return . SqlRational +instance Convertible SqlValue Rational where + safeConvert (SqlString x) = read' x + safeConvert (SqlByteString x) = (read' . BUTF8.toString) x + safeConvert (SqlInt32 x) = safeConvert x + safeConvert (SqlInt64 x) = safeConvert x + safeConvert (SqlWord32 x) = safeConvert x + safeConvert (SqlWord64 x) = safeConvert x + safeConvert (SqlInteger x) = safeConvert x + safeConvert (SqlChar x) = return . fromIntegral . fromEnum $ x + safeConvert (SqlBool x) = return $ if x then fromIntegral (1::Int) + else fromIntegral (0::Int) + safeConvert (SqlDouble x) = safeConvert x + safeConvert (SqlRational x) = return x + safeConvert y@(SqlLocalDate _) = ((safeConvert y)::ConvertResult Integer) >>= + (return . fromIntegral) + safeConvert (SqlLocalTimeOfDay x) = return . toRational . timeOfDayToTime $ x + safeConvert y@(SqlZonedLocalTimeOfDay _ _) = quickError y + safeConvert y@(SqlLocalTime _) = quickError y + safeConvert (SqlZonedTime x) = safeConvert . SqlUTCTime . zonedTimeToUTC $ x + safeConvert (SqlUTCTime x) = safeConvert x + safeConvert (SqlDiffTime x) = safeConvert x + safeConvert (SqlPOSIXTime x) = safeConvert x + safeConvert (SqlEpochTime x) = return . fromIntegral $ x + safeConvert (SqlTimeDiff x) = return . fromIntegral $ x + safeConvert y@(SqlNull) = quickError y + +instance Convertible Day SqlValue where + safeConvert = return . SqlLocalDate +instance Convertible SqlValue Day where + safeConvert (SqlString x) = parseTimeISO8601 Nothing x + safeConvert (SqlByteString x) = safeConvert (SqlString (BUTF8.toString x)) + safeConvert (SqlInt32 x) = + return $ ModifiedJulianDay {toModifiedJulianDay = fromIntegral x} + safeConvert (SqlInt64 x) = + return $ ModifiedJulianDay {toModifiedJulianDay = fromIntegral x} + safeConvert (SqlWord32 x) = + return $ ModifiedJulianDay {toModifiedJulianDay = fromIntegral x} + safeConvert (SqlWord64 x) = + return $ ModifiedJulianDay {toModifiedJulianDay = fromIntegral x} + safeConvert (SqlInteger x) = + return $ ModifiedJulianDay {toModifiedJulianDay = x} + safeConvert y@(SqlChar _) = quickError y + safeConvert y@(SqlBool _) = quickError y + safeConvert (SqlDouble x) = + return $ ModifiedJulianDay {toModifiedJulianDay = truncate x} + safeConvert (SqlRational x) = safeConvert . SqlDouble . fromRational $ x + safeConvert (SqlLocalDate x) = return x + safeConvert y@(SqlLocalTimeOfDay _) = quickError y + safeConvert y@(SqlZonedLocalTimeOfDay _ _) = quickError y + safeConvert (SqlLocalTime x) = return . localDay $ x + safeConvert y@(SqlZonedTime _) = safeConvert y >>= return . localDay + safeConvert y@(SqlUTCTime _) = safeConvert y >>= return . localDay + safeConvert y@(SqlDiffTime _) = quickError y + safeConvert y@(SqlPOSIXTime _) = safeConvert y >>= return . localDay + safeConvert y@(SqlEpochTime _) = safeConvert y >>= return . localDay + safeConvert y@(SqlTimeDiff _) = quickError y + safeConvert y@(SqlNull) = quickError y + +instance Convertible TimeOfDay SqlValue where + safeConvert = return . SqlLocalTimeOfDay +instance Convertible SqlValue TimeOfDay where + safeConvert (SqlString x) = parseTime' "%T%Q" x + safeConvert (SqlByteString x) = safeConvert (SqlString (BUTF8.toString x)) + safeConvert (SqlInt32 x) = return . timeToTimeOfDay . fromIntegral $ x + safeConvert (SqlInt64 x) = return . timeToTimeOfDay . fromIntegral $ x + safeConvert (SqlWord32 x) = return . timeToTimeOfDay . fromIntegral $ x + safeConvert (SqlWord64 x) = return . timeToTimeOfDay . fromIntegral $ x + safeConvert (SqlInteger x) = return . timeToTimeOfDay . fromInteger $ x + safeConvert y@(SqlChar _) = quickError y + safeConvert y@(SqlBool _) = quickError y + safeConvert (SqlDouble x) = + return . timeToTimeOfDay . fromIntegral $ ((truncate x)::Integer) + safeConvert (SqlRational x) = safeConvert . SqlDouble . fromRational $ x + safeConvert y@(SqlLocalDate _) = quickError y + safeConvert (SqlLocalTimeOfDay x) = return x + safeConvert (SqlZonedLocalTimeOfDay tod _) = return tod + safeConvert (SqlLocalTime x) = return . localTimeOfDay $ x + safeConvert y@(SqlZonedTime _) = safeConvert y >>= return . localTimeOfDay + safeConvert y@(SqlUTCTime _) = safeConvert y >>= return . localTimeOfDay + safeConvert y@(SqlDiffTime _) = quickError y + safeConvert y@(SqlPOSIXTime _) = safeConvert y >>= return . localTimeOfDay + safeConvert y@(SqlEpochTime _) = safeConvert y >>= return . localTimeOfDay + safeConvert y@(SqlTimeDiff _) = quickError y + safeConvert y@SqlNull = quickError y + +instance Convertible (TimeOfDay, TimeZone) SqlValue where + safeConvert (tod, tz) = return (SqlZonedLocalTimeOfDay tod tz) +instance Convertible SqlValue (TimeOfDay, TimeZone) where + safeConvert (SqlString x) = + do tod <- parseTime' "%T%Q %z" x +#if MIN_TIME_15 + tz <- case parseTimeM True defaultTimeLocale "%T%Q %z" x of +#else + tz <- case parseTime defaultTimeLocale "%T%Q %z" x of +#endif + Nothing -> convError "Couldn't extract timezone in" (SqlString x) + Just y -> Right y + return (tod, tz) + safeConvert (SqlByteString x) = safeConvert (SqlString (BUTF8.toString x)) + safeConvert y@(SqlInt32 _) = quickError y + safeConvert y@(SqlInt64 _) = quickError y + safeConvert y@(SqlWord32 _) = quickError y + safeConvert y@(SqlWord64 _) = quickError y + safeConvert y@(SqlInteger _) = quickError y + safeConvert y@(SqlChar _) = quickError y + safeConvert y@(SqlBool _) = quickError y + safeConvert y@(SqlDouble _) = quickError y + safeConvert y@(SqlRational _) = quickError y + safeConvert y@(SqlLocalDate _) = quickError y + safeConvert y@(SqlLocalTimeOfDay _) = quickError y + safeConvert (SqlZonedLocalTimeOfDay x y) = return (x, y) + safeConvert y@(SqlLocalTime _) = quickError y + safeConvert (SqlZonedTime x) = return (localTimeOfDay . zonedTimeToLocalTime $ x, + zonedTimeZone x) + safeConvert y@(SqlUTCTime _) = quickError y + safeConvert y@(SqlDiffTime _) = quickError y + safeConvert y@(SqlPOSIXTime _) = quickError y + safeConvert y@(SqlEpochTime _) = quickError y + safeConvert y@(SqlTimeDiff _) = quickError y + safeConvert y@SqlNull = quickError y + +instance Convertible LocalTime SqlValue where + safeConvert = return . SqlLocalTime +instance Convertible SqlValue LocalTime where + safeConvert (SqlString x) = parseTimeISO8601 (Just "%T%Q") x + safeConvert (SqlByteString x) = safeConvert (SqlString (BUTF8.toString x)) + safeConvert y@(SqlInt32 _) = quickError y + safeConvert y@(SqlInt64 _) = quickError y + safeConvert y@(SqlWord32 _) = quickError y + safeConvert y@(SqlWord64 _) = quickError y + safeConvert y@(SqlInteger _) = quickError y + safeConvert y@(SqlChar _) = quickError y + safeConvert y@(SqlBool _) = quickError y + safeConvert y@(SqlDouble _) = quickError y + safeConvert y@(SqlRational _) = quickError y + safeConvert y@(SqlLocalDate _) = quickError y + safeConvert y@(SqlLocalTimeOfDay _) = quickError y + safeConvert y@(SqlZonedLocalTimeOfDay _ _) = quickError y + safeConvert (SqlLocalTime x) = return x + safeConvert (SqlZonedTime x) = return . zonedTimeToLocalTime $ x + safeConvert y@(SqlUTCTime _) = safeConvert y >>= return . zonedTimeToLocalTime + safeConvert y@(SqlDiffTime _) = quickError y + safeConvert y@(SqlPOSIXTime _) = safeConvert y >>= return . zonedTimeToLocalTime + safeConvert y@(SqlEpochTime _) = safeConvert y >>= return . zonedTimeToLocalTime + safeConvert y@(SqlTimeDiff _) = quickError y + safeConvert y@SqlNull = quickError y + +instance Convertible ZonedTime SqlValue where + safeConvert = return . SqlZonedTime +instance Convertible SqlValue ZonedTime where + safeConvert (SqlString x) = parseTimeISO8601 (Just "%T%Q %z") x + safeConvert (SqlByteString x) = safeConvert (SqlString (BUTF8.toString x)) + safeConvert (SqlInt32 x) = safeConvert (SqlInteger (fromIntegral x)) + safeConvert (SqlInt64 x) = safeConvert (SqlInteger (fromIntegral x)) + safeConvert (SqlWord32 x) = safeConvert (SqlInteger (fromIntegral x)) + safeConvert (SqlWord64 x) = safeConvert (SqlInteger (fromIntegral x)) + safeConvert y@(SqlInteger _) = safeConvert y >>= return . utcToZonedTime utc + safeConvert y@(SqlChar _) = quickError y + safeConvert y@(SqlBool _) = quickError y + safeConvert y@(SqlDouble _) = safeConvert y >>= return . utcToZonedTime utc + safeConvert y@(SqlRational _) = safeConvert y >>= return . utcToZonedTime utc + safeConvert y@(SqlLocalDate _) = quickError y + safeConvert y@(SqlLocalTime _) = quickError y + safeConvert y@(SqlLocalTimeOfDay _) = quickError y + safeConvert y@(SqlZonedLocalTimeOfDay _ _) = quickError y + safeConvert (SqlZonedTime x) = return x + safeConvert (SqlUTCTime x) = return . utcToZonedTime utc $ x + safeConvert y@(SqlDiffTime _) = quickError y + safeConvert y@(SqlPOSIXTime _) = safeConvert y >>= return . utcToZonedTime utc + safeConvert y@(SqlEpochTime _) = safeConvert y >>= return . utcToZonedTime utc + safeConvert y@(SqlTimeDiff _) = quickError y + safeConvert y@SqlNull = quickError y + +instance Convertible UTCTime SqlValue where + safeConvert = return . SqlUTCTime +instance Convertible SqlValue UTCTime where + safeConvert (SqlString x) = parseTimeISO8601 (Just "%T%Q") x + safeConvert (SqlByteString x) = safeConvert (SqlString (BUTF8.toString x)) + safeConvert y@(SqlInt32 _) = safeConvert y >>= return . posixSecondsToUTCTime + safeConvert y@(SqlInt64 _) = safeConvert y >>= return . posixSecondsToUTCTime + safeConvert y@(SqlWord32 _) = safeConvert y >>= return . posixSecondsToUTCTime + safeConvert y@(SqlWord64 _) = safeConvert y >>= return . posixSecondsToUTCTime + safeConvert y@(SqlInteger _) = safeConvert y >>= return . posixSecondsToUTCTime + safeConvert y@(SqlChar _) = quickError y + safeConvert y@(SqlBool _) = quickError y + safeConvert y@(SqlDouble _) = safeConvert y >>= return . posixSecondsToUTCTime + safeConvert y@(SqlRational _) = safeConvert y >>= return . posixSecondsToUTCTime + safeConvert y@(SqlLocalDate _) = quickError y + safeConvert y@(SqlLocalTimeOfDay _) = quickError y + safeConvert y@(SqlZonedLocalTimeOfDay _ _) = quickError y + safeConvert y@(SqlLocalTime _) = quickError y + safeConvert (SqlZonedTime x) = return . zonedTimeToUTC $ x + safeConvert (SqlUTCTime x) = return x + safeConvert y@(SqlDiffTime _) = convError "incompatible types (did you mean SqlPOSIXTime?)" y + safeConvert (SqlPOSIXTime x) = return . posixSecondsToUTCTime $ x + safeConvert y@(SqlEpochTime _) = safeConvert y >>= return . posixSecondsToUTCTime + safeConvert y@(SqlTimeDiff _) = convError "incompatible types (did you mean SqlPOSIXTime?)" y + safeConvert y@SqlNull = quickError y + +stringToPico :: String -> ConvertResult Pico +stringToPico s = + let (base, fracwithdot) = span (/= '.') s + shortfrac = drop 1 fracwithdot -- strip of dot; don't use tail because it may be empty + frac = take 12 (rpad 12 '0' shortfrac) + rpad :: Int -> a -> [a] -> [a] + -- next line lifted from Data.Time + rpad n c xs = xs ++ replicate (n - length xs) c + mkPico :: Integer -> Integer -> Pico + -- next line also lifted from Data.Time + mkPico i f = fromInteger i + fromRational (f % 1000000000000) + in do parsedBase <- read' base + parsedFrac <- read' frac + return (mkPico parsedBase parsedFrac) + +instance Convertible NominalDiffTime SqlValue where + safeConvert = return . SqlDiffTime +instance Convertible SqlValue NominalDiffTime where + safeConvert (SqlString x) = stringToPico x >>= + return . realToFrac + safeConvert (SqlByteString x) = (stringToPico (BUTF8.toString x)) >>= + return . realToFrac + safeConvert (SqlInt32 x) = return . fromIntegral $ x + safeConvert (SqlInt64 x) = return . fromIntegral $ x + safeConvert (SqlWord32 x) = return . fromIntegral $ x + safeConvert (SqlWord64 x) = return . fromIntegral $ x + safeConvert (SqlInteger x) = return . fromIntegral $ x + safeConvert y@(SqlChar _) = quickError y + safeConvert y@(SqlBool _) = quickError y + safeConvert (SqlDouble x) = return . fromRational . toRational $ x + safeConvert (SqlRational x) = return . fromRational $ x + safeConvert (SqlLocalDate x) = return . fromIntegral . (\y -> y * 60 * 60 * 24) . + toModifiedJulianDay $ x + safeConvert (SqlLocalTimeOfDay x) = + return . fromRational . toRational . timeOfDayToTime $ x + safeConvert y@(SqlZonedLocalTimeOfDay _ _) = quickError y + safeConvert y@(SqlLocalTime _) = quickError y + safeConvert (SqlZonedTime x) = return . utcTimeToPOSIXSeconds . zonedTimeToUTC $ x + safeConvert (SqlUTCTime x) = return . utcTimeToPOSIXSeconds $ x + safeConvert (SqlDiffTime x) = return x + safeConvert (SqlPOSIXTime x) = return x + safeConvert (SqlEpochTime x) = return . fromIntegral $ x + safeConvert (SqlTimeDiff x) = return . fromIntegral $ x + safeConvert y@SqlNull = quickError y + +instance Convertible ST.ClockTime SqlValue where + safeConvert x = safeConvert x >>= return . SqlPOSIXTime +instance Convertible SqlValue ST.ClockTime where + safeConvert (SqlString x) = do r <- read' x + return $ ST.TOD r 0 + safeConvert (SqlByteString x) = safeConvert . SqlString . BUTF8.toString $ x + safeConvert (SqlInt32 x) = return $ ST.TOD (fromIntegral x) 0 + safeConvert (SqlInt64 x) = return $ ST.TOD (fromIntegral x) 0 + safeConvert (SqlWord32 x) = return $ ST.TOD (fromIntegral x) 0 + safeConvert (SqlWord64 x) = return $ ST.TOD (fromIntegral x) 0 + safeConvert (SqlInteger x) = return $ ST.TOD x 0 + safeConvert y@(SqlChar _) = quickError y + safeConvert y@(SqlBool _) = quickError y + safeConvert (SqlDouble x) = return $ ST.TOD (truncate x) 0 + safeConvert (SqlRational x) = return $ ST.TOD (truncate x) 0 + safeConvert y@(SqlLocalDate _) = quickError y + safeConvert y@(SqlLocalTimeOfDay _) = quickError y + safeConvert y@(SqlZonedLocalTimeOfDay _ _) = quickError y + safeConvert y@(SqlLocalTime _) = quickError y + safeConvert y@(SqlZonedTime _) = safeConvert y >>= (\z -> return $ ST.TOD z 0) + safeConvert y@(SqlUTCTime _) = safeConvert y >>= (\z -> return $ ST.TOD z 0) + safeConvert y@(SqlDiffTime _) = quickError y + safeConvert y@(SqlPOSIXTime _) = safeConvert y >>= (\z -> return $ ST.TOD z 0) + safeConvert (SqlEpochTime x) = return $ ST.TOD x 0 + safeConvert y@(SqlTimeDiff _) = quickError y + safeConvert y@SqlNull = quickError y + +instance Convertible ST.TimeDiff SqlValue where + safeConvert x = safeConvert x >>= return . SqlDiffTime +instance Convertible SqlValue ST.TimeDiff where + safeConvert y@(SqlString _) = + do r <- safeConvert y + safeConvert (SqlDiffTime r) + safeConvert (SqlByteString x) = safeConvert . SqlString . BUTF8.toString $ x + safeConvert (SqlInt32 x) = secs2td (fromIntegral x) + safeConvert (SqlInt64 x) = secs2td (fromIntegral x) + safeConvert (SqlWord32 x) = secs2td (fromIntegral x) + safeConvert (SqlWord64 x) = secs2td (fromIntegral x) + safeConvert (SqlInteger x) = secs2td x + safeConvert y@(SqlChar _) = quickError y + safeConvert y@(SqlBool _) = quickError y + safeConvert (SqlDouble x) = secs2td (truncate x) + safeConvert (SqlRational x) = secs2td (truncate x) + safeConvert y@(SqlLocalDate _) = quickError y + safeConvert y@(SqlLocalTimeOfDay _) = quickError y + safeConvert y@(SqlZonedLocalTimeOfDay _ _) = quickError y + safeConvert y@(SqlLocalTime _) = quickError y + safeConvert y@(SqlZonedTime _) = quickError y + safeConvert y@(SqlUTCTime _) = quickError y + safeConvert y@(SqlPOSIXTime _) = quickError y + safeConvert (SqlDiffTime x) = safeConvert x + safeConvert y@(SqlEpochTime _) = quickError y + safeConvert (SqlTimeDiff x) = secs2td x + safeConvert y@SqlNull = quickError y + +instance Convertible DiffTime SqlValue where + safeConvert = return . SqlDiffTime . fromRational . toRational +instance Convertible SqlValue DiffTime where + safeConvert (SqlString x) = read' x >>= return . fromInteger + safeConvert (SqlByteString x) = safeConvert . SqlString . BUTF8.toString $ x + safeConvert (SqlInt32 x) = return . fromIntegral $ x + safeConvert (SqlInt64 x) = return . fromIntegral $ x + safeConvert (SqlWord32 x) = return . fromIntegral $ x + safeConvert (SqlWord64 x) = return . fromIntegral $ x + safeConvert (SqlInteger x) = return . fromIntegral $ x + safeConvert y@(SqlChar _) = quickError y + safeConvert y@(SqlBool _) = quickError y + safeConvert (SqlDouble x) = return . fromRational . toRational $ x + safeConvert (SqlRational x) = return . fromRational $ x + safeConvert y@(SqlLocalDate _) = quickError y + safeConvert y@(SqlLocalTimeOfDay _) = quickError y + safeConvert y@(SqlZonedLocalTimeOfDay _ _) = quickError y + safeConvert y@(SqlLocalTime _) = quickError y + safeConvert y@(SqlZonedTime _) = quickError y + safeConvert y@(SqlUTCTime _) = quickError y + safeConvert (SqlDiffTime x) = return . fromRational . toRational $ x + safeConvert y@(SqlPOSIXTime _) = quickError y + safeConvert y@(SqlEpochTime _) = quickError y + safeConvert (SqlTimeDiff x) = return . fromIntegral $ x + safeConvert y@SqlNull = quickError y + +instance Convertible ST.CalendarTime SqlValue where + -- convert via ZonedTime + safeConvert x = safeConvert x >>= return . SqlZonedTime +instance Convertible SqlValue ST.CalendarTime where + -- convert via ZonedTime + safeConvert = convertVia (undefined::ZonedTime) + +instance (Convertible a SqlValue) => Convertible (Maybe a) SqlValue where + safeConvert Nothing = return SqlNull + safeConvert (Just a) = safeConvert a +instance (Convertible SqlValue a) => Convertible SqlValue (Maybe a) where + safeConvert SqlNull = return Nothing + safeConvert a = safeConvert a >>= (return . Just) + +viaInteger' :: (Convertible SqlValue a, Bounded a, Show a, Convertible a Integer, + Typeable a) => SqlValue -> (Integer -> ConvertResult a) -> ConvertResult a +viaInteger' sv func = + do i <- ((safeConvert sv)::ConvertResult Integer) + boundedConversion func i + +viaInteger :: (Convertible SqlValue a, Bounded a, Show a, Convertible a Integer, + Typeable a) => SqlValue -> (Integer -> a) -> ConvertResult a +viaInteger sv func = viaInteger' sv (return . func) + +secs2td :: Integer -> ConvertResult ST.TimeDiff +secs2td x = safeConvert x + + +-- | Read a value from a string, and give an informative message +-- if it fails. +read' :: (Typeable a, Read a, Convertible SqlValue a) => String -> ConvertResult a +read' s = + case reads s of + [(x,"")] -> Right x + _ -> convError "Cannot read source value as dest type" (SqlString s) + +#ifdef __HUGS__ +parseTime' :: (Typeable t, Convertible SqlValue t) => String -> String -> ConvertResult t +parseTime' _ inpstr = + convError "Hugs does not support time parsing" (SqlString inpstr) +#else +parseTime' :: (Typeable t, Convertible SqlValue t, ParseTime t) => String -> String -> ConvertResult t +parseTime' fmtstr inpstr = +#if MIN_TIME_15 + case parseTimeM True defaultTimeLocale fmtstr inpstr of +#else + case parseTime defaultTimeLocale fmtstr inpstr of +#endif + Nothing -> convError ("Cannot parse using default format string " ++ show fmtstr) + (SqlString inpstr) + Just x -> Right x +#endif + +parseTimeISO8601 :: (Typeable t, Convertible SqlValue t, ParseTime t) => Maybe String -> String -> ConvertResult t +parseTimeISO8601 fmtstr inpstr = + case tryParse iso8601DateFormat <|> tryParse oldIso8601DateFormat of + Nothing -> convError "Cannot parse ISO8601 timestamp" (SqlString inpstr) + Just x -> Right x + where + tryParse fmtFunction = +#if MIN_TIME_15 + parseTimeM True defaultTimeLocale (fmtFunction fmtstr) inpstr +#else + parseTime defaultTimeLocale (fmtFunction fmtstr) inpstr +#endif diff --git a/Database/HDBC/Statement.hs b/Database/HDBC/Statement.hs --- a/Database/HDBC/Statement.hs +++ b/Database/HDBC/Statement.hs @@ -1,19 +1,19 @@ +{-# LANGUAGE DeriveDataTypeable #-} module Database.HDBC.Statement ( Statement(..), SqlError(..), - SqlType(..), nToSql, iToSql, + + -- * Re-exported from "Database.HDBC.SqlValue"; this re-exporting is deprecated + nToSql, iToSql, posixToSql, fromSql, safeFromSql, toSql, SqlValue(..) ) where import Data.Dynamic -import qualified Data.ByteString as B -import Data.Char(ord,toUpper) -import Data.Word -import Data.Int -import System.Time import Database.HDBC.ColTypes +import Database.HDBC.SqlValue +import Control.Exception data Statement = Statement { @@ -33,6 +33,13 @@ -} execute :: [SqlValue] -> IO Integer, + {- | Execute the statement as-is, without supplying any + positional parameters. This is intended for statements for + which the results aren't interesting or present (e.g., DDL or + DML commands). If your query contains placeholders, this will + certainly fail; use 'execute' instead. -} + executeRaw :: IO (), + {- | Execute the query with many rows. The return value is the return value from the final row as if you had called 'execute' on it. @@ -101,384 +108,15 @@ data SqlError = SqlError {seState :: String, seNativeError :: Int, seErrorMsg :: String} - deriving (Eq, Show, Read) + deriving (Eq, Show, Read, Typeable) -sqlErrorTc :: TyCon -sqlErrorTc = mkTyCon "Database.HDBC.SqlError" -instance Typeable SqlError where - typeOf _ = mkTyConApp sqlErrorTc [] - -{- | Conversions to and from 'SqlValue's and standard Haskell types. - -Conversions are powerful; for instance, you can call 'fromSql' on a SqlInt32 -and get a String or a Double out of it. This class attempts to Do -The Right Thing whenever possible, and will raise an error when asked to -do something incorrect. In particular, when converting to any type -except a Maybe, 'SqlNull' as the input will cause an error to be raised. - -Here are some notes about conversion: - - * Fractions of a second are not preserved on time values - -See also 'nToSql', 'iToSql'. +#if __GLASGOW_HASKELL__ >= 610 +--data SqlException +instance Exception SqlError where +{- + toException = SomeException + fromException (SomeException e) = Just e + fromException _ = Nothing -} - -class (Show a) => SqlType a where - toSql :: a -> SqlValue - fromSql :: SqlValue -> a - -{- | Converts any Integral type to a 'SqlValue' by using toInteger. -} -nToSql :: Integral a => a -> SqlValue -nToSql n = SqlInteger (toInteger n) - -{- | Convenience function for using numeric literals in your program. -} -iToSql :: Int -> SqlValue -iToSql = toSql - -{- | The main type for expressing Haskell values to SQL databases. - -This type is used to marshall Haskell data to and from database APIs. -HDBC driver interfaces will do their best to use the most accurate and -efficient way to send a particular value to the database server. - -Values read back from the server are put in the most appropriate 'SqlValue' -type. 'fromSql' can then be used to convert them into whatever type -is needed locally in Haskell. - -Most people will use 'toSql' and 'fromSql' instead of manipulating -'SqlValue's directly. - -The default representation of time values is an integer number of seconds. -Databases such as PostgreSQL with builtin timestamp types can will see -automatic conversion between these Haskell types to local types. Other -databases can just use an int or a string. - -This behavior also exists for other types. For instance, many databases don't -have a Rational type, so they'll just use Haskell's show function and -store a Rational as a string. - -Two SqlValues are considered to be equal if one of these hold (first one that -is true holds; if none are true, they are not equal): - * Both are NULL - * Both represent the same type and the encapsulated values are equal - * The values of each, when converted to a string, are equal. -} -data SqlValue = SqlString String - | SqlByteString B.ByteString - | SqlWord32 Word32 - | SqlWord64 Word64 - | SqlInt32 Int32 - | SqlInt64 Int64 - | SqlInteger Integer - | SqlChar Char - | SqlBool Bool - | SqlDouble Double - | SqlRational Rational - | SqlEpochTime Integer -- ^ Representation of ClockTime or CalendarTime - | SqlTimeDiff Integer -- ^ Representation of TimeDiff - | SqlNull -- ^ NULL in SQL or Nothing in Haskell - deriving (Show) - -instance Eq SqlValue where - SqlString a == SqlString b = a == b - SqlByteString a == SqlByteString b = a == b - SqlWord32 a == SqlWord32 b = a == b - SqlWord64 a == SqlWord64 b = a == b - SqlInt32 a == SqlInt32 b = a == b - SqlInt64 a == SqlInt64 b = a == b - SqlInteger a == SqlInteger b = a == b - SqlChar a == SqlChar b = a == b - SqlBool a == SqlBool b = a == b - SqlDouble a == SqlDouble b = a == b - SqlRational a == SqlRational b = a == b - SqlEpochTime a == SqlEpochTime b = a == b - SqlTimeDiff a == SqlTimeDiff b = a == b - SqlNull == SqlNull = True - SqlNull == _ = False - _ == SqlNull = False - a == b = ((fromSql a)::String) == ((fromSql b)::String) - -instance SqlType String where - toSql = SqlString - fromSql (SqlString x) = x - fromSql (SqlByteString x) = byteString2String x - fromSql (SqlInt32 x) = show x - fromSql (SqlInt64 x) = show x - fromSql (SqlWord32 x) = show x - fromSql (SqlWord64 x) = show x - fromSql (SqlInteger x) = show x - fromSql (SqlChar x) = [x] - fromSql (SqlBool x) = show x - fromSql (SqlDouble x) = show x - fromSql (SqlRational x) = show x - fromSql (SqlEpochTime x) = show x - fromSql (SqlTimeDiff x) = show x - fromSql (SqlNull) = error "fromSql: cannot convert SqlNull to String" - -instance SqlType B.ByteString where - toSql = SqlByteString - fromSql (SqlByteString x) = x - fromSql (SqlNull) = error "fromSql: cannot convert SqlNull to ByteString" - fromSql x = (string2ByteString . fromSql) x - -string2ByteString :: String -> B.ByteString -string2ByteString = B.pack . map (toEnum . fromEnum) - -instance SqlType Int where - toSql x = SqlInt32 (fromIntegral x) - fromSql (SqlString x) = read' x - fromSql (SqlByteString x) = (read' . byteString2String) x - fromSql (SqlInt32 x) = fromIntegral x - fromSql (SqlInt64 x) = fromIntegral x - fromSql (SqlWord32 x) = fromIntegral x - fromSql (SqlWord64 x) = fromIntegral x - fromSql (SqlInteger x) = fromIntegral x - fromSql (SqlChar x) = ord x - fromSql (SqlBool x) = if x then 1 else 0 - fromSql (SqlDouble x) = truncate $ x - fromSql (SqlRational x) = truncate $ x - fromSql (SqlEpochTime x) = fromIntegral x - fromSql (SqlTimeDiff x) = fromIntegral x - fromSql (SqlNull) = error "fromSql: cannot convert SqlNull to Int" - -instance SqlType Int32 where - toSql = SqlInt32 - fromSql (SqlString x) = read' x - fromSql (SqlByteString x) = (read' . byteString2String) x - fromSql (SqlInt32 x) = x - fromSql (SqlInt64 x) = fromIntegral x - fromSql (SqlWord32 x) = fromIntegral x - fromSql (SqlWord64 x) = fromIntegral x - fromSql (SqlInteger x) = fromIntegral x - fromSql (SqlChar x) = fromIntegral $ ord x - fromSql (SqlBool x) = if x then 1 else 0 - fromSql (SqlDouble x) = truncate $ x - fromSql (SqlRational x) = truncate $ x - fromSql (SqlEpochTime x) = fromIntegral x - fromSql (SqlTimeDiff x) = fromIntegral x - fromSql (SqlNull) = error "fromSql: cannot convert SqlNull to Int32" - -instance SqlType Int64 where - toSql = SqlInt64 - fromSql (SqlString x) = read' x - fromSql (SqlByteString x) = (read' . byteString2String) x - fromSql (SqlInt32 x) = fromIntegral x - fromSql (SqlInt64 x) = x - fromSql (SqlWord32 x) = fromIntegral x - fromSql (SqlWord64 x) = fromIntegral x - fromSql (SqlInteger x) = fromIntegral x - fromSql (SqlChar x) = fromIntegral $ ord x - fromSql (SqlBool x) = if x then 1 else 0 - fromSql (SqlDouble x) = truncate $ x - fromSql (SqlRational x) = truncate $ x - fromSql (SqlEpochTime x) = fromIntegral x - fromSql (SqlTimeDiff x) = fromIntegral x - fromSql (SqlNull) = error "fromSql: cannot convert SqlNull to Int64" - -instance SqlType Word32 where - toSql = SqlWord32 - fromSql (SqlString x) = read' x - fromSql (SqlByteString x) = (read' . byteString2String) x - fromSql (SqlInt32 x) = fromIntegral x - fromSql (SqlInt64 x) = fromIntegral x - fromSql (SqlWord32 x) = x - fromSql (SqlWord64 x) = fromIntegral x - fromSql (SqlInteger x) = fromIntegral x - fromSql (SqlChar x) = fromIntegral $ ord x - fromSql (SqlBool x) = if x then 1 else 0 - fromSql (SqlDouble x) = truncate $ x - fromSql (SqlRational x) = truncate $ x - fromSql (SqlEpochTime x) = fromIntegral x - fromSql (SqlTimeDiff x) = fromIntegral x - fromSql (SqlNull) = error "fromSql: cannot convert SqlNull to Word32" - -instance SqlType Word64 where - toSql = SqlWord64 - fromSql (SqlString x) = read' x - fromSql (SqlByteString x) = (read' . byteString2String) x - fromSql (SqlInt32 x) = fromIntegral x - fromSql (SqlInt64 x) = fromIntegral x - fromSql (SqlWord32 x) = fromIntegral x - fromSql (SqlWord64 x) = x - fromSql (SqlInteger x) = fromIntegral x - fromSql (SqlChar x) = fromIntegral (ord x) - fromSql (SqlBool x) = if x then 1 else 0 - fromSql (SqlDouble x) = truncate $ x - fromSql (SqlRational x) = truncate $ x - fromSql (SqlEpochTime x) = fromIntegral x - fromSql (SqlTimeDiff x) = fromIntegral x - fromSql (SqlNull) = error "fromSql: cannot convert SqlNull to Int64" - -instance SqlType Integer where - toSql = SqlInteger - fromSql (SqlString x) = read' x - fromSql (SqlByteString x) = (read' . byteString2String) x - fromSql (SqlInt32 x) = fromIntegral x - fromSql (SqlInt64 x) = fromIntegral x - fromSql (SqlWord32 x) = fromIntegral x - fromSql (SqlWord64 x) = fromIntegral x - fromSql (SqlInteger x) = x - fromSql (SqlChar x) = fromIntegral (ord x) - fromSql (SqlBool x) = if x then 1 else 0 - fromSql (SqlDouble x) = truncate $ x - fromSql (SqlRational x) = truncate $ x - fromSql (SqlEpochTime x) = x - fromSql (SqlTimeDiff x) = x - fromSql (SqlNull) = error "fromSql: cannot convert SqlNull to Integer" - -instance SqlType Bool where - toSql = SqlBool - fromSql (SqlString x) = - case map toUpper x of - "TRUE" -> True - "T" -> True - "FALSE" -> False - "F" -> False - "0" -> False - "1" -> True - _ -> error $ "fromSql: cannot convert SqlString " - ++ show x ++ " to Bool" - fromSql (SqlByteString x) = (fromSql . SqlString . byteString2String) x - fromSql (SqlInt32 x) = numToBool x - fromSql (SqlInt64 x) = numToBool x - fromSql (SqlWord32 x) = numToBool x - fromSql (SqlWord64 x) = numToBool x - fromSql (SqlInteger x) = numToBool x - fromSql (SqlChar x) = numToBool (ord x) - fromSql (SqlBool x) = x - fromSql (SqlDouble x) = numToBool x - fromSql (SqlRational x) = numToBool x - fromSql (SqlEpochTime x) = numToBool x - fromSql (SqlTimeDiff x) = numToBool x - fromSql (SqlNull) = error "fromSql: cannot convert SqlNull to Bool" - -numToBool :: Num a => a -> Bool -numToBool x = x /= 0 - -instance SqlType Char where - toSql = SqlChar - fromSql (SqlString [x]) = x - fromSql (SqlByteString x) = (head . byteString2String) x - fromSql (SqlString _) = error "fromSql: cannot convert SqlString to Char" - fromSql (SqlInt32 _) = error "fromSql: cannot convert SqlInt32 to Char" - fromSql (SqlInt64 _) = error "fromSql: cannot convert SqlInt64 to Char" - fromSql (SqlWord32 _) = error "fromSql: cannot convert SqlWord32 to Char" - fromSql (SqlWord64 _) = error "fromSql: cannot convert SqlWord64 to Char" - fromSql (SqlInteger _) = error "fromSql: cannot convert SqlInt to Char" - fromSql (SqlChar x) = x - fromSql (SqlBool x) = if x then '1' else '0' - fromSql (SqlDouble _) = error "fromSql: cannot convert SqlDouble to Char" - fromSql (SqlRational _) = error "fromSql: cannot convert SqlRational to Char" - fromSql (SqlEpochTime _) = error "fromSql: cannot convert SqlEpochTime to Char" - fromSql (SqlTimeDiff _) = error "fromSql: cannot convert SqlTimeDiff to Char" - fromSql (SqlNull) = error "fromSql: cannot convert SqlNull to Char" - -instance SqlType Double where - toSql = SqlDouble - fromSql (SqlString x) = read' x - fromSql (SqlByteString x) = (read' . byteString2String) x - fromSql (SqlInt32 x) = fromIntegral x - fromSql (SqlInt64 x) = fromIntegral x - fromSql (SqlWord32 x) = fromIntegral x - fromSql (SqlWord64 x) = fromIntegral x - fromSql (SqlInteger x) = fromIntegral x - fromSql (SqlChar x) = fromIntegral . ord $ x - fromSql (SqlBool x) = if x then 1.0 else 0.0 - fromSql (SqlDouble x) = x - fromSql (SqlRational x) = fromRational x - fromSql (SqlEpochTime x) = fromIntegral x - fromSql (SqlTimeDiff x) = fromIntegral x - fromSql (SqlNull) = error "fromSql: cannot convert SqlNull to Double" - -instance SqlType Rational where - toSql = SqlRational - fromSql (SqlString x) = read' x - fromSql (SqlByteString x) = (read' . byteString2String) x - fromSql (SqlInt32 x) = fromIntegral x - fromSql (SqlInt64 x) = fromIntegral x - fromSql (SqlWord32 x) = fromIntegral x - fromSql (SqlWord64 x) = fromIntegral x - fromSql (SqlInteger x) = fromIntegral x - fromSql (SqlChar x) = fromIntegral . ord $ x - fromSql (SqlBool x) = fromIntegral $ ((fromSql (SqlBool x))::Int) - fromSql (SqlDouble x) = toRational x - fromSql (SqlRational x) = x - fromSql (SqlEpochTime x) = fromIntegral x - fromSql (SqlTimeDiff x) = fromIntegral x - fromSql (SqlNull) = error "fromSql: cannot convert SqlNull to Double" - -instance SqlType ClockTime where - toSql (TOD x _) = SqlEpochTime x - fromSql (SqlString x) = TOD (read' x) 0 - fromSql (SqlByteString x) = TOD ((read' . byteString2String) x) 0 - fromSql (SqlInt32 x) = TOD (fromIntegral x) 0 - fromSql (SqlInt64 x) = TOD (fromIntegral x) 0 - fromSql (SqlWord32 x) = TOD (fromIntegral x) 0 - fromSql (SqlWord64 x) = TOD (fromIntegral x) 0 - fromSql (SqlInteger x) = TOD x 0 - fromSql (SqlChar _) = error "fromSql: cannot convert SqlChar to ClockTime" - fromSql (SqlBool _) = error "fromSql: cannot convert SqlBool to ClockTime" - fromSql (SqlDouble x) = TOD (truncate x) 0 - fromSql (SqlRational x) = TOD (truncate x) 0 - fromSql (SqlEpochTime x) = TOD x 0 - fromSql (SqlTimeDiff _) = error "fromSql: cannot convert SqlTimeDiff to ClockTime" - fromSql SqlNull = error "fromSql: cannot convert SqlNull to ClockTime" - -instance SqlType TimeDiff where - toSql x = SqlTimeDiff (timeDiffToSecs x) - fromSql (SqlString x) = secs2td (read' x) - fromSql (SqlByteString x) = secs2td ((read' . byteString2String) x) - fromSql (SqlInt32 x) = secs2td (fromIntegral x) - fromSql (SqlInt64 x) = secs2td (fromIntegral x) - fromSql (SqlWord32 x) = secs2td (fromIntegral x) - fromSql (SqlWord64 x) = secs2td (fromIntegral x) - fromSql (SqlInteger x) = secs2td x - fromSql (SqlChar _) = error "fromSql: cannot convert SqlChar to TimeDiff" - fromSql (SqlBool _) = error "fromSql: cannot convert SqlBool to TimeDiff" - fromSql (SqlDouble x) = secs2td (truncate x) - fromSql (SqlRational x) = secs2td (truncate x) - fromSql (SqlEpochTime _) = error "fromSql: cannot convert SqlEpochTime to TimeDiff" - fromSql (SqlTimeDiff x) = secs2td x - fromSql SqlNull = error "fromSql: cannot convert SqlNull to TimeDiff" - -instance SqlType CalendarTime where - toSql x = toSql (toClockTime x) - fromSql = toUTCTime . fromSql - -instance (SqlType a) => SqlType (Maybe a) where - toSql Nothing = SqlNull - toSql (Just a) = toSql a - fromSql SqlNull = Nothing - fromSql x = Just (fromSql x) - -byteString2String :: B.ByteString -> String -byteString2String = map (toEnum . fromEnum) . B.unpack - -secs2td :: Integer -> TimeDiff -secs2td x = diffClockTimes (TOD x 0) (TOD 0 0) - - --- | Read a value from a string, and give an informative message --- if it fails. -read' :: (Typeable a,Read a) => String -> a -read' s = ret - where ret = case reads s of - [(x,"")] -> x - _ -> error $ "fromSql: Cannot read " ++ show s - ++ " as " ++ t ++ "." - t = show (typeOf ret) - --------------- --- The following function copied from MissingH.Time.hs - -{- | Converts the given timeDiff to the number of seconds it represents. - -Uses the same algorithm as normalizeTimeDiff in GHC. -} -timeDiffToSecs :: TimeDiff -> Integer -timeDiffToSecs td = - (fromIntegral $ tdSec td) + - 60 * ((fromIntegral $ tdMin td) + - 60 * ((fromIntegral $ tdHour td) + - 24 * ((fromIntegral $ tdDay td) + - 30 * ((fromIntegral $ tdMonth td) + - 365 * (fromIntegral $ tdYear td))))) +#endif diff --git a/Database/HDBC/Types.hs b/Database/HDBC/Types.hs --- a/Database/HDBC/Types.hs +++ b/Database/HDBC/Types.hs @@ -1,25 +1,7 @@ -{- -Copyright (C) 2005-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.Types - Copyright : Copyright (C) 2005-2007 John Goerzen - License : GNU LGPL, version 2.1 or above + Copyright : Copyright (C) 2005-2011 John Goerzen + License : BSD3 Maintainer : John Goerzen Stability : provisional @@ -38,7 +20,7 @@ (IConnection(..), Statement(..), SqlError(..), - SqlType(..), nToSql, iToSql, + nToSql, iToSql, posixToSql, fromSql, safeFromSql, toSql, SqlValue(..), ConnWrapper(..), withWConn @@ -47,6 +29,7 @@ where import Database.HDBC.Statement import Database.HDBC.ColTypes +import Control.Exception ( finally ) {- | Main database handle object. @@ -90,6 +73,15 @@ {- | Roll back to the state the database was in prior to the last 'commit' or 'rollback'. -} rollback :: conn -> IO () + {- | Execute an SQL string, which may contain multiple + queries. This is intended for situations where you + need to run DML or DDL queries and aren't + interested in results. -} + runRaw :: conn -> String -> IO () + runRaw conn sql = do + sth <- prepare conn sql + _ <- execute sth [] `finally` finish sth + return () {- | Execute a single SQL query. Returns the number of rows modified (see 'execute' for details). The second parameter is a list @@ -207,6 +199,7 @@ disconnect w = withWConn w disconnect commit w = withWConn w commit rollback w = withWConn w rollback + runRaw w = withWConn w runRaw run w = withWConn w run prepare w = withWConn w prepare clone w = withWConn w (\dbh -> clone dbh >>= return . ConnWrapper) diff --git a/Database/HDBC/Utils.hs b/Database/HDBC/Utils.hs --- a/Database/HDBC/Utils.hs +++ b/Database/HDBC/Utils.hs @@ -1,26 +1,9 @@ +{-# LANGUAGE CPP #-} -- #hide -{- -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.Utils - Copyright : Copyright (C) 2005 John Goerzen - License : GNU LGPL, version 2.1 or above + Copyright : Copyright (C) 2005-2011 John Goerzen + License : BSD3 Maintainer : John Goerzen Stability : provisional @@ -38,16 +21,37 @@ import Database.HDBC.Types import qualified Data.Map as Map import Control.Exception -import Data.Char -import Data.Dynamic import System.IO.Unsafe import Data.List(genericLength) +-- import Data.Dynamic below for GHC < 6.10 + +#if __GLASGOW_HASKELL__ >= 610 {- | Execute the given IO action. If it raises a 'SqlError', then execute the supplied handler and return its return value. Otherwise, proceed as normal. -} catchSql :: IO a -> (SqlError -> IO a) -> IO a +catchSql action handler = + catchJust sqlExceptions action handler + +{- | Like 'catchSql', with the order of arguments reversed. -} +handleSql :: (SqlError -> IO a) -> IO a -> IO a +handleSql h f = catchSql f h + +{- | Given an Exception, return Just SqlError if it was an SqlError, or Nothing +otherwise. Useful with functions like catchJust. -} +sqlExceptions :: SqlError -> Maybe SqlError +sqlExceptions e = Just e + +#else +import Data.Dynamic + +{- | Execute the given IO action. + +If it raises a 'SqlError', then execute the supplied handler and return its +return value. Otherwise, proceed as normal. -} +catchSql :: IO a -> (SqlError -> IO a) -> IO a catchSql = catchDyn {- | Like 'catchSql', with the order of arguments reversed. -} @@ -58,6 +62,7 @@ otherwise. Useful with functions like catchJust. -} sqlExceptions :: Exception -> Maybe SqlError sqlExceptions e = dynExceptions e >>= fromDynamic +#endif {- | Catches 'SqlError's, and re-raises them as IO errors with fail. Useful if you don't care to catch SQL errors, but want to see a sane @@ -119,6 +124,17 @@ -} withTransaction :: IConnection conn => conn -> (conn -> IO a) -> IO a withTransaction conn func = +#if __GLASGOW_HASKELL__ >= 610 + do r <- onException (func conn) doRollback + commit conn + return r + where doRollback = + -- Discard any exception from (rollback conn) so original + -- exception can be re-raised + Control.Exception.catch (rollback conn) doRollbackHandler + doRollbackHandler :: SomeException -> IO () + doRollbackHandler _ = return () +#else do r <- try (func conn) case r of Right x -> do commit conn @@ -126,7 +142,7 @@ Left e -> do try (rollback conn) -- Discard any exception here throw e - +#endif {- | Lazily fetch all rows from an executed 'Statement'. You can think of this as hGetContents applied to a database result set. @@ -168,7 +184,7 @@ fetchAllRows' :: Statement -> IO [[SqlValue]] fetchAllRows' sth = do res <- fetchAllRows sth - evalAll res + _ <- evalAll res return res {- | Like 'fetchAllRows', but return Maybe Strings instead of 'SqlValue's. -} @@ -181,7 +197,7 @@ sFetchAllRows' :: Statement -> IO [[Maybe String]] sFetchAllRows' sth = do res <- sFetchAllRows sth - evalAll res + _ <- evalAll res return res {- | Like 'fetchRow', but instead of returning a list, return an association @@ -196,17 +212,16 @@ do row <- fetchRow sth case row of Nothing -> return Nothing - Just r -> do names_raw <- getColumnNames sth - let names = map (map toLower) names_raw + Just r -> do names <- getColumnNames sth return $ Just $ zip names r -{- | Strict version of 'fetchRowAL' -} +{- | Strict version of 'fetchRowAL'. -} fetchRowAL' :: Statement -> IO (Maybe [(String, SqlValue)]) fetchRowAL' sth = do res <- fetchRowAL sth - case res of - Nothing -> return 0 - Just x -> evaluate ((genericLength x)::Integer) + _ <- case res of + Nothing -> return 0 + Just x -> evaluate ((genericLength x)::Integer) return res {- | Similar to 'fetchRowAL', but return a Map instead of an association list. @@ -218,11 +233,11 @@ Nothing -> return Nothing Just x -> return $ Just $ Map.fromList x -{- | Strict version of 'fetchRowMap' -} +{- | Strict version of 'fetchRowMap'. -} fetchRowMap' :: Statement -> IO (Maybe (Map.Map String SqlValue)) fetchRowMap' sth = do res <- fetchRowMap sth - case res of + _ <- case res of Nothing -> return 0 Just x -> evaluate ((genericLength (Map.toList x))::Integer) return res @@ -233,8 +248,7 @@ See 'fetchRowAL' for more details. -} fetchAllRowsAL :: Statement -> IO [[(String, SqlValue)]] fetchAllRowsAL sth = - do names_raw <- getColumnNames sth - let names = map (map toLower) names_raw + do names <- getColumnNames sth rows <- fetchAllRows sth return $ map (zip names) rows @@ -242,7 +256,7 @@ fetchAllRowsAL' :: Statement -> IO [[(String, SqlValue)]] fetchAllRowsAL' sth = do res <- fetchAllRowsAL sth - evalAll res + _ <- evalAll res return res {- | Like 'fetchAllRowsAL', but return a list of Maps instead of a list of @@ -254,21 +268,33 @@ fetchAllRowsMap' :: Statement -> IO [Map.Map String SqlValue] fetchAllRowsMap' sth = do res <- fetchAllRowsMap sth - evaluate ((genericLength res)::Integer) + _ <- evaluate ((genericLength res)::Integer) return res {- | A quick way to do a query. Similar to preparing, executing, and -then calling 'fetchAllRows' on a statement. See also 'quickQuery'' -} +then calling 'fetchAllRows' on a statement. See also 'quickQuery''. -} quickQuery :: IConnection conn => conn -> String -> [SqlValue] -> IO [[SqlValue]] quickQuery conn qrystr args = do sth <- prepare conn qrystr - execute sth args + _ <- execute sth args fetchAllRows sth {- | Strict version of 'quickQuery'. -} quickQuery' :: IConnection conn => conn -> String -> [SqlValue] -> IO [[SqlValue]] quickQuery' conn qrystr args = do res <- quickQuery conn qrystr args - evalAll res + _ <- evalAll res return res +{- | A utility function to throw a 'SqlError'. The mechanics of throwing +such a thing differ between GHC 6.8.x, Hugs, and GHC 6.10. This function +takes care of the special cases to make it simpler. + +With GHC 6.10, it is a type-restricted alias for throw. On all other systems, +it is a type-restricted alias for throwDyn. -} +throwSqlError :: SqlError -> IO a +#if __GLASGOW_HASKELL__ >= 610 +throwSqlError = throw +#else +throwSqlError = throwDyn +#endif diff --git a/HDBC.cabal b/HDBC.cabal --- a/HDBC.cabal +++ b/HDBC.cabal @@ -1,12 +1,12 @@ Name: HDBC -Version: 1.1.6 -License: LGPL -Maintainer: John Goerzen -Author: John Goerzen -Copyright: Copyright (c) 2005-2008 John Goerzen -license-file: COPYRIGHT -extra-source-files: COPYING -homepage: http://software.complete.org/hdbc +Version: 2.4.0.5 +License: BSD3 +Maintainer: Nicolas Wu , David Johnson +Author: John Goerzen, Nicolas Wu +homepage: https://github.com/hdbc/hdbc +Copyright: Copyright (c) 2005-2011 John Goerzen +license-file: LICENSE +extra-source-files: LICENSE, Makefile, README.md, CHANGELOG.md Category: Database synopsis: Haskell Database Connectivity Description: HDBC provides an abstraction layer between Haskell programs and SQL @@ -16,22 +16,76 @@ Stability: Stable Build-Type: Simple -Cabal-Version: >=1.2 +Cabal-Version: >=1.10 +source-repository head + type: git + location: https://github.com/hdbc/hdbc.git + flag splitBase description: Choose the new smaller, split-up base package. +flag buildtests + description: Build the executable to run unit tests + default: False +flag minTime15 + description: Use time 1.5 or higher. + default: True + library if flag(splitBase) - Build-Depends: base>=3 && < 4, old-time, bytestring, containers + Build-Depends: base>=3 && <5, old-time, bytestring, containers + if flag(minTime15) + Build-Depends: time >= 1.5 && < 1.17 + CPP-Options: -DMIN_TIME_15 + else + Build-Depends: time >= 1.2 && < 1.5, old-locale else Build-Depends: base<3 - Build-Depends: mtl + Build-Depends: mtl, convertible >= 1.1.0.0, text, utf8-string - GHC-Options: -O2 -Wall -fglasgow-exts + -- Hack for cabal-install weirdness. cabal-install forces base 3, + -- though it works fine for Setup.lhs manually. Fix. + if impl(ghc >= 6.9) + build-depends: base >= 4 + GHC-Options: -O2 -Wall -fno-warn-orphans + Exposed-Modules: Database.HDBC, Database.HDBC.Types, Database.HDBC.DriverUtils, - Database.HDBC.ColTypes, Database.HDBC.Statement + Database.HDBC.ColTypes, Database.HDBC.Statement, Database.HDBC.SqlValue, + Database.HDBC.Locale Other-Modules: Database.HDBC.Utils - --Extensions: ExistentialQuantification, AllowOverlappingInstances, - -- AllowUndecidableInstances - Extensions: ExistentialQuantification + Default-Extensions: ExistentialQuantification, CPP, MultiParamTypeClasses, + FlexibleContexts, TypeSynonymInstances, TypeOperators, RankNTypes, + FlexibleInstances, DeriveDataTypeable + Default-Language: Haskell2010 + +Executable runtests + if flag(buildtests) + Buildable: True + Build-Depends: HUnit, QuickCheck >= 2.0 + + if flag(splitBase) + Build-Depends: base>=3 && <5, old-time, bytestring, containers + if flag(minTime15) + Build-Depends: time >= 1.5 && < 1.17 + CPP-Options: -DMIN_TIME_15 + else + Build-Depends: time >= 1.2 && < 1.5, old-locale + else + Build-Depends: base<3 + Build-Depends: mtl, convertible >= 1.1.0.0, utf8-string, text + + -- Hack for cabal-install weirdness. cabal-install forces base 3, + -- though it works fine for Setup.lhs manually. Fix. + if impl(ghc >= 6.9) + build-depends: base >= 4 + else + Buildable: False + Main-Is: runtests.hs + Other-Modules: TestSqlValue + Hs-Source-Dirs: ., testsrc + GHC-Options: -O2 + Default-Extensions: ExistentialQuantification, CPP, MultiParamTypeClasses, + FlexibleContexts, TypeSynonymInstances, TypeOperators, + RankNTypes, FlexibleInstances + Default-Language: Haskell2010 diff --git a/LICENSE b/LICENSE new file mode 100644 --- /dev/null +++ b/LICENSE @@ -0,0 +1,27 @@ +Copyright (c) 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/Makefile b/Makefile new file mode 100644 --- /dev/null +++ b/Makefile @@ -0,0 +1,32 @@ +all: setup + @echo "Please use Cabal to build this package; not make." + ./setup configure + ./setup build + +setup: Setup.lhs + ghc --make -o setup Setup.lhs + +install: setup + ./setup install + +clean: + ./Setup.lhs clean + +.PHONY: test +test: test-ghc test-hugs + @echo "" + @echo "All tests pass." + +test-hugs: setup + @echo " ****** Running hugs tests" + ./setup configure -f buildtests --hugs + ./setup build + runhugs -98 +o -P$(PWD)/dist/scratch:$(PWD)/dist/scratch/programs/runtests: \ + dist/scratch/programs/runtests/Main.hs + +test-ghc: setup + @echo " ****** Building GHC tests" + ./setup configure -f buildtests + ./setup build + @echo " ****** Running GHC tests" + ./dist/build/runtests/runtests diff --git a/README.md b/README.md new file mode 100644 --- /dev/null +++ b/README.md @@ -0,0 +1,33 @@ +HDBC +==== + +Welcome to HDBC, Haskell Database Connectivity. + +HDBC is modeled loosely on Perl's DBI interface, though it has also +been influenced by Python's DB-API v2, JDBC in Java, and HSQL in +Haskell. + +Please see the HDBC [wiki](https://github.com/hdbc/hdbc/wiki) for an +introduction to HDBC and its various features. + +Installation +------------ + +You'll need either GHC 6.4.1 or above, or Hugs 2005xx or above. + +The steps to install are: + + ghc --make -o setup Setup.lhs + ./setup configure + ./setup build + sudo ./setup install + +If you're on Windows, you can omit the leading "./". + +Usage +----- + +To use with hugs, you'll want to use hugs -98. + +To use with GHC, you'll want to use -package HDBC in your programs. +Or, with Cabal, use Build-Depends: HDBC. diff --git a/testsrc/TestSqlValue.hs b/testsrc/TestSqlValue.hs new file mode 100644 --- /dev/null +++ b/testsrc/TestSqlValue.hs @@ -0,0 +1,61 @@ +{- +Copyright (C) 2009 John Goerzen + +All rights reserved. + +For license and copyright information, see the file COPYRIGHT +-} + +module TestSqlValue where +import Test.QuickCheck hiding (Result) +import Test.QuickCheck.Property (Result) +import qualified Test.HUnit as HU +import Database.HDBC +import Data.Time.Format (parseTime) +import Data.Time.LocalTime +import Database.HDBC.Locale (defaultTimeLocale, iso8601DateFormat, oldIso8601DateFormat) +import Data.Maybe + +instance Eq ZonedTime where + a == b = zonedTimeToUTC a == zonedTimeToUTC b && + zonedTimeZone a == zonedTimeZone b + +toSql_Int :: Int -> Property +toSql_Int x = toSql x === SqlInt64 (fromIntegral x) + +fromSql_Int :: Int -> Property +fromSql_Int x = + Right x === safeFromSql (SqlInt64 (fromIntegral x)) + +testZonedTimeStr = "1989-08-01 15:33:01 -0500" +testZonedTime :: ZonedTime +testZonedTime = fromJust $ parseTime defaultTimeLocale (iso8601DateFormat (Just "%T %z")) + testZonedTimeStr + +testZonedTimeFracStr = "1989-08-01 15:33:01.536 -0500" +testZonedTimeFrac :: ZonedTime +testZonedTimeFrac = fromJust $ parseTime defaultTimeLocale (iso8601DateFormat (Just "%T%Q %z")) + testZonedTimeFracStr + +testZonedTimeTwoDigitYearStr = "89-08-01 15:33:01 -0500" +testZonedTimeTwoDigitYear :: ZonedTime +testZonedTimeTwoDigitYear = fromJust $ parseTime defaultTimeLocale (oldIso8601DateFormat (Just "%T %z")) + testZonedTimeTwoDigitYearStr + +ztparsenf = + (HU.@=?) testZonedTime (fromSql (SqlString testZonedTimeStr)) +ztparsef = + (HU.@=?) testZonedTimeFrac (fromSql (SqlString testZonedTimeFracStr)) +ztparseTwoDigitYear = + (HU.@=?) testZonedTimeTwoDigitYear (fromSql (SqlString testZonedTimeTwoDigitYearStr)) + +hut msg = HU.TestLabel msg . HU.TestCase + +allHUnitTests = [hut "non-frac parse" ztparsenf, + hut "frac parse" ztparsef, + hut "old serialization of two digit year without leading zeros" ztparseTwoDigitYear + ] + +allQuickCheckTests = [toSql_Int, + fromSql_Int + ] diff --git a/testsrc/runtests.hs b/testsrc/runtests.hs new file mode 100644 --- /dev/null +++ b/testsrc/runtests.hs @@ -0,0 +1,9 @@ +module Main where +import qualified Test.HUnit as HU +import Test.QuickCheck (quickCheck) + +import qualified TestSqlValue + +main = do HU.runTestTT (HU.TestList $ TestSqlValue.allHUnitTests) + traverse quickCheck TestSqlValue.allQuickCheckTests + return ()