Add support for aggregates, composite types, partitions, and more

.pre-commit-config.yaml

@@ -42,6 +42,6 @@ repos:
     hooks:
       - id: black
   - repo: https://github.com/PyCQA/isort
-    rev: 5.10.1
+    rev: 5.13.2
     hooks:
       - id: isort

pyproject.toml

@@ -24,9 +24,14 @@ isort = "5.10.1"
 migra = "*"
 black = "22.3.0"
 toml = "*"
+pre-commit = "*"
 
 [tool.poetry.scripts]
 schemainspect = 'schemainspect:do_command'
 
 [tool.isort]
 profile = "black"
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"

schemainspect/command.py

@@ -30,11 +30,12 @@ def do_deps(db_url):
         deps = i.deps
 
     def process_row(dep):
-        depends_on = quoted_identifier(dep.name, dep.schema, dep.identity_arguments)
+        depends_on = quoted_identifier(dep.name, dep.schema, dep.identity_arguments, dep.result)
         thing = quoted_identifier(
             dep.name_dependent_on,
             dep.schema_dependent_on,
             dep.identity_arguments_dependent_on,
+            dep.result_dependent_on,
         )
 
         return dict(

schemainspect/inspected.py

@@ -6,6 +6,8 @@
 class Inspected(AutoRepr):
     @property
     def quoted_full_name(self):
+        if self.schema == "":
+            return quoted_identifier(self.name)
         return quoted_identifier(self.name, schema=self.schema)
 
     @property

schemainspect/misc.py

@@ -42,25 +42,25 @@ def __ne__(self, other):
         return not self == other
 
 
-def unquoted_identifier(identifier, *, schema=None, identity_arguments=None):
+def unquoted_identifier(identifier, *, schema=None, identity_arguments=None, return_type=None):
     if identifier is None and schema is not None:
         return schema
     s = "{}".format(identifier)
     if schema:
         s = "{}.{}".format(schema, s)
     if identity_arguments is not None:
-        s = "{}({})".format(s, identity_arguments)
+        s = "{}({}) RETURNS {}".format(s, identity_arguments, return_type)
     return s
 
 
-def quoted_identifier(identifier, schema=None, identity_arguments=None):
+def quoted_identifier(identifier, schema=None, identity_arguments=None, return_type=None):
     if identifier is None and schema is not None:
         return '"{}"'.format(schema.replace('"', '""'))
     s = '"{}"'.format(identifier.replace('"', '""'))
     if schema:
         s = '"{}".{}'.format(schema.replace('"', '""'), s)
     if identity_arguments is not None:
-        s = "{}({})".format(s, identity_arguments)
+        s = "{}({}) RETURNS {}".format(s, identity_arguments, return_type)
     return s