Use catalog instead of catalogue consistently

This commit is contained in:
eelke 2018-11-25 09:05:01 +01:00
parent 52011a9842
commit 7db859737a
10 changed files with 24 additions and 24 deletions

View file

@ -13,7 +13,7 @@ SELECT oid, conname, connamespace, contype, condeferrable,
pg_get_constraintdef(oid)
FROM pg_constraint)__";
// auto cat = m_catalogue.lock();
// auto cat = m_catalog.lock();
// if (cat && cat->serverVersion() >= 90400)
// q += ", indisreplident ";
// q += "\nFROM pg_index";

View file

@ -124,7 +124,7 @@ public:
using t_Container = std::vector<t_Elem>; ///< Do not assume it will stay a vector only expect bidirectional access
explicit PgSPtrContainer(std::weak_ptr<PgDatabaseCatalog> cat)
: m_catalogue(cat)
: m_catalog(cat)
{}
@ -188,7 +188,7 @@ public:
std::sort(m_container.begin(), m_container.end());
}
protected:
std::weak_ptr<PgDatabaseCatalog> m_catalogue;
std::weak_ptr<PgDatabaseCatalog> m_catalog;
t_Container m_container;
/** Override the implementation for this function to implement loading of single row.

View file

@ -13,7 +13,7 @@ namespace Pgsql {
class PgDatabaseContainer: public PgContainer<PgDatabase> {
public:
//explicit PgDatabaseContainer(PgDatabaseCatalogue *cat);
//explicit PgDatabaseContainer(PgDatabaseCatalog *cat);
using PgContainer<PgDatabase>::PgContainer;
virtual std::string getLoadQuery() const override;