[Pkg-haskell-commits] [SCM] HDBC PostgreSQL backend driver branch, master, updated. debian/2.2.3.1-5-5-g04c4318
Clint Adams
clint at debian.org
Thu Mar 8 01:27:39 UTC 2012
The following commit has been merged in the master branch:
commit e503bb135b9462b97c4aa7a40ded0b256588148a
Author: Clint Adams <clint at debian.org>
Date: Wed Mar 7 20:13:27 2012 -0500
Imported Upstream version 2.3.2.1
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 32d7a8f..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.swp
-/dist/
diff --git a/COPYING b/COPYING
deleted file mode 100644
index 2d2d780..0000000
--- 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.
-
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- 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.
-
- <signature of Ty Coon>, 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
index 6df8892..0000000
--- a/COPYRIGHT
+++ /dev/null
@@ -1,38 +0,0 @@
-Copyright (C) 2005-2007 John Goerzen <jgoerzen at complete.org>
-
- 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.
-
-------------------------------------------------------------------
-
-pgtypes.h comes from the psqlodbc distribution, which bears this
-copyright:
-
- Copyright (C) 1998 Insight Distribution Systems
- Copyright (C) 1998 - 2005 The PostgreSQL Global Development Group
-
- Multibyte support was added by Sankyo Unyu Service, (C) 2001.
-
- The code contained in this library is based on code written by
- Christian Czezatke and Dan McGuirk, (C) 1996.
-
- This library is free software; you can redistribute it and/or modify
- it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
-Most of pgtypes.h was removed by John Goerzen since it was not
-relevant for this task.
diff --git a/Database/HDBC/PostgreSQL.hs b/Database/HDBC/PostgreSQL.hs
index 4167564..2946a55 100644
--- a/Database/HDBC/PostgreSQL.hs
+++ b/Database/HDBC/PostgreSQL.hs
@@ -1,25 +1,7 @@
-{-
-Copyright (C) 2005 John Goerzen <jgoerzen at complete.org>
-
- 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.PostgreSQL
- 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 <jgoerzen at complete.org>
Stability : provisional
@@ -63,15 +45,38 @@ and thus are tested by the HDBC-PostgreSQL test suite.
module Database.HDBC.PostgreSQL
(
-- * Connecting to Databases
- connectPostgreSQL, Connection,
+ connectPostgreSQL, withPostgreSQL,
+ connectPostgreSQL', withPostgreSQL',
+ Connection,
+
+ -- * Transactions
+ begin,
+
-- * PostgreSQL Error Codes
--
-- |When an @SqlError@ is thrown, the field @seState@ is set to one of the following
-- error codes.
module Database.HDBC.PostgreSQL.ErrorCodes,
+
+ -- * Threading
+ -- $threading
)
where
-import Database.HDBC.PostgreSQL.Connection(connectPostgreSQL, Connection())
+import Database.HDBC.PostgreSQL.Connection(connectPostgreSQL, withPostgreSQL,
+ connectPostgreSQL', withPostgreSQL',
+ begin, Connection())
import Database.HDBC.PostgreSQL.ErrorCodes
+
+{- $threading
+
+ Provided the local libpq library is thread-safe, multiple 'Connection's may be used
+ to have concurrent database queries. Concurrent queries issued on a single
+ 'Connection' will be performed serially.
+
+ When the local libpq library is not thread-safe (ie. it has not been compiled with
+ --enable-thread-safety), only a single database function will be performed at a time.
+
+-}
+
diff --git a/Database/HDBC/PostgreSQL/Connection.hsc b/Database/HDBC/PostgreSQL/Connection.hsc
index 2eea43a..662a937 100644
--- a/Database/HDBC/PostgreSQL/Connection.hsc
+++ b/Database/HDBC/PostgreSQL/Connection.hsc
@@ -1,31 +1,16 @@
-- -*- mode: haskell; -*-
{-# CFILES hdbc-postgresql-helper.c #-}
-- Above line for hugs
-{-
-Copyright (C) 2005-2006 John Goerzen <jgoerzen at complete.org>
-
- 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
--}
+{-# LANGUAGE FlexibleContexts #-}
module Database.HDBC.PostgreSQL.Connection
- (connectPostgreSQL, Impl.Connection())
+ (connectPostgreSQL, withPostgreSQL,
+ connectPostgreSQL', withPostgreSQL',
+ Impl.begin, Impl.Connection())
where
import Database.HDBC
import Database.HDBC.DriverUtils
-import Database.HDBC.ColTypes
import qualified Database.HDBC.PostgreSQL.ConnectionImpl as Impl
import Database.HDBC.PostgreSQL.Types
import Database.HDBC.PostgreSQL.Statement
@@ -37,41 +22,71 @@ import Foreign.ForeignPtr
import Foreign.Ptr
import Data.Word
import Data.Maybe
-import Control.Concurrent.MVar
import qualified Data.ByteString as B
import qualified Data.ByteString.UTF8 as BUTF8
+import Control.Monad (when)
+import Control.Concurrent.MVar
+import System.IO (stderr, hPutStrLn)
+import System.IO.Unsafe (unsafePerformIO)
+import Control.Exception(bracket)
+import Data.Convertible (Convertible)
#include <libpq-fe.h>
#include <pg_config.h>
+
+-- | A global lock only used when libpq is /not/ thread-safe. In that situation
+-- this mvar is used to serialize access to the FFI calls marked as /safe/.
+globalConnLock :: MVar ()
+{-# NOINLINE globalConnLock #-}
+globalConnLock = unsafePerformIO $ newMVar ()
+
{- | Connect to a PostgreSQL server.
See <http://www.postgresql.org/docs/8.1/static/libpq.html#LIBPQ-CONNECT> for the meaning
of the connection string. -}
connectPostgreSQL :: String -> IO Impl.Connection
-connectPostgreSQL args = B.useAsCString (BUTF8.fromString args) $
+connectPostgreSQL = connectPostgreSQL_helper True
+
+connectPostgreSQL' :: String -> IO Impl.Connection
+connectPostgreSQL' = connectPostgreSQL_helper False
+
+connectPostgreSQL_helper :: Bool -> String -> IO Impl.Connection
+connectPostgreSQL_helper auto_transaction args =
+ B.useAsCString (BUTF8.fromString args) $
\cs -> do ptr <- pqconnectdb cs
+ threadSafe <- pqisThreadSafe ptr
+ connLock <- if threadSafe==0 -- Also check GHC.Conc.numCapabilities here?
+ then do hPutStrLn stderr "WARNING: libpq is not threadsafe, \
+ \serializing all libpq FFI calls. \
+ \(Consider recompiling libpq with \
+ \--enable-thread-safety.\n"
+ return globalConnLock
+ else newMVar ()
status <- pqstatus ptr
wrappedptr <- wrapconn ptr nullPtr
fptr <- newForeignPtr pqfinishptr wrappedptr
case status of
- #{const CONNECTION_OK} -> mkConn args fptr
+ #{const CONNECTION_OK} -> mkConn auto_transaction args (connLock,fptr)
_ -> raiseError "connectPostgreSQL" status ptr
-- FIXME: environment vars may have changed, should use pgsql enquiries
-- for clone.
-mkConn :: String -> Conn -> IO Impl.Connection
-mkConn args conn = withConn conn $
+mkConn :: Bool -> String -> Conn -> IO Impl.Connection
+mkConn auto_transaction args conn = withConn conn $
\cconn ->
do children <- newMVar []
- begin_transaction conn children
+ when auto_transaction $ begin_transaction conn children
protover <- pqprotocolVersion cconn
serverver <- pqserverVersion cconn
let clientver = #{const_str PG_VERSION}
let rconn = Impl.Connection {
Impl.disconnect = fdisconnect conn children,
- Impl.commit = fcommit conn children,
- Impl.rollback = frollback conn children,
+ Impl.begin = if auto_transaction
+ then return ()
+ else begin_transaction conn children,
+ Impl.commit = fcommit auto_transaction conn children,
+ Impl.rollback = frollback auto_transaction conn children,
Impl.runRaw = frunRaw conn children,
Impl.run = frun conn children,
Impl.prepare = newSth conn children,
@@ -84,9 +99,17 @@ mkConn args conn = withConn conn $
Impl.dbTransactionSupport = True,
Impl.getTables = fgetTables conn children,
Impl.describeTable = fdescribeTable conn children}
- quickQuery rconn "SET client_encoding TO utf8;" []
+ _ <- quickQuery rconn "SET client_encoding TO utf8;" []
return rconn
+-- | Connect to a PostgreSQL server, and automatically disconnect
+-- if the handler exits normally or throws an exception.
+withPostgreSQL :: String -> (Impl.Connection -> IO a) -> IO a
+withPostgreSQL connstr = bracket (connectPostgreSQL connstr) (disconnect)
+
+withPostgreSQL' :: String -> (Impl.Connection -> IO a) -> IO a
+withPostgreSQL' connstr = bracket (connectPostgreSQL' connstr) (disconnect)
+
--------------------------------------------------
-- Guts here
--------------------------------------------------
@@ -108,20 +131,21 @@ frun o children query args =
finish sth
return res
-fcommit :: Conn -> ChildList -> IO ()
-fcommit o cl = do frun o cl "COMMIT" []
- begin_transaction o cl
+fcommit :: Bool -> Conn -> ChildList -> IO ()
+fcommit begin o cl = do _ <- frun o cl "COMMIT" []
+ when begin $ begin_transaction o cl
-frollback :: Conn -> ChildList -> IO ()
-frollback o cl = do frun o cl "ROLLBACK" []
- begin_transaction o cl
+frollback :: Bool -> Conn -> ChildList -> IO ()
+frollback begin o cl = do _ <- frun o cl "ROLLBACK" []
+ when begin $ begin_transaction o cl
+fgetTables :: (Convertible SqlValue a) => Conn -> ChildList -> IO [a]
fgetTables conn children =
do sth <- newSth conn children
"select table_name from information_schema.tables where \
\table_schema != 'pg_catalog' AND table_schema != \
- \'information_schema' AND table_schema != 'system_schema'"
- execute sth []
+ \'information_schema'"
+ _ <- execute sth []
res1 <- fetchAllRows' sth
let res = map fromSql $ concat res1
return $ seq (length res) res
@@ -138,7 +162,7 @@ fdescribeSchemaTable o cl maybeSchema table =
(if isJust maybeSchema then "and ns.nspname = ? " else "") ++
"and attrelid = pg_class.oid and relnamespace = ns.oid order by attnum")
let params = toSql table : (if isJust maybeSchema then [toSql $ fromJust maybeSchema] else [])
- execute sth params
+ _ <- execute sth params
res <- fetchAllRows' sth
return $ map desccol res
where
@@ -154,7 +178,7 @@ fdisconnect conn mchildren =
do closeAllChildren mchildren
withRawConn conn $ pqfinish
-foreign import ccall unsafe "libpq-fe.h PQconnectdb"
+foreign import ccall safe "libpq-fe.h PQconnectdb"
pqconnectdb :: CString -> IO (Ptr CConn)
foreign import ccall unsafe "hdbc-postgresql-helper.h wrapobjpg"
@@ -174,3 +198,6 @@ foreign import ccall unsafe "libpq-fe.h PQprotocolVersion"
foreign import ccall unsafe "libpq-fe.h PQserverVersion"
pqserverVersion :: Ptr CConn -> IO CInt
+
+foreign import ccall unsafe "libpq.fe.h PQisthreadsafe"
+ pqisThreadSafe :: Ptr CConn -> IO Int
diff --git a/Database/HDBC/PostgreSQL/ConnectionImpl.hs b/Database/HDBC/PostgreSQL/ConnectionImpl.hs
index 5dbc393..2e30561 100644
--- a/Database/HDBC/PostgreSQL/ConnectionImpl.hs
+++ b/Database/HDBC/PostgreSQL/ConnectionImpl.hs
@@ -1,21 +1,3 @@
-{-
-Copyright (C) 2005-2007 John Goerzen <jgoerzen at complete.org>
-
- 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.PostgreSQL.ConnectionImpl where
import qualified Database.HDBC.Types as Types
@@ -24,6 +6,7 @@ import Database.HDBC.ColTypes as ColTypes
data Connection =
Connection {
disconnect :: IO (),
+ begin :: IO (),
commit :: IO (),
rollback :: IO (),
runRaw :: String -> IO (),
diff --git a/Database/HDBC/PostgreSQL/PTypeConv.hsc b/Database/HDBC/PostgreSQL/PTypeConv.hsc
index 1395b66..27d2b46 100644
--- a/Database/HDBC/PostgreSQL/PTypeConv.hsc
+++ b/Database/HDBC/PostgreSQL/PTypeConv.hsc
@@ -1,26 +1,7 @@
-- -*- mode: haskell; -*-
-{-
-Copyright (C) 2006 John Goerzen <jgoerzen at complete.org>
-
- 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.PostgreSQL.PTypeConv where
import Database.HDBC.ColTypes
import Data.Word
-import Data.Int
#include "pgtypes.h"
#include <libpq-fe.h>
@@ -88,7 +69,7 @@ oidToColType oid =
#{const PG_TYPE_FLOAT4} -> SqlRealT
#{const PG_TYPE_FLOAT8} -> SqlFloatT
#{const PG_TYPE_DATE} -> SqlDateT
- #{const PG_TYPE_ABSTIME} -> SqlTimestampT
+ #{const PG_TYPE_ABSTIME} -> SqlTimestampWithZoneT
#{const PG_TYPE_DATETIME} -> SqlTimestampWithZoneT
#{const PG_TYPE_TIMESTAMP_NO_TMZONE} -> SqlTimestampT
diff --git a/Database/HDBC/PostgreSQL/Parser.hs b/Database/HDBC/PostgreSQL/Parser.hs
index b63a018..4c50d2e 100644
--- a/Database/HDBC/PostgreSQL/Parser.hs
+++ b/Database/HDBC/PostgreSQL/Parser.hs
@@ -1,24 +1,9 @@
{- -*- mode: haskell; -*-
-Copyright (C) 2005 John Goerzen <jgoerzen at complete.org>
-
- 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
-}
-
{- PostgreSQL uses $1, $2, etc. instead of ? in query strings. So we have to
do some basic parsing on these things to fix 'em up. -}
+
module Database.HDBC.PostgreSQL.Parser where
import Text.ParserCombinators.Parsec
@@ -28,44 +13,49 @@ escapeseq = (try $ string "''") <|>
(try $ string "\\'")
literal :: GenParser Char st [Char]
-literal = do char '\''
+literal = do _ <- char '\''
s <- many (escapeseq <|> (noneOf "'" >>= (\x -> return [x])))
- char '\''
+ _ <- char '\''
return $ "'" ++ (concat s) ++ "'"
qidentifier :: GenParser Char st [Char]
-qidentifier = do char '"'
+qidentifier = do _ <- char '"'
s <- many (noneOf "\"")
- char '"'
+ _ <- char '"'
return $ "\"" ++ s ++ "\""
comment :: GenParser Char st [Char]
comment = ccomment <|> linecomment
ccomment :: GenParser Char st [Char]
-ccomment = do string "/*"
+ccomment = do _ <- string "/*"
c <- manyTill ((try ccomment) <|>
(anyChar >>= (\x -> return [x])))
(try (string "*/"))
return $ "/*" ++ concat c ++ "*/"
linecomment :: GenParser Char st [Char]
-linecomment = do string "--"
+linecomment = do _ <- string "--"
c <- many (noneOf "\n")
- char '\n'
+ _ <- char '\n'
return $ "--" ++ c ++ "\n"
-- FIXME: handle pgsql dollar-quoted constants
-qmark :: Num st => GenParser Char st [Char]
-qmark = do char '?'
+qmark :: (Num st, Show st) => GenParser Char st [Char]
+qmark = do _ <- char '?'
n <- getState
updateState (+1)
return $ "$" ++ show n
-statement :: Num st => GenParser Char st [Char]
+escapedQmark :: GenParser Char st [Char]
+escapedQmark = do _ <- try (char '\\' >> char '?')
+ return "?"
+
+statement :: (Num st, Show st) => GenParser Char st [Char]
statement =
- do s <- many ((try qmark) <|>
+ do s <- many ((try escapedQmark) <|>
+ (try qmark) <|>
(try comment) <|>
(try literal) <|>
(try qidentifier) <|>
diff --git a/Database/HDBC/PostgreSQL/Statement.hsc b/Database/HDBC/PostgreSQL/Statement.hsc
index 0336ce0..2ee49ed 100644
--- a/Database/HDBC/PostgreSQL/Statement.hsc
+++ b/Database/HDBC/PostgreSQL/Statement.hsc
@@ -1,23 +1,7 @@
-- -*- mode: haskell; -*-
{-# CFILES hdbc-postgresql-helper.c #-}
-- Above line for hugs
-{-
-Copyright (C) 2005-2009 John Goerzen <jgoerzen at complete.org>
-
- 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.PostgreSQL.Statement where
import Database.HDBC.Types
import Database.HDBC
@@ -31,24 +15,22 @@ import Foreign.C.String
import Control.Monad
import Data.List
import Data.Word
-import Data.Maybe
import Data.Ratio
-import System.IO
import qualified Data.ByteString as B
import qualified Data.ByteString.UTF8 as BUTF8
import Database.HDBC.PostgreSQL.Parser(convertSQL)
import Database.HDBC.DriverUtils
import Database.HDBC.PostgreSQL.PTypeConv
-import Database.HDBC.PostgreSQL.Utils
import Data.Time.Format
import System.Locale
+l :: Monad m => t -> m ()
l _ = return ()
--l m = hPutStrLn stderr ("\n" ++ m)
#include <libpq-fe.h>
-data SState =
+data SState =
SState { stomv :: MVar (Maybe Stmt),
nextrowmv :: MVar (CInt), -- -1 for no next row (empty); otherwise, next row to read.
dbo :: Conn,
@@ -57,8 +39,8 @@ data SState =
-- FIXME: we currently do no prepare optimization whatsoever.
-newSth :: Conn -> ChildList -> String -> IO Statement
-newSth indbo mchildren query =
+newSth :: Conn -> ChildList -> String -> IO Statement
+newSth indbo mchildren query =
do l "in newSth"
newstomv <- newMVar Nothing
newnextrowmv <- newMVar (-1)
@@ -67,13 +49,13 @@ newSth indbo mchildren query =
Left errstr -> throwSqlError $ SqlError
{seState = "",
seNativeError = (-1),
- seErrorMsg = "hdbc prepare: " ++
+ seErrorMsg = "hdbc prepare: " ++
show errstr}
Right converted -> return converted
let sstate = SState {stomv = newstomv, nextrowmv = newnextrowmv,
dbo = indbo, squery = usequery,
coldefmv = newcoldefmv}
- let retval =
+ let retval =
Statement {execute = fexecute sstate,
executeMany = fexecutemany sstate,
executeRaw = fexecuteRaw sstate,
@@ -86,78 +68,83 @@ newSth indbo mchildren query =
return retval
fgetColumnNames :: SState -> IO [(String)]
-fgetColumnNames sstate =
+fgetColumnNames sstate =
do c <- readMVar (coldefmv sstate)
return (map fst c)
fdescribeResult :: SState -> IO [(String, SqlColDesc)]
-fdescribeResult sstate =
+fdescribeResult sstate =
readMVar (coldefmv sstate)
{- For now, we try to just handle things as simply as possible.
FIXME lots of room for improvement here (types, etc). -}
fexecute :: (Num a, Read a) => SState -> [SqlValue] -> IO a
-fexecute sstate args = withConn (dbo sstate) $ \cconn ->
+fexecute sstate args = withConnLocked (dbo sstate) $ \cconn ->
B.useAsCString (BUTF8.fromString (squery sstate)) $ \cquery ->
withCStringArr0 args $ \cargs -> -- wichSTringArr0 uses UTF-8
do l "in fexecute"
public_ffinish sstate -- Sets nextrowmv to -1
resptr <- pqexecParams cconn cquery
(genericLength args) nullPtr cargs nullPtr nullPtr 0
- handleResultStatus resptr sstate =<< pqresultStatus resptr
+ handleResultStatus cconn resptr sstate =<< pqresultStatus resptr
{- | Differs from fexecute in that it does not prepare its input
query, and the input query may contain multiple statements. This
is useful for issuing DDL or DML commands. -}
fexecuteRaw :: SState -> IO ()
fexecuteRaw sstate =
- withConn (dbo sstate) $ \cconn ->
+ withConnLocked (dbo sstate) $ \cconn ->
B.useAsCString (BUTF8.fromString (squery sstate)) $ \cquery ->
do l "in fexecute"
public_ffinish sstate -- Sets nextrowmv to -1
resptr <- pqexec cconn cquery
- handleResultStatus resptr sstate =<< pqresultStatus resptr
+ _ <- handleResultStatus cconn resptr sstate =<< pqresultStatus resptr :: IO Int
return ()
-handleResultStatus :: (Num a, Read a) => WrappedCStmt -> SState -> ResultStatus -> IO a
-handleResultStatus resptr sstate status =
+handleResultStatus :: (Num a, Read a) => Ptr CConn -> WrappedCStmt -> SState -> ResultStatus -> IO a
+handleResultStatus cconn resptr sstate status =
case status of
#{const PGRES_EMPTY_QUERY} ->
do l $ "PGRES_EMPTY_QUERY: " ++ squery sstate
pqclear_raw resptr
- swapMVar (coldefmv sstate) []
+ _ <- swapMVar (coldefmv sstate) []
return 0
#{const PGRES_COMMAND_OK} ->
do l $ "PGRES_COMMAND_OK: " ++ squery sstate
rowscs <- pqcmdTuples resptr
rows <- peekCString rowscs
pqclear_raw resptr
- swapMVar (coldefmv sstate) []
+ _ <- swapMVar (coldefmv sstate) []
return $ case rows of
"" -> 0
x -> read x
#{const PGRES_TUPLES_OK} ->
do l $ "PGRES_TUPLES_OK: " ++ squery sstate
- fgetcoldef resptr >>= swapMVar (coldefmv sstate)
+ _ <- fgetcoldef resptr >>= swapMVar (coldefmv sstate)
numrows <- pqntuples resptr
if numrows < 1 then (pqclear_raw resptr >> return 0) else
do
wrappedptr <- withRawConn (dbo sstate)
(\rawconn -> wrapstmt resptr rawconn)
fresptr <- newForeignPtr pqclearptr wrappedptr
- swapMVar (nextrowmv sstate) 0
- swapMVar (stomv sstate) (Just fresptr)
+ _ <- swapMVar (nextrowmv sstate) 0
+ _ <- swapMVar (stomv sstate) (Just fresptr)
return 0
- _ -> do l $ "PGRES ERROR: " ++ squery sstate
- csstatusmsg <- pqresStatus status
- cserrormsg <- pqresultErrorMessage resptr
+ _ | resptr == nullPtr -> do
+ l $ "PGRES ERROR: " ++ squery sstate
+ errormsg <- peekCStringUTF8 =<< pqerrorMessage cconn
+ statusmsg <- peekCStringUTF8 =<< pqresStatus status
- statusmsgbs <- B.packCString csstatusmsg
- errormsgbs <- B.packCString cserrormsg
- let statusmsg = BUTF8.toString statusmsgbs
- let errormsg = BUTF8.toString errormsgbs
+ throwSqlError $ SqlError { seState = "E"
+ , seNativeError = fromIntegral status
+ , seErrorMsg = "execute: " ++ statusmsg ++
+ ": " ++ errormsg}
- state <- pqresultErrorField resptr #{const PG_DIAG_SQLSTATE} >>= peekCStringUTF8
+ _ -> do l $ "PGRES ERROR: " ++ squery sstate
+ errormsg <- peekCStringUTF8 =<< pqresultErrorMessage resptr
+ statusmsg <- peekCStringUTF8 =<< pqresStatus status
+ state <- peekCStringUTF8 =<<
+ pqresultErrorField resptr #{const PG_DIAG_SQLSTATE}
pqclear_raw resptr
throwSqlError $ SqlError { seState = state
@@ -168,7 +155,9 @@ handleResultStatus resptr sstate status =
peekCStringUTF8 :: CString -> IO String
-- Marshal a NUL terminated C string into a Haskell string, decoding it
-- with UTF8.
-peekCStringUTF8 str = fmap BUTF8.toString (B.packCString str)
+peekCStringUTF8 str
+ | str == nullPtr = return ""
+ | otherwise = fmap BUTF8.toString (B.packCString str)
@@ -179,7 +168,7 @@ of each to see if it's NULL. If it's not, fetch it as text and return that.
ffetchrow :: SState -> IO (Maybe [SqlValue])
ffetchrow sstate = modifyMVar (nextrowmv sstate) dofetchrow
where dofetchrow (-1) = l "ffr -1" >> return ((-1), Nothing)
- dofetchrow nextrow = modifyMVar (stomv sstate) $ \stmt ->
+ dofetchrow nextrow = modifyMVar (stomv sstate) $ \stmt ->
case stmt of
Nothing -> l "ffr nos" >> return (stmt, ((-1), Nothing))
Just cmstmt -> withStmt cmstmt $ \cstmt ->
@@ -193,10 +182,10 @@ ffetchrow sstate = modifyMVar (nextrowmv sstate) dofetchrow
return (Nothing, ((-1), Nothing))
else do l "getting stuff"
ncols <- pqnfields cstmt
- res <- mapM (getCol cstmt nextrow)
+ res <- mapM (getCol cstmt nextrow)
[0..(ncols - 1)]
return (stmt, (nextrow + 1, Just res))
- getCol p row icol =
+ getCol p row icol =
do isnull <- pqgetisnull p row icol
if isnull /= 0
then return SqlNull
@@ -212,8 +201,7 @@ fgetcoldef cstmt =
do ncols <- pqnfields cstmt
mapM desccol [0..(ncols - 1)]
where desccol i =
- do colname <- (pqfname cstmt i >>= B.packCString >>=
- return . BUTF8.toString)
+ do colname <- peekCStringUTF8 =<< pqfname cstmt i
coltype <- pqftype cstmt i
--coloctets <- pqfsize
let coldef = oidToColDef coltype
@@ -222,13 +210,13 @@ fgetcoldef cstmt =
-- FIXME: needs a faster algorithm.
fexecutemany :: SState -> [[SqlValue]] -> IO ()
fexecutemany sstate arglist =
- mapM_ (fexecute sstate) arglist >> return ()
+ mapM_ (fexecute sstate :: [SqlValue] -> IO Int) arglist >> return ()
-- Finish and change state
public_ffinish :: SState -> IO ()
-public_ffinish sstate =
+public_ffinish sstate =
do l "public_ffinish"
- swapMVar (nextrowmv sstate) (-1)
+ _ <- swapMVar (nextrowmv sstate) (-1)
modifyMVar_ (stomv sstate) worker
where worker Nothing = return Nothing
worker (Just sth) = ffinish sth >> return Nothing
@@ -239,7 +227,7 @@ ffinish p = withRawStmt p $ pqclear
foreign import ccall unsafe "libpq-fe.h PQresultStatus"
pqresultStatus :: (Ptr CStmt) -> IO #{type ExecStatusType}
-foreign import ccall unsafe "libpq-fe.h PQexecParams"
+foreign import ccall safe "libpq-fe.h PQexecParams"
pqexecParams :: (Ptr CConn) -> CString -> CInt ->
(Ptr #{type Oid}) ->
(Ptr CString) ->
@@ -248,7 +236,7 @@ foreign import ccall unsafe "libpq-fe.h PQexecParams"
CInt ->
IO (Ptr CStmt)
-foreign import ccall unsafe "libpq-fe.h PQexec"
+foreign import ccall safe "libpq-fe.h PQexec"
pqexec :: (Ptr CConn) -> CString -> IO (Ptr CStmt)
foreign import ccall unsafe "hdbc-postgresql-helper.h PQclear_app"
@@ -292,17 +280,15 @@ foreign import ccall unsafe "libpq-fe.h PQfname"
foreign import ccall unsafe "libpq-fe.h PQftype"
pqftype :: Ptr CStmt -> CInt -> IO #{type Oid}
-
-
-- SqlValue construction function and helpers
-- Make a SqlValue for the passed column type and string value, where it is assumed that the value represented is not the Sql null value.
-- The IO Monad is required only to obtain the local timezone for interpreting date/time values without an explicit timezone.
makeSqlValue :: SqlTypeId -> B.ByteString -> IO SqlValue
makeSqlValue sqltypeid bstrval =
- let strval = BUTF8.toString bstrval
+ let strval = BUTF8.toString bstrval
in
- case sqltypeid of
+ case sqltypeid of
tid | tid == SqlCharT ||
tid == SqlVarCharT ||
@@ -323,8 +309,8 @@ makeSqlValue sqltypeid bstrval =
tid | tid == SqlRealT ||
tid == SqlFloatT ||
tid == SqlDoubleT -> return $ SqlDouble (read strval)
-
- SqlBitT -> return $ case strval of
+
+ SqlBitT -> return $ case strval of
't':_ -> SqlBool True
'f':_ -> SqlBool False
'T':_ -> SqlBool True -- the rest of these are here "just in case", since they are legal as input
@@ -332,21 +318,21 @@ makeSqlValue sqltypeid bstrval =
'Y':_ -> SqlBool True
"1" -> SqlBool True
_ -> SqlBool False
-
+
-- Dates and Date/Times
tid | tid == SqlDateT -> return $ SqlLocalDate (fromSql (toSql strval))
tid | tid == SqlTimestampWithZoneT -> return $ SqlZonedTime (fromSql (toSql (fixString strval)))
-- SqlUTCDateTimeT not actually generated by PostgreSQL
-
+
tid | tid == SqlTimestampT ||
tid == SqlUTCDateTimeT -> return $ SqlLocalTime (fromSql (toSql strval))
-- Times without dates
- tid | tid == SqlTimeT ||
+ tid | tid == SqlTimeT ||
tid == SqlUTCTimeT -> return $ SqlLocalTimeOfDay (fromSql (toSql strval))
- tid | tid == SqlTimeWithZoneT ->
+ tid | tid == SqlTimeWithZoneT ->
(let (a, b) = case (parseTime defaultTimeLocale "%T%Q %z" timestr,
parseTime defaultTimeLocale "%T%Q %z" timestr) of
(Just x, Just y) -> (x, y)
@@ -354,21 +340,22 @@ makeSqlValue sqltypeid bstrval =
timestr = fixString strval
in return $ SqlZonedLocalTimeOfDay a b)
- SqlIntervalT _ -> return $ SqlDiffTime $ fromRational $
- case split ':' strval of
+ SqlIntervalT _ -> return $ SqlDiffTime $ fromRational $
+ case split ':' strval of
[h, m, s] -> toRational (((read h)::Integer) * 60 * 60 +
((read m)::Integer) * 60) +
toRational ((read s)::Double)
_ -> error $ "PostgreSQL Statement.hsc: Couldn't parse interval: " ++ strval
-
+
-- TODO: For now we just map the binary types to SqlByteStrings. New SqlValue constructors are needed to handle these.
tid | tid == SqlBinaryT ||
- tid == SqlVarBinaryT ||
+ tid == SqlVarBinaryT ||
tid == SqlLongVarBinaryT -> return $ SqlByteString bstrval
SqlGUIDT -> return $ SqlByteString bstrval
SqlUnknownT _ -> return $ SqlByteString bstrval
+ _ -> error $ "PostgreSQL Statement.hsc: unknown typeid: " ++ show sqltypeid
-- Convert "15:33:01.536+00" to "15:33:01.536 +0000"
fixString :: String -> String
@@ -379,14 +366,14 @@ fixString s =
then strbase ++ " " ++ zone ++ "00"
else -- It wasn't in the expected format; don't touch.
s
-
+
-- Make a rational number from a decimal string representation of the number.
makeRationalFromDecimal :: String -> Rational
-makeRationalFromDecimal s =
+makeRationalFromDecimal s =
case elemIndex '.' s of
Nothing -> toRational ((read s)::Integer)
- Just dotix ->
+ Just dotix ->
let (nstr,'.':dstr) = splitAt dotix s
num = (read $ nstr ++ dstr)::Integer
den = 10^((genericLength dstr) :: Integer)
diff --git a/Database/HDBC/PostgreSQL/Types.hs b/Database/HDBC/PostgreSQL/Types.hs
index 03463c8..44da1df 100644
--- a/Database/HDBC/PostgreSQL/Types.hs
+++ b/Database/HDBC/PostgreSQL/Types.hs
@@ -2,10 +2,13 @@ module Database.HDBC.PostgreSQL.Types
where
import Foreign
+import Control.Concurrent.MVar
+
+type ConnLock = MVar ()
data CConn = CConn
type WrappedCConn = Ptr CConn
-type Conn = ForeignPtr WrappedCConn
+type Conn = (ConnLock, ForeignPtr WrappedCConn)
data CStmt = CStmt
type WrappedCStmt = Ptr CStmt
diff --git a/Database/HDBC/PostgreSQL/Utils.hsc b/Database/HDBC/PostgreSQL/Utils.hsc
index 695f0c1..211f033 100644
--- a/Database/HDBC/PostgreSQL/Utils.hsc
+++ b/Database/HDBC/PostgreSQL/Utils.hsc
@@ -1,19 +1,4 @@
{- -*- mode: haskell; -*-
-Copyright (C) 2005-2009 John Goerzen <jgoerzen at complete.org>
-
- 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.PostgreSQL.Utils where
@@ -23,6 +8,7 @@ import Foreign.Ptr
import Database.HDBC(throwSqlError)
import Database.HDBC.Types
import Database.HDBC.PostgreSQL.Types
+import Control.Concurrent.MVar
import Foreign.C.Types
import Control.Exception
import Foreign.Storable
@@ -32,6 +18,7 @@ import Foreign.Marshal.Utils
import Data.Word
import qualified Data.ByteString.UTF8 as BUTF8
import qualified Data.ByteString as B
+import qualified Data.ByteString.Char8 as BCHAR8
#ifndef __HUGS__
-- Hugs includes this in Data.ByteString
import qualified Data.ByteString.Unsafe as B
@@ -60,10 +47,17 @@ done by withRawConn.
Ditto for statements. -}
withConn :: Conn -> (Ptr CConn -> IO b) -> IO b
-withConn = genericUnwrap
+withConn (_lock,conn) = genericUnwrap conn
+
+-- Perform the associated action with the connection lock held.
+-- Care must be taken with the use of this as it is *not* re-entrant. Calling it
+-- a second time in the same thread will cause dead-lock.
+-- (A better approach would be to use RLock from concurrent-extra)
+withConnLocked :: Conn -> (Ptr CConn -> IO b) -> IO b
+withConnLocked c@(lock,_) a = withConn c (\cconn -> withMVar lock (\_ -> a cconn))
withRawConn :: Conn -> (Ptr WrappedCConn -> IO b) -> IO b
-withRawConn = withForeignPtr
+withRawConn (_lock,conn) = withForeignPtr conn
withStmt :: Stmt -> (Ptr CStmt -> IO b) -> IO b
withStmt = genericUnwrap
@@ -81,12 +75,19 @@ withCStringArr0 inp action = withAnyArr0 convfunc freefunc inp action
-}
convfunc y@(SqlUTCTime _) = convfunc (SqlZonedTime (fromSql y))
convfunc y@(SqlEpochTime _) = convfunc (SqlZonedTime (fromSql y))
+ convfunc (SqlByteString x) = cstrUtf8BString (cleanUpBSNulls x)
convfunc x = cstrUtf8BString (fromSql x)
freefunc x =
if x == nullPtr
then return ()
else free x
+cleanUpBSNulls :: B.ByteString -> B.ByteString
+cleanUpBSNulls = B.concatMap convfunc
+ where convfunc 0 = bsForNull
+ convfunc x = B.singleton x
+ bsForNull = BCHAR8.pack "\\000"
+
withAnyArr0 :: (a -> IO (Ptr b)) -- ^ Function that transforms input data into pointer
-> (Ptr b -> IO ()) -- ^ Function that frees generated data
-> [a] -- ^ List of input data
diff --git a/HDBC-postgresql.cabal b/HDBC-postgresql.cabal
index e6a18a5..b0d7902 100644
--- a/HDBC-postgresql.cabal
+++ b/HDBC-postgresql.cabal
@@ -1,18 +1,15 @@
Name: HDBC-postgresql
-Version: 2.2.3.1
-License: LGPL
-Maintainer: John Goerzen <jgoerzen at complete.org>
+Version: 2.3.2.1
+License: BSD3
+Maintainer: Nicolas Wu <nicolas.wu at gmail.com>
Author: John Goerzen
-Copyright: Copyright (c) 2005-2010 John Goerzen
-license-file: COPYRIGHT
-extra-source-files: COPYING, hdbc-postgresql-helper.h, pgtypes.h,
+Copyright: Copyright (c) 2005-2011 John Goerzen
+license-file: LICENSE
+extra-source-files: LICENSE, hdbc-postgresql-helper.h, pgtypes.h,
Makefile,
README.txt,
- TODO,
- testsrc/COPYING,
- testsrc/COPYRIGHT,
testsrc/TestTime.hs
-homepage: http://software.complete.org/hdbc-postgresql
+homepage: http://github.com/hdbc/hdbc-postgresql
Category: Database
synopsis: PostgreSQL driver for HDBC
Description: This package provides a PostgreSQL driver for HDBC
@@ -39,7 +36,7 @@ Library
Database.HDBC.PostgreSQL.ErrorCodes
Extensions: ExistentialQuantification, ForeignFunctionInterface
Build-Depends: base >= 3 && < 5, mtl, HDBC>=2.2.0, parsec, utf8-string,
- bytestring, old-time, old-locale, time
+ bytestring, old-time, old-locale, time, convertible
if impl(ghc >= 6.9)
Build-Depends: base >= 4
Extra-Libraries: pq
@@ -51,7 +48,8 @@ Executable runtests
if flag(buildtests)
Buildable: True
Build-Depends: HUnit, QuickCheck, testpack, containers,
- convertible, time, old-locale
+ convertible, time, old-locale, parsec, utf8-string,
+ bytestring, old-time, base, HDBC>=2.2.6
else
Buildable: False
Main-Is: runtests.hs
@@ -78,3 +76,6 @@ Executable runtests
Extensions: ExistentialQuantification,
ForeignFunctionInterface
+source-repository head
+ type: git
+ location: https://github.com/hdbc/hdbc-postgresql.git
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..2b2ba61
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2005-2011 John Goerzen
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice, this
+ list of conditions and the following disclaimer in the documentation and/or
+ other materials provided with the distribution.
+
+* Neither the name of John Goerzen nor the names of its
+ contributors may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Setup.hs b/Setup.hs
old mode 100755
new mode 100644
index 644aab1..76d7605
--- a/Setup.hs
+++ b/Setup.hs
@@ -17,7 +17,7 @@ main = defaultMainWithHooks simpleUserHooks {
hookedPrograms = [pgconfigProgram],
confHook = \pkg flags -> do
- lbi <- confHook defaultUserHooks pkg flags
+ lbi <- confHook simpleUserHooks pkg flags
bi <- psqlBuildInfo lbi
return lbi {
@@ -26,10 +26,10 @@ main = defaultMainWithHooks simpleUserHooks {
}
}
-pgconfigProgram = (simpleProgram "pgconfig") {
+pgconfigProgram = (simpleProgram "pgconfig or pg_config") {
programFindLocation = \verbosity -> do
- pgconfig <- findProgramOnPath "pgconfig" verbosity
- pg_config <- findProgramOnPath "pg_config" verbosity
+ pgconfig <- findProgramLocation verbosity "pgconfig"
+ pg_config <- findProgramLocation verbosity "pg_config"
return (pgconfig `mplus` pg_config)
}
diff --git a/TODO b/TODO
deleted file mode 100644
index 5a68269..0000000
--- a/TODO
+++ /dev/null
@@ -1,5 +0,0 @@
-optimize multiple executions and executeMany
-
-cursors
-
-shouldn't use Double when converting from intervals
diff --git a/hdbc-postgresql-helper.c b/hdbc-postgresql-helper.c
index 9981fe2..14dc7a1 100644
--- a/hdbc-postgresql-helper.c
+++ b/hdbc-postgresql-helper.c
@@ -31,6 +31,7 @@ void PQfinish_app(finalizeonce *conn) {
if (conn->isfinalized)
return;
PQfinish((PGconn *) (conn->encapobj));
+ conn->encapobj = NULL;
conn->isfinalized = 1;
}
diff --git a/testsrc/COPYING b/testsrc/COPYING
deleted file mode 100644
index 2d2d780..0000000
--- a/testsrc/COPYING
+++ /dev/null
@@ -1,510 +0,0 @@
-
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes a de-facto standard. To achieve this, non-free programs must
-be allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at least
- three years, to give the same user the materials specified in
- Subsection 6a, above, for a charge no more than the cost of
- performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
- To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
-
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- 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.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/testsrc/COPYRIGHT b/testsrc/COPYRIGHT
deleted file mode 100644
index 891207f..0000000
--- a/testsrc/COPYRIGHT
+++ /dev/null
@@ -1,4 +0,0 @@
-Copyright (c) 2005 John Goerzen
-
-Please see COPYING for the license.
-
diff --git a/testsrc/TestTime.hs b/testsrc/TestTime.hs
index 1c4131f..5fd77da 100644
--- a/testsrc/TestTime.hs
+++ b/testsrc/TestTime.hs
@@ -9,7 +9,8 @@ import Data.Time.Clock.POSIX
import Data.Maybe
import Data.Convertible
import SpecificDB
-import System.Locale
+import System.Locale(defaultTimeLocale)
+import Database.HDBC.Locale (iso8601DateFormat)
import qualified System.Time as ST
instance Eq ZonedTime where
diff --git a/testsrc/Tests.hs b/testsrc/Tests.hs
index 007151d..31b7bc0 100644
--- a/testsrc/Tests.hs
+++ b/testsrc/Tests.hs
@@ -1,19 +1,4 @@
{- arch-tag: Tests main file
-Copyright (C) 2004-2005 John Goerzen <jgoerzen at complete.org>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
module Tests(tests) where
diff --git a/testsrc/runtests.hs b/testsrc/runtests.hs
index f6ee9b4..f3c0acb 100644
--- a/testsrc/runtests.hs
+++ b/testsrc/runtests.hs
@@ -1,19 +1,4 @@
{- arch-tag: Test runner
-Copyright (C) 2004 John Goerzen <jgoerzen at complete.org>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
module Main where
--
HDBC PostgreSQL backend driver
More information about the Pkg-haskell-commits
mailing list