Added pg_proc table to the catalog. Contains the definition of functions.

Also improved the loading code for some catalog tables.

pglablib/PgClassContainer.cpp

@@ -22,10 +22,8 @@ PgClass PgClassContainer::loadElem(const Pgsql::Row &row)
 	col >> v.oid >> v.name >> v.relnamespace >> v.type >> v.oftype
 		>> v.owner >> v.am >> v.filenode >> v.tablespace >> v.pages_est
 		>> v.tuples_est >> v.toastrelid >> v.isshared >> v.persistence
-		>> v.kind >> v.hasoids >> v.ispopulated >> v.frozenxid >> v.minmxid;
+		>> v.kind >> v.hasoids >> v.ispopulated >> v.frozenxid >> v.minmxid
-
+		>> v.acl >> v.options;
-	col.getAsArray<QString>(std::back_inserter(v.acl), QString());
-	col.getAsArray<QString>(std::back_inserter(v.options), QString());
 
 	auto cat = m_catalogue.lock();
 	auto ns = cat->namespaces()->getByKey(v.relnamespace);

pglablib/PgConstraintContainer.cpp

@@ -41,14 +41,9 @@ PgConstraint PgConstraintContainer::loadElem(const Pgsql::Row &row)
 	col >> v.oid >> v.name >> v.connamespace >> v.type >> v.deferrable
 		>> v.deferred >> v.validated >> v.relid >> v.typid >> v.indid
 		>> v.frelid >> v.fupdtype >> v.fdeltype >> v.fmatchtype
-		>> v.islocal >> v.inhcount >> v.noinherit;
+		>> v.islocal >> v.inhcount >> v.noinherit
-	col.getAsArray<int16_t>(std::back_inserter(v.key), NullHandling::Ignore);
+		>> v.key >> v.fkey >> v.pfeqop >> v.ppeqop >> v.ffeqop >> v.exclop
-	col.getAsArray<int16_t>(std::back_inserter(v.fkey), NullHandling::Ignore);
+		>> v.bin >> v.src >> v.definition;
-	col.getAsArray<Oid>(std::back_inserter(v.pfeqop), NullHandling::Ignore);
-	col.getAsArray<Oid>(std::back_inserter(v.ppeqop), NullHandling::Ignore);
-	col.getAsArray<Oid>(std::back_inserter(v.ffeqop), NullHandling::Ignore);
-	col.getAsArray<Oid>(std::back_inserter(v.exclop), NullHandling::Ignore);
-	col >> v.bin >> v.src >> v.definition;
 	return v;
 }
 

pglablib/PgDatabaseCatalog.cpp

@@ -12,6 +12,7 @@
 #include "PgTablespaceContainer.h"
 #include "PgTriggerContainer.h"
 #include "PgTypeContainer.h"
+#include "PgProcContainer.h"
 #include "Pgsql_Connection.h"
 #include "Pgsql_oids.h"
 
@@ -174,6 +175,9 @@ void PgDatabaseCatalog::loadAll(Pgsql::Connection &conn,
 	if (progress_callback && !progress_callback(++n, count))
 		return;
 	load2(m_types, conn);
+	if (progress_callback && !progress_callback(++n, count))
+		return;
+	load2(m_procs, conn);
 	progress_callback && progress_callback(++n, count);
 
 	refreshed(this, All);
@@ -280,3 +284,7 @@ std::shared_ptr<const PgTypeContainer> PgDatabaseCatalog::types() const
 	return m_types;
 }
 
+std::shared_ptr<const PgProcContainer> PgDatabaseCatalog::procs() const
+{
+	return m_procs;
+}

pglablib/PgDatabaseCatalog.h

@@ -26,6 +26,7 @@ class PgAmContainer;
 class PgTablespaceContainer;
 class PgTriggerContainer;
 class PgTypeContainer;
+class PgProcContainer;
 
 class PgDatabaseCatalog: public QObject, public std::enable_shared_from_this<PgDatabaseCatalog> {
 	Q_OBJECT
@@ -55,6 +56,7 @@ public:
 	std::shared_ptr<const PgTablespaceContainer> tablespaces() const;
 	std::shared_ptr<const PgTriggerContainer> triggers() const;
 	std::shared_ptr<const PgTypeContainer> types() const;
+	std::shared_ptr<const PgProcContainer> procs() const;
 
 	enum RefreshFlag {
 		Attributes = 1,
@@ -68,6 +70,7 @@ public:
 		Tablespaces = (1 << 8),
 		Triggers = (1 << 9),
 		Types = (1 << 10),
+		Proc = (1 << 11),
 		All = 0xffffffff
 	};
 	using RefreshFlags = int;
@@ -90,6 +93,7 @@ private:
 	std::shared_ptr<PgTablespaceContainer> m_tablespaces;
 	std::shared_ptr<PgTriggerContainer> m_triggers;
 	std::shared_ptr<PgTypeContainer> m_types;
+	std::shared_ptr<PgProcContainer> m_procs;
 
 	template <typename T>
 	void load2(std::shared_ptr<T> &ptr, Pgsql::Connection &conn)

pglablib/PgProc.cpp

@@ -0,0 +1,2 @@
+#include "PgProc.h"
+

pglablib/PgProc.h

@@ -0,0 +1,48 @@
+#ifndef PGPROC_H
+#define PGPROC_H
+
+#include <QString>
+#include <libpq-fe.h>
+#include "Pgsql_Value.h"
+
+class PgProc {
+public:
+	Oid oid = InvalidOid; // oid
+	QString proname; // name
+	Oid pronamespace = InvalidOid; // oid
+	Oid proowner = InvalidOid; // oid
+	Oid prolang = InvalidOid; // oid
+	float procost = 0.f; // float4
+	float prorows = 0.f; // float4
+	Oid provariadic = InvalidOid; // oid
+	QString protransform; // regproc
+	bool proisagg = false; // bool
+	bool proiswindow = false; // bool
+	bool prosecdef = false; // bool
+	bool proleakproof = false; // bool
+	bool proisstrict = false; // bool
+	bool proretset = false; // bool
+	char provolatile = '\0'; // char
+	char proparallel = '\0'; // char, version >= 9.6
+	int16_t pronargs = 0; // int2
+	int16_t pronargdefaults = 0; // int2
+	Oid prorettype = InvalidOid; // oid
+	std::vector<Oid> proargtypes; // oid[]
+	std::vector<Oid> proallargtypes; // oid[]
+	std::vector<char> proargmodes; // char[]
+	std::vector<QString> proargnames; // text[]
+	std::optional<QString> proargdefaults; // pg_node_tree
+	std::vector<Oid> protrftypes; // oid[], version >= 9.5
+	QString prosrc; // text
+	QString probin; // text
+	std::vector<QString> proconfig; // text[]
+	std::vector<QString> proacl; // aclitem[]
+
+	bool operator==(Oid _oid) const { return oid == _oid; }
+	bool operator==(const QString &n) const { return proname == n; }
+	bool operator<(Oid _oid) const { return oid < _oid; }
+	bool operator<(const PgProc &rhs) const { return oid < rhs.oid; }
+
+};
+
+#endif // PGPROC_H

pglablib/PgProcContainer.cpp

@@ -0,0 +1,52 @@
+#include "PgProcContainer.h"
+#include "Pgsql_Connection.h"
+#include "Pgsql_Col.h"
+#include "PgDatabaseCatalog.h"
+#include <algorithm>
+#include <iterator>
+
+std::string PgProcContainer::getLoadQuery() const
+{
+	std::string column_list =
+		"oid,proname,pronamespace,proowner,prolang,procost,prorows,"
+		"provariadic,protransform,proisagg,proiswindow,prosecdef,proleakproof,"
+		"proisstrict,proretset,provolatile,pronargs,pronargdefaults,prorettype,"
+		"proargtypes,proallargtypes,proargmodes,proargnames,proargdefaults,"
+		"prosrc,probin,proconfig,proacl";
+	auto cat = m_catalogue.lock();
+	int ver = cat->serverVersion();
+	if (ver >= 90500) {
+		column_list += ",protrftypes";
+	}
+	else if (cat->serverVersion() >= 90600) {
+		column_list += ",proparallel";
+	}
+
+	return "SELECT " +	column_list + " FROM pg_proc";
+}
+
+PgProc PgProcContainer::loadElem(const Pgsql::Row &row)
+{
+	Pgsql::Col col(row);
+	PgProc v;
+	col >> v.oid >> v.proname >> v.pronamespace >> v.proowner >> v.prolang >> v.procost >> v.prorows
+			>> v.provariadic >> v.protransform >> v.proisagg >> v.proiswindow >> v.prosecdef >> v.proleakproof
+			>> v.proisstrict >> v.proretset >> v.provolatile >> v.pronargs >> v.pronargdefaults
+			>> v.prorettype;
+	col.getAsVector<Oid>(std::back_inserter(v.proargtypes));
+	col >> v.proallargtypes >> v.proargmodes >> v.proargnames
+			>> v.proargdefaults;
+	col >> v.prosrc;
+	col >> v.probin >> v.proconfig >> v.proacl;
+
+	auto cat = m_catalogue.lock();
+	int ver = cat->serverVersion();
+	if (ver >= 90500) {
+		col >> v.protrftypes;
+	}
+	else if (cat->serverVersion() >= 90600) {
+		col >> v.proparallel;
+	}
+
+	return v;
+}

pglablib/PgProcContainer.h

@@ -0,0 +1,26 @@
+#ifndef PGPROCCONTAINER_H
+#define PGPROCCONTAINER_H
+
+#include "PgContainer.h"
+#include "PgProc.h"
+#include <vector>
+
+namespace Pgsql {
+
+	class Result;
+
+}
+
+class PgProcContainer: public PgContainer<PgProc> {
+public:
+	using PgContainer<PgProc>::PgContainer;
+
+	virtual std::string getLoadQuery() const override;
+
+	//std::vector<PgProc> getTriggersForRelation(Oid cls) const;
+protected:
+	PgProc loadElem(const Pgsql::Row &row) override;
+private:
+};
+
+#endif // PGPROCCONTAINER_H

pglablib/PgTablespaceContainer.cpp

@@ -18,8 +18,6 @@ PgTablespace PgTablespaceContainer::loadElem(const Pgsql::Row &row)
 {
 	Pgsql::Col col(row);
 	PgTablespace v;
-	col >> v.oid >> v.name >> v.owner;
+	col >> v.oid >> v.name >> v.owner >> v.acl >> v.options;
-	col.getAsArray<QString>(std::back_inserter(v.acl), Pgsql::NullHandling::Ignore);
-	col.getAsArray<QString>(std::back_inserter(v.options), Pgsql::NullHandling::Ignore);
 	return v;
 }

pglablib/pglablib.pro

@@ -65,7 +65,9 @@ codebuilder/StructureTemplate.cpp \
     codebuilder/StringLiteralRules.cpp \
     codebuilder/StringEscapeRule.cpp \
     PgTrigger.cpp \
-    PgTriggerContainer.cpp
+    PgTriggerContainer.cpp \
+    PgProc.cpp \
+    PgProcContainer.cpp
 
 HEADERS += \
         Pglablib.h \
@@ -113,7 +115,9 @@ codebuilder/StructureTemplate.h \
     codebuilder/StringEscapeRule.h \
     codebuilder/StringLiteralRules.h \
     PgTrigger.h \
-    PgTriggerContainer.h
+    PgTriggerContainer.h \
+    PgProc.h \
+    PgProcContainer.h
 
 unix {
     target.path = /usr/lib