From e440e73a889c8929730632d62ebc84e32475b549 Mon Sep 17 00:00:00 2001 From: Constantin Michael Date: Wed, 13 Jul 2011 11:03:13 +0200 Subject: Add PostgreSQL --- boost/database.hxx | 8 +- build/configuration.make | 4 + build/configure | 3 +- build/import/libodb-pgsql/LICENSE | 12 + build/import/libodb-pgsql/configuration-rules.make | 15 + build/import/libodb-pgsql/configure | 55 ++++ build/import/libodb-pgsql/stub.make | 30 ++ build/import/libpq/LICENSE | 340 +++++++++++++++++++++ build/import/libpq/configuration-rules.make | 15 + build/import/libpq/configure | 81 +++++ build/import/libpq/rules.make | 31 ++ build/import/libpq/stub.make | 35 +++ build/import/libpq/version | 1 + build/pgsql/configure | 58 ++++ build/pgsql/pgsql | 52 ++++ composite/database.hxx | 8 +- container/database.hxx | 8 +- hello/database.hxx | 8 +- inheritance/database.hxx | 8 +- inverse/database.hxx | 8 +- makefile | 6 +- mapping/database.hxx | 8 +- mapping/makefile | 2 +- mapping/traits-pgsql.cxx | 19 ++ mapping/traits-pgsql.hxx | 107 +++++++ mapping/traits.hxx | 2 + qt/database.hxx | 10 +- query/database.hxx | 8 +- relationship/database.hxx | 8 +- schema/custom/database.hxx | 16 +- schema/custom/driver.cxx | 42 +++ schema/embedded/database.hxx | 8 +- template/database.hxx | 6 + 33 files changed, 1005 insertions(+), 17 deletions(-) create mode 100644 build/import/libodb-pgsql/LICENSE create mode 100644 build/import/libodb-pgsql/configuration-rules.make create mode 100755 build/import/libodb-pgsql/configure create mode 100644 build/import/libodb-pgsql/stub.make create mode 100644 build/import/libpq/LICENSE create mode 100644 build/import/libpq/configuration-rules.make create mode 100755 build/import/libpq/configure create mode 100644 build/import/libpq/rules.make create mode 100644 build/import/libpq/stub.make create mode 100644 build/import/libpq/version create mode 100755 build/pgsql/configure create mode 100755 build/pgsql/pgsql create mode 100644 mapping/traits-pgsql.cxx create mode 100644 mapping/traits-pgsql.hxx diff --git a/boost/database.hxx b/boost/database.hxx index 2856468..fe815e9 100644 --- a/boost/database.hxx +++ b/boost/database.hxx @@ -1,4 +1,4 @@ -// file : boost/database.hxx +// file : template/database.hxx // author : Boris Kolpackov // copyright : not copyrighted - public domain @@ -22,6 +22,8 @@ # include # include # include +#elif defined(DATABASE_PGSQL) +# include #endif inline std::auto_ptr @@ -39,6 +41,8 @@ create_database (int& argc, char* argv[]) odb::mysql::database::print_usage (cerr); #elif defined(DATABASE_SQLITE) odb::sqlite::database::print_usage (cerr); +#elif defined(DATABASE_PGSQL) + odb::pgsql::database::print_usage (cerr); #endif exit (0); @@ -58,6 +62,8 @@ create_database (int& argc, char* argv[]) schema_catalog::create_schema (*db); t.commit (); } +#elif defined(DATABASE_PGSQL) + auto_ptr db (new odb::pgsql::database (argc, argv)); #endif return db; diff --git a/build/configuration.make b/build/configuration.make index 768beb2..5dc9e16 100644 --- a/build/configuration.make +++ b/build/configuration.make @@ -21,6 +21,10 @@ ifeq ($(db_id),sqlite) db_macro := DATABASE_SQLITE endif +ifeq ($(db_id),pgsql) +db_macro := DATABASE_PGSQL +endif + $(out_root)/%: db_id := $(db_id) $(out_root)/%: db_macro := $(db_macro) diff --git a/build/configure b/build/configure index 2fc7846..70413fc 100755 --- a/build/configure +++ b/build/configure @@ -24,9 +24,10 @@ $echo "Please select the database you would like to use:" $echo $echo "(1) MySQL" $echo "(2) SQLite" +$echo "(3) PostgreSQL" $echo -db_id=`read_option "mysql sqlite"` +db_id=`read_option "mysql sqlite pgsql"` echo "db_id := $db_id" >$1 diff --git a/build/import/libodb-pgsql/LICENSE b/build/import/libodb-pgsql/LICENSE new file mode 100644 index 0000000..ed9c55c --- /dev/null +++ b/build/import/libodb-pgsql/LICENSE @@ -0,0 +1,12 @@ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License version 2 as +published by the Free Software Foundation. + +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 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/build/import/libodb-pgsql/configuration-rules.make b/build/import/libodb-pgsql/configuration-rules.make new file mode 100644 index 0000000..307a8f6 --- /dev/null +++ b/build/import/libodb-pgsql/configuration-rules.make @@ -0,0 +1,15 @@ +# file : build/import/libodb-pgsql/configuration-rules.make +# author : Constantin Michael +# copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +$(dcf_root)/import/libodb-pgsql/configuration-dynamic.make: | $(dcf_root)/import/libodb-pgsql/. + $(call message,,$(scf_root)/import/libodb-pgsql/configure $@) + +ifndef %foreign% + +$(dcf_root)/.disfigure:: + $(call message,rm $(dcf_root)/import/libodb-pgsql/configuration-dynamic.make,\ +rm -f $(dcf_root)/import/libodb-pgsql/configuration-dynamic.make) + +endif diff --git a/build/import/libodb-pgsql/configure b/build/import/libodb-pgsql/configure new file mode 100755 index 0000000..3315781 --- /dev/null +++ b/build/import/libodb-pgsql/configure @@ -0,0 +1,55 @@ +#! /usr/bin/env bash + +# file : build/import/libodb-pgsql/configure +# author : Constantin Michael +# copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + + +# $1 - out file +# +# bld_root - build root +# project_name - project name +# + +source $bld_root/dialog.bash + + +$echo +$echo "Configuring external dependency on 'libodb-pgsql' for '$project_name'." +$echo + +$echo +$echo "Would you like to configure dependency on the installed version" +$echo "of 'libodb-pgsql' as opposed to the development build?" +$echo + +installed=`read_y_n y` + +path= + +if [ "$installed" = "n" ]; then + +$echo +$echo "Please enter the src_root for 'libodb-pgsql'." +$echo + +src_root=`read_path --directory --exist` + +$echo +$echo "Please enter the out_root for 'libodb-pgsql'." +$echo + +out_root=`read_path --directory $src_root` + +fi + +echo libodb_pgsql_installed := $installed >$1 + +if [ "$installed" = "n" ]; then + +echo src_root := $src_root >>$1 +echo scf_root := \$\(src_root\)/build >>$1 +echo out_root := $out_root >>$1 + +fi diff --git a/build/import/libodb-pgsql/stub.make b/build/import/libodb-pgsql/stub.make new file mode 100644 index 0000000..fed0f02 --- /dev/null +++ b/build/import/libodb-pgsql/stub.make @@ -0,0 +1,30 @@ +# file : build/import/libodb-pgsql/stub.make +# author : Constantin Michael +# copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +$(call include-once,$(scf_root)/import/libodb-pgsql/configuration-rules.make,$(dcf_root)) + +libodb_pgsql_installed := + +$(call -include,$(dcf_root)/import/libodb-pgsql/configuration-dynamic.make) + +ifdef libodb_pgsql_installed + +ifeq ($(libodb_pgsql_installed),y) + +$(call export,l: -lodb-pgsql -lodb -lpq,cpp-options: ) + +else + +# Include export stub. +# +$(call include,$(scf_root)/export/libodb-pgsql/stub.make) + +endif + +else + +.NOTPARALLEL: + +endif diff --git a/build/import/libpq/LICENSE b/build/import/libpq/LICENSE new file mode 100644 index 0000000..3912109 --- /dev/null +++ b/build/import/libpq/LICENSE @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 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. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +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 give any other recipients of the Program a copy of this License +along with the Program. + +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 Program or any portion +of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +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 Program, 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 Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) 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; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, 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 executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or 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 counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program 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. + + 5. 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 Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. 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 Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program 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 Program. + +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. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program 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. + + 9. The Free Software Foundation may publish revised and/or new versions +of the 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 Program +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 Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, 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 + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), 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 Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/build/import/libpq/configuration-rules.make b/build/import/libpq/configuration-rules.make new file mode 100644 index 0000000..c4b1326 --- /dev/null +++ b/build/import/libpq/configuration-rules.make @@ -0,0 +1,15 @@ +# file : build/import/libpq/configuration-rules.make +# author : Constantin Michael +# copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +$(dcf_root)/import/libpq/configuration-dynamic.make: | $(dcf_root)/import/libpq/. + $(call message,,$(scf_root)/import/libpq/configure $@) + +ifndef %foreign% + +disfigure:: + $(call message,rm $(dcf_root)/import/libpq/configuration-dynamic.make,\ +rm -f $(dcf_root)/import/libpq/configuration-dynamic.make) + +endif diff --git a/build/import/libpq/configure b/build/import/libpq/configure new file mode 100755 index 0000000..8e2210f --- /dev/null +++ b/build/import/libpq/configure @@ -0,0 +1,81 @@ +#! /usr/bin/env bash + +# file : build/import/libpq/configure +# author : Constantin Michael +# copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + + +# $1 - out config file +# +# bld_root - build root +# project_name - project name +# + +source $bld_root/dialog.bash + + +$echo +$echo "Configuring external dependency on 'PostgreSQL library' for '$project_name'." +$echo + +$echo +$echo "Would you like to configure dependency on the installed version" +$echo "of 'PostgreSQL library' as opposed to the development build?" +$echo + +installed=`read_y_n y` + +path= +type= + +if [ "$installed" = "n" ]; then + + $echo + $echo "Please enter the 'PostgreSQL' root directory." + $echo + + root=`read_path --directory --exist` + + $echo + $echo "Please select the library type you would like to use:" + $echo + $echo "(1) archive" + $echo "(2) shared object" + $echo + + type=`read_option "archive shared" "shared"` + +else + + pq_libs=-lpq + + if pg_config --version > /dev/null 2>&1; then + + pq_cppflags=-I`pg_config --includedir` + + else + $echo + $echo "Unable to discover installed 'PostgreSQL libraries' using pg_config." + $echo "Assuming the C++ compiler will find them automatically." + $echo + + pq_cppflags= + + fi + +fi + +echo libpq_installed := $installed >$1 + +if [ "$installed" = "n" ]; then + + echo libpq_root := $root >>$1 + echo libpq_type := $type >>$1 + +else + + echo pq_cppflags := $pq_cppflags >>$1 + echo pq_libs := $pq_libs >>$1 + +fi diff --git a/build/import/libpq/rules.make b/build/import/libpq/rules.make new file mode 100644 index 0000000..85cc659 --- /dev/null +++ b/build/import/libpq/rules.make @@ -0,0 +1,31 @@ +# file : build/import/libpq/rules.make +# author : Constantin Michael +# copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +$(dcf_root)/import/libpq/%: root := $(libpq_root) + +ifeq ($(libpq_type),archive) + +$(dcf_root)/import/libpq/pq.l: $(libpq_root)/libpq/.libs/libpq.a + @echo $< >$@ +else + +$(dcf_root)/import/libpq/pq.l: $(libpq_root)/libpq/.libs/libpq.so + @echo $< >$@ + @echo rpath:$(root)/libpq/.libs >>$@ +endif + +$(dcf_root)/import/libpq/pq.l.cpp-options: + @ln -s $(root)/include $(dcf_root)/import/libpq/pq + @echo include: -I$(dcf_root)/import/libpq >$@ + +ifndef %foreign% + +disfigure:: + $(call message,rm $(dcf_root)/import/pq/pq.l,\ +rm -f $(dcf_root)/import/pq/pq.l) + $(call message,,rm -f $(dcf_root)/import/libpq/pq) + $(call message,,rm -f $(dcf_root)/import/libpq/pq.l.cpp-options) + +endif diff --git a/build/import/libpq/stub.make b/build/import/libpq/stub.make new file mode 100644 index 0000000..d12abaa --- /dev/null +++ b/build/import/libpq/stub.make @@ -0,0 +1,35 @@ +# file : build/import/libpq/stub.make +# author : Constantin Michael +# copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +$(call include-once,$(scf_root)/import/libpq/configuration-rules.make,$(dcf_root)) + +libpq_installed := + +$(call -include,$(dcf_root)/import/libpq/configuration-dynamic.make) + +ifdef libpq_installed + +ifeq ($(libpq_installed),y) + +$(call export,\ + l: $(pq_libs),\ + cpp-options: ,\ + cpp-options-inline: $(pq_cppflags)) + +else + +$(call include-once,$(scf_root)/import/libpq/rules.make,$(dcf_root)) + +$(call export,\ + l: $(dcf_root)/import/libpq/pq.l,\ + cpp-options: $(dcf_root)/import/libpq/pq.l.cpp-options) + +endif + +else + +.NOTPARALLEL: + +endif diff --git a/build/import/libpq/version b/build/import/libpq/version new file mode 100644 index 0000000..6e8bf73 --- /dev/null +++ b/build/import/libpq/version @@ -0,0 +1 @@ +0.1.0 diff --git a/build/pgsql/configure b/build/pgsql/configure new file mode 100755 index 0000000..11f419e --- /dev/null +++ b/build/pgsql/configure @@ -0,0 +1,58 @@ +#! /usr/bin/env bash + +# file : build/pgsql/configure +# author : Constantin Michael +# copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +# +# dcf_root - dynamic configuration root +# + +$echo +$echo "Please enter the PostgreSQL client program path." +$echo + +driver=`read_path --command psql` + +$echo +$echo "Please enter the PostgreSQL database user. Note that the named" +$echo "user must be allowed to connect to the database server without" +$echo "specifying credentials." +$echo + +user=`read_value "odb_test"` + +$echo +$echo "Please enter the PostgreSQL database name. Note that it WILL BE" +$echo "MODIFIED by the tests." +$echo + +db=`read_value "odb_test"` + +$echo +$echo "Please enter the PostgreSQL database host. Leaving this field" +$echo "blank results in using Unix-domain socket. Machines without" +$echo "Unix-domain sockets will connect to localhost." + +host=`read_value ""` + +$echo +$echo "Please enter the PostgreSQL database port or the socket file name" +$echo "extension for Unix-domain connections." +$echo + +port=`read_value ""` + +opt=$dcf_root/db.options +drv=$dcf_root/db-driver + +echo "--user '$user'" >$opt +echo "--database '$db'" >>$opt +echo "--host '$host'" >>$opt +echo "--port '$port'" >>$opt + +echo "#!/bin/sh" >$drv +echo "opt=\`cat $opt\`" >>$drv +echo "eval $scf_root/pgsql/pgsql --driver $driver \$opt \$*" >>$drv +chmod 755 $drv diff --git a/build/pgsql/pgsql b/build/pgsql/pgsql new file mode 100755 index 0000000..c1c2482 --- /dev/null +++ b/build/pgsql/pgsql @@ -0,0 +1,52 @@ +#! /usr/bin/env bash + +# file : build/pgsql/pgsql +# author : Constantin Michael +# copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +# +# PostgreSQL driver wrapper. +# + +while [ $# -gt 0 ]; do + case $1 in + --driver) + driver=$2 + shift 2 + ;; + --user) + opt="$opt --user=$2" + shift 2 + ;; + --database) + opt="$opt --dbname=$2" + shift 2 + ;; + --host) + opt="$opt --host=$2" + shift 2 + ;; + --port) + opt="$opt --port=$2" + shift 2 + ;; + *) + break + ;; + esac +done + +if [ -z "$driver" ]; then + driver=psql +fi + +opt="--quiet $opt" + +export PGOPTIONS=--client-min-messages=warning + +if [ -n "$1" ]; then + exec $driver $opt <$1 +else + exec $driver $opt +fi diff --git a/composite/database.hxx b/composite/database.hxx index 52010cc..fe815e9 100644 --- a/composite/database.hxx +++ b/composite/database.hxx @@ -1,4 +1,4 @@ -// file : composite/database.hxx +// file : template/database.hxx // author : Boris Kolpackov // copyright : not copyrighted - public domain @@ -22,6 +22,8 @@ # include # include # include +#elif defined(DATABASE_PGSQL) +# include #endif inline std::auto_ptr @@ -39,6 +41,8 @@ create_database (int& argc, char* argv[]) odb::mysql::database::print_usage (cerr); #elif defined(DATABASE_SQLITE) odb::sqlite::database::print_usage (cerr); +#elif defined(DATABASE_PGSQL) + odb::pgsql::database::print_usage (cerr); #endif exit (0); @@ -58,6 +62,8 @@ create_database (int& argc, char* argv[]) schema_catalog::create_schema (*db); t.commit (); } +#elif defined(DATABASE_PGSQL) + auto_ptr db (new odb::pgsql::database (argc, argv)); #endif return db; diff --git a/container/database.hxx b/container/database.hxx index 78d0e17..fe815e9 100644 --- a/container/database.hxx +++ b/container/database.hxx @@ -1,4 +1,4 @@ -// file : container/database.hxx +// file : template/database.hxx // author : Boris Kolpackov // copyright : not copyrighted - public domain @@ -22,6 +22,8 @@ # include # include # include +#elif defined(DATABASE_PGSQL) +# include #endif inline std::auto_ptr @@ -39,6 +41,8 @@ create_database (int& argc, char* argv[]) odb::mysql::database::print_usage (cerr); #elif defined(DATABASE_SQLITE) odb::sqlite::database::print_usage (cerr); +#elif defined(DATABASE_PGSQL) + odb::pgsql::database::print_usage (cerr); #endif exit (0); @@ -58,6 +62,8 @@ create_database (int& argc, char* argv[]) schema_catalog::create_schema (*db); t.commit (); } +#elif defined(DATABASE_PGSQL) + auto_ptr db (new odb::pgsql::database (argc, argv)); #endif return db; diff --git a/hello/database.hxx b/hello/database.hxx index 0d382e4..fe815e9 100644 --- a/hello/database.hxx +++ b/hello/database.hxx @@ -1,4 +1,4 @@ -// file : hello/database.hxx +// file : template/database.hxx // author : Boris Kolpackov // copyright : not copyrighted - public domain @@ -22,6 +22,8 @@ # include # include # include +#elif defined(DATABASE_PGSQL) +# include #endif inline std::auto_ptr @@ -39,6 +41,8 @@ create_database (int& argc, char* argv[]) odb::mysql::database::print_usage (cerr); #elif defined(DATABASE_SQLITE) odb::sqlite::database::print_usage (cerr); +#elif defined(DATABASE_PGSQL) + odb::pgsql::database::print_usage (cerr); #endif exit (0); @@ -58,6 +62,8 @@ create_database (int& argc, char* argv[]) schema_catalog::create_schema (*db); t.commit (); } +#elif defined(DATABASE_PGSQL) + auto_ptr db (new odb::pgsql::database (argc, argv)); #endif return db; diff --git a/inheritance/database.hxx b/inheritance/database.hxx index 6d1fa66..fe815e9 100644 --- a/inheritance/database.hxx +++ b/inheritance/database.hxx @@ -1,4 +1,4 @@ -// file : inheritance/database.hxx +// file : template/database.hxx // author : Boris Kolpackov // copyright : not copyrighted - public domain @@ -22,6 +22,8 @@ # include # include # include +#elif defined(DATABASE_PGSQL) +# include #endif inline std::auto_ptr @@ -39,6 +41,8 @@ create_database (int& argc, char* argv[]) odb::mysql::database::print_usage (cerr); #elif defined(DATABASE_SQLITE) odb::sqlite::database::print_usage (cerr); +#elif defined(DATABASE_PGSQL) + odb::pgsql::database::print_usage (cerr); #endif exit (0); @@ -58,6 +62,8 @@ create_database (int& argc, char* argv[]) schema_catalog::create_schema (*db); t.commit (); } +#elif defined(DATABASE_PGSQL) + auto_ptr db (new odb::pgsql::database (argc, argv)); #endif return db; diff --git a/inverse/database.hxx b/inverse/database.hxx index 087a059..fe815e9 100644 --- a/inverse/database.hxx +++ b/inverse/database.hxx @@ -1,4 +1,4 @@ -// file : inverse/database.hxx +// file : template/database.hxx // author : Boris Kolpackov // copyright : not copyrighted - public domain @@ -22,6 +22,8 @@ # include # include # include +#elif defined(DATABASE_PGSQL) +# include #endif inline std::auto_ptr @@ -39,6 +41,8 @@ create_database (int& argc, char* argv[]) odb::mysql::database::print_usage (cerr); #elif defined(DATABASE_SQLITE) odb::sqlite::database::print_usage (cerr); +#elif defined(DATABASE_PGSQL) + odb::pgsql::database::print_usage (cerr); #endif exit (0); @@ -58,6 +62,8 @@ create_database (int& argc, char* argv[]) schema_catalog::create_schema (*db); t.commit (); } +#elif defined(DATABASE_PGSQL) + auto_ptr db (new odb::pgsql::database (argc, argv)); #endif return db; diff --git a/makefile b/makefile index c47cd22..cd32a75 100644 --- a/makefile +++ b/makefile @@ -15,8 +15,10 @@ mapping \ schema/embedded tr1_dirs := relationship inverse schema/custom -boost_dirs := boost -qt_dirs := qt +#boost_dirs := boost +boost_dirs := +#qt_dirs := qt +qt_dirs := dist_dirs := $(dirs) $(tr1_dirs) $(boost_dirs) $(qt_dirs) all_dirs := $(dirs) $(tr1_dirs) $(boost_dirs) $(qt_dirs) template diff --git a/mapping/database.hxx b/mapping/database.hxx index 7920d93..fe815e9 100644 --- a/mapping/database.hxx +++ b/mapping/database.hxx @@ -1,4 +1,4 @@ -// file : mapping/database.hxx +// file : template/database.hxx // author : Boris Kolpackov // copyright : not copyrighted - public domain @@ -22,6 +22,8 @@ # include # include # include +#elif defined(DATABASE_PGSQL) +# include #endif inline std::auto_ptr @@ -39,6 +41,8 @@ create_database (int& argc, char* argv[]) odb::mysql::database::print_usage (cerr); #elif defined(DATABASE_SQLITE) odb::sqlite::database::print_usage (cerr); +#elif defined(DATABASE_PGSQL) + odb::pgsql::database::print_usage (cerr); #endif exit (0); @@ -58,6 +62,8 @@ create_database (int& argc, char* argv[]) schema_catalog::create_schema (*db); t.commit (); } +#elif defined(DATABASE_PGSQL) + auto_ptr db (new odb::pgsql::database (argc, argv)); #endif return db; diff --git a/mapping/makefile b/mapping/makefile index 1b50fe2..b3c029d 100644 --- a/mapping/makefile +++ b/mapping/makefile @@ -5,7 +5,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../build/bootstrap.make -cxx_tun := driver.cxx +cxx_tun := driver.cxx traits-pgsql.cxx odb_hdr := person.hxx cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.o)) cxx_od := $(cxx_obj:.o=.o.d) diff --git a/mapping/traits-pgsql.cxx b/mapping/traits-pgsql.cxx new file mode 100644 index 0000000..026e15f --- /dev/null +++ b/mapping/traits-pgsql.cxx @@ -0,0 +1,19 @@ +// file : mapping/traits-pgsql.cxx +// author : Constantin Michael +// copyright : not copyrighted - public domain + +#include "traits-pgsql.hxx" + +namespace odb +{ + namespace pgsql + { + namespace + { + tm pg_epoch_tm = {0, 0, 0, 1, 1, 100, 0, 0, 0, 0, 0}; + } + + const time_t value_traits::pg_epoch_tt ( + mktime (&pg_epoch_tm)); + } +} diff --git a/mapping/traits-pgsql.hxx b/mapping/traits-pgsql.hxx new file mode 100644 index 0000000..6ee396d --- /dev/null +++ b/mapping/traits-pgsql.hxx @@ -0,0 +1,107 @@ +// file : mapping/traits-pgsql.hxx +// author : Constantin Michael +// copyright : not copyrighted - public domain + +#ifndef TRAITS_PGSQL_HXX +#define TRAITS_PGSQL_HXX + +// +// PostgreSQL implementation. +// + +#include +#include + +#include +#include + +#include "person.hxx" // date + +namespace odb +{ + namespace pgsql + { + template <> + class value_traits + { + public: + typedef bool value_type; + typedef bool query_type; + typedef details::buffer image_type; + + static void + set_value (bool& v, + const details::buffer& b, + std::size_t n, + bool is_null) + { + v = (!is_null && n == 4 && std::strncmp ("true", b.data (), n) == 0); + } + + static void + set_image (details::buffer& b, + std::size_t& n, + bool& is_null, + bool v) + { + is_null = false; + n = v ? 4 : 5; + + if (n > b.capacity ()) + b.capacity (n); + + std::memcpy (b.data (), (v ? "true" : "false"), n); + } + }; + + template <> + class value_traits + { + public: + typedef date value_type; + typedef date query_type; + typedef int image_type; + + static const time_t pg_epoch_tt; + static const time_t seconds_per_day = 86400; + + static void + set_value (date& v, const int& i, bool is_null) + { + if (is_null) + { + v = date (0, 0, 0); + return; + } + + time_t v_tt (pg_epoch_tt + + static_cast (details::endian_traits::ntoh (i)) * + seconds_per_day); + + tm v_tm (*localtime (&v_tt)); + + v = date (v_tm.tm_year + 1900, v_tm.tm_mon, v_tm.tm_mday); + } + + static void + set_image (int& i, bool& is_null, const date& v) + { + is_null = false; + + tm v_tm; + memset (&v_tm, 0, sizeof (v_tm)); + + v_tm.tm_mday = v.day (); + v_tm.tm_mon = v.month (); + v_tm.tm_year = v.year () - 1900; + + time_t v_tt (mktime (&v_tm)); + + i = details::endian_traits::hton ( + static_cast ((v_tt - pg_epoch_tt) / seconds_per_day)); + } + }; + } +} + +#endif // TRAITS_PGSQL_HXX diff --git a/mapping/traits.hxx b/mapping/traits.hxx index 1009265..1d2412b 100644 --- a/mapping/traits.hxx +++ b/mapping/traits.hxx @@ -11,6 +11,8 @@ # include "traits-mysql.hxx" #elif defined(DATABASE_SQLITE) # include "traits-sqlite.hxx" +#elif defined(DATABASE_PGSQL) +# include "traits-pgsql.hxx" #endif #endif // TRAITS_HXX diff --git a/qt/database.hxx b/qt/database.hxx index f4060d3..fe815e9 100644 --- a/qt/database.hxx +++ b/qt/database.hxx @@ -1,4 +1,4 @@ -// file : qt/database.hxx +// file : template/database.hxx // author : Boris Kolpackov // copyright : not copyrighted - public domain @@ -22,10 +22,12 @@ # include # include # include +#elif defined(DATABASE_PGSQL) +# include #endif inline std::auto_ptr -createDatabase (int& argc, char* argv[]) +create_database (int& argc, char* argv[]) { using namespace std; using namespace odb::core; @@ -39,6 +41,8 @@ createDatabase (int& argc, char* argv[]) odb::mysql::database::print_usage (cerr); #elif defined(DATABASE_SQLITE) odb::sqlite::database::print_usage (cerr); +#elif defined(DATABASE_PGSQL) + odb::pgsql::database::print_usage (cerr); #endif exit (0); @@ -58,6 +62,8 @@ createDatabase (int& argc, char* argv[]) schema_catalog::create_schema (*db); t.commit (); } +#elif defined(DATABASE_PGSQL) + auto_ptr db (new odb::pgsql::database (argc, argv)); #endif return db; diff --git a/query/database.hxx b/query/database.hxx index a8abef1..fe815e9 100644 --- a/query/database.hxx +++ b/query/database.hxx @@ -1,4 +1,4 @@ -// file : query/database.hxx +// file : template/database.hxx // author : Boris Kolpackov // copyright : not copyrighted - public domain @@ -22,6 +22,8 @@ # include # include # include +#elif defined(DATABASE_PGSQL) +# include #endif inline std::auto_ptr @@ -39,6 +41,8 @@ create_database (int& argc, char* argv[]) odb::mysql::database::print_usage (cerr); #elif defined(DATABASE_SQLITE) odb::sqlite::database::print_usage (cerr); +#elif defined(DATABASE_PGSQL) + odb::pgsql::database::print_usage (cerr); #endif exit (0); @@ -58,6 +62,8 @@ create_database (int& argc, char* argv[]) schema_catalog::create_schema (*db); t.commit (); } +#elif defined(DATABASE_PGSQL) + auto_ptr db (new odb::pgsql::database (argc, argv)); #endif return db; diff --git a/relationship/database.hxx b/relationship/database.hxx index 79d3a8c..fe815e9 100644 --- a/relationship/database.hxx +++ b/relationship/database.hxx @@ -1,4 +1,4 @@ -// file : relationship/database.hxx +// file : template/database.hxx // author : Boris Kolpackov // copyright : not copyrighted - public domain @@ -22,6 +22,8 @@ # include # include # include +#elif defined(DATABASE_PGSQL) +# include #endif inline std::auto_ptr @@ -39,6 +41,8 @@ create_database (int& argc, char* argv[]) odb::mysql::database::print_usage (cerr); #elif defined(DATABASE_SQLITE) odb::sqlite::database::print_usage (cerr); +#elif defined(DATABASE_PGSQL) + odb::pgsql::database::print_usage (cerr); #endif exit (0); @@ -58,6 +62,8 @@ create_database (int& argc, char* argv[]) schema_catalog::create_schema (*db); t.commit (); } +#elif defined(DATABASE_PGSQL) + auto_ptr db (new odb::pgsql::database (argc, argv)); #endif return db; diff --git a/schema/custom/database.hxx b/schema/custom/database.hxx index 932e6c4..82441b7 100644 --- a/schema/custom/database.hxx +++ b/schema/custom/database.hxx @@ -1,4 +1,4 @@ -// file : schema/custom/database.hxx +// file : template/database.hxx // author : Boris Kolpackov // copyright : not copyrighted - public domain @@ -20,6 +20,8 @@ # include #elif defined(DATABASE_SQLITE) # include +#elif defined(DATABASE_PGSQL) +# include #endif inline std::auto_ptr @@ -37,6 +39,8 @@ create_database (int& argc, char* argv[]) odb::mysql::database::print_usage (cerr); #elif defined(DATABASE_SQLITE) odb::sqlite::database::print_usage (cerr); +#elif defined(DATABASE_PGSQL) + odb::pgsql::database::print_usage (cerr); #endif exit (0); @@ -48,6 +52,16 @@ create_database (int& argc, char* argv[]) auto_ptr db ( new odb::sqlite::database ( argc, argv, false, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE)); + + // Create the database schema. + // + { + transaction t (db->begin ()); + schema_catalog::create_schema (*db); + t.commit (); + } +#elif defined(DATABASE_PGSQL) + auto_ptr db (new odb::pgsql::database (argc, argv)); #endif return db; diff --git a/schema/custom/driver.cxx b/schema/custom/driver.cxx index 3e49c72..d08bb62 100644 --- a/schema/custom/driver.cxx +++ b/schema/custom/driver.cxx @@ -26,6 +26,7 @@ main (int argc, char* argv[]) // Create the database schema. // +#if defined(DATABASE_MYSQL) || defined(DATABASE_SQLITE) { transaction t (db->begin ()); @@ -60,6 +61,47 @@ main (int argc, char* argv[]) t.commit (); } +#elif defined(DATABASE_PGSQL) + { + // PostgreSQL-specific SQL. + // + transaction t (db->begin ()); + + db->execute ("DROP TABLE IF EXISTS \"Employer\" CASCADE"); + db->execute ("DROP TABLE IF EXISTS \"Employee\" CASCADE"); + db->execute ("DROP TABLE IF EXISTS \"EmployeeDegree\" CASCADE"); + + db->execute ( + "CREATE TABLE \"Employer\" (" + "name VARCHAR (255) NOT NULL PRIMARY KEY)"); + + db->execute ( + "CREATE TABLE \"Employee\" (" + "ssn INTEGER NOT NULL PRIMARY KEY," + "first_name VARCHAR (255) NOT NULL," + "last_name VARCHAR (255) NOT NULL," + "employer VARCHAR (255) NOT NULL)"); + + db->execute ( + "CREATE TABLE \"EmployeeDegree\" (" + "ssn INTEGER NOT NULL," + "degree VARCHAR (255) NOT NULL)"); + + db->execute ( + "ALTER TABLE \"Employee\" " + "ADD FOREIGN KEY (employer) " + "REFERENCES \"Employer\" " + "INITIALLY DEFERRED"); + + db->execute ( + "ALTER TABLE \"EmployeeDegree\" " + "ADD FOREIGN KEY (ssn) " + "REFERENCES \"Employee\" " + "INITIALLY DEFERRED"); + + t.commit (); + } +#endif // Create a few persistent objects. // diff --git a/schema/embedded/database.hxx b/schema/embedded/database.hxx index ab733e2..82441b7 100644 --- a/schema/embedded/database.hxx +++ b/schema/embedded/database.hxx @@ -1,4 +1,4 @@ -// file : schema/embedded/database.hxx +// file : template/database.hxx // author : Boris Kolpackov // copyright : not copyrighted - public domain @@ -20,6 +20,8 @@ # include #elif defined(DATABASE_SQLITE) # include +#elif defined(DATABASE_PGSQL) +# include #endif inline std::auto_ptr @@ -37,6 +39,8 @@ create_database (int& argc, char* argv[]) odb::mysql::database::print_usage (cerr); #elif defined(DATABASE_SQLITE) odb::sqlite::database::print_usage (cerr); +#elif defined(DATABASE_PGSQL) + odb::pgsql::database::print_usage (cerr); #endif exit (0); @@ -56,6 +60,8 @@ create_database (int& argc, char* argv[]) schema_catalog::create_schema (*db); t.commit (); } +#elif defined(DATABASE_PGSQL) + auto_ptr db (new odb::pgsql::database (argc, argv)); #endif return db; diff --git a/template/database.hxx b/template/database.hxx index 231dfcc..fe815e9 100644 --- a/template/database.hxx +++ b/template/database.hxx @@ -22,6 +22,8 @@ # include # include # include +#elif defined(DATABASE_PGSQL) +# include #endif inline std::auto_ptr @@ -39,6 +41,8 @@ create_database (int& argc, char* argv[]) odb::mysql::database::print_usage (cerr); #elif defined(DATABASE_SQLITE) odb::sqlite::database::print_usage (cerr); +#elif defined(DATABASE_PGSQL) + odb::pgsql::database::print_usage (cerr); #endif exit (0); @@ -58,6 +62,8 @@ create_database (int& argc, char* argv[]) schema_catalog::create_schema (*db); t.commit (); } +#elif defined(DATABASE_PGSQL) + auto_ptr db (new odb::pgsql::database (argc, argv)); #endif return db; -- cgit v1.1