? Doxyfile ? aclocal.m4 ? autom4te.cache ? config.guess ? config.h ? config.log ? config.status ? config.sub ? configure ? default_connection.patch ? glom.kdevelop ? intltool-extract ? intltool-extract.in ? intltool-merge ? intltool-merge.in ? intltool-update ? intltool-update.in ? libtool ? ltmain.sh ? mkinstalldirs ? stamp-h1 ? temp.patch ? docs/Makefile ? docs/Makefile.in ? docs/user-guide/Makefile ? docs/user-guide/Makefile.in ? docs/user-guide/C/Makefile ? docs/user-guide/C/Makefile.in ? docs/user-guide/C/glom-C.omf.out ? docs/user-guide/C/omf_timestamp ? docs/user-guide/C/figures/Makefile ? docs/user-guide/C/figures/Makefile.in ? examples/Makefile ? examples/Makefile.in ? glom/glom ? glom/test_pyembed ? glom/data_structure/Makefile ? glom/data_structure/Makefile.in ? glom/data_structure/layout/Makefile ? glom/data_structure/layout/Makefile.in ? glom/document/Makefile ? glom/document/Makefile.in ? glom/mode_data/Makefile ? glom/mode_data/Makefile.in ? glom/mode_design/Makefile ? glom/mode_design/Makefile.in ? glom/mode_design/fields/Makefile ? glom/mode_design/fields/Makefile.in ? glom/mode_find/Makefile ? glom/mode_find/Makefile.in ? glom/navigation/Makefile ? glom/navigation/Makefile.in ? glom/utility_widgets/Makefile ? glom/utility_widgets/Makefile.in ? glom/utility_widgets/test ? glom/utility_widgets/adddel/Makefile ? glom/utility_widgets/adddel/Makefile.in ? glom/utility_widgets/adddel/eggcolumnchooser/Makefile ? glom/utility_widgets/adddel/eggcolumnchooser/Makefile.in ? macros/Makefile ? macros/Makefile.in Index: ChangeLog =================================================================== RCS file: /cvs/gnome/glom/ChangeLog,v retrieving revision 1.109 diff -u -p -r1.109 ChangeLog --- ChangeLog 5 Jan 2005 10:14:30 -0000 1.109 +++ ChangeLog 10 Feb 2005 12:22:44 -0000 @@ -1,3 +1,11 @@ +2005-02-10 Murray Cumming + + * glom/connection_pool.cc: connect(): Specify the template1 default + database when we do not want to specify a database, because that seems + to fail with newer versions of postgres, or on some systems, though + I am not sure where it works and where it does not. Hopefully this + template1 name is used on all distros. + 2005-01-05 Murray Cumming * Makefile.am: Add intltool-extract.in, intltool-merge.in, Index: glom/connectionpool.cc =================================================================== RCS file: /cvs/gnome/glom/glom/connectionpool.cc,v retrieving revision 1.8 diff -u -p -r1.8 connectionpool.cc --- glom/connectionpool.cc 5 Jan 2005 10:14:30 -0000 1.8 +++ glom/connectionpool.cc 10 Feb 2005 12:22:45 -0000 @@ -146,6 +146,9 @@ sharedptr ConnectionPo m_GdaClient = Gnome::Gda::Client::create(); + //We must specify _some_ database even when we just want to create a database. + //This _might_ be different on some systems. I hope not. murrayc + const Glib::ustring default_database = "template1"; if(m_GdaClient) { //m_GdaDataSourceInfo = Gnome::Gda::DataSourceInfo(); //init_db_details it. @@ -155,6 +158,8 @@ sharedptr ConnectionPo if(!m_database.empty()) cnc_string += (";DATABASE=" + m_database); + else + cnc_string += default_database; std::cout << "connecting: cnc string: " << cnc_string << std::endl; @@ -188,7 +193,9 @@ sharedptr ConnectionPo //If the connection failed while looking for a database, //then try connecting without the database: - Glib::ustring cnc_string = "USER=" + m_user + ";PASSWORD=" + m_password; //TODO: Host + Glib::ustring cnc_string = "USER=" + m_user + ";PASSWORD=" + m_password; + cnc_string += (";DATABASE=" + default_database); + //TODO: Host std::cout << "connecting: cnc string: " << cnc_string << std::endl;