ProcruSQL 0.0.16__tar.gz → 0.0.18__tar.gz

{procrusql-0.0.16 → procrusql-0.0.18}/PKG-INFO

@@ -1,10 +1,11 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: ProcruSQL
-Version: 0.0.16
+Version: 0.0.18
 Summary: Make a database fit its description
 Home-page: https://git.hjp.at:3000/hjp/procrusql
 Author: Peter J. Holzer
 Author-email: hjp@hjp.at
+License: MIT
 Project-URL: Bug Tracker, https://git.hjp.at:3000/hjp/procrusql/issues
 Project-URL: Repository, https://git.hjp.at:3000/hjp/procrusql
 Classifier: Programming Language :: Python :: 3
@@ -13,6 +14,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: license-file
 
 ProcruSQL
 =========

{procrusql-0.0.16 → procrusql-0.0.18}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = ProcruSQL
-version = 0.0.16
+version = 0.0.18
 author = Peter J. Holzer
 author_email = hjp@hjp.at
 description = Make a database fit its description
@@ -14,6 +14,8 @@ classifiers =
 	Programming Language :: Python :: 3
 	License :: OSI Approved :: MIT License
 	Operating System :: OS Independent
+license = MIT
+license_files = LICENSE
 
 [options]
 package_dir = 

{procrusql-0.0.16 → procrusql-0.0.18}/src/ProcruSQL.egg-info/PKG-INFO

@@ -1,10 +1,11 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: ProcruSQL
-Version: 0.0.16
+Version: 0.0.18
 Summary: Make a database fit its description
 Home-page: https://git.hjp.at:3000/hjp/procrusql
 Author: Peter J. Holzer
 Author-email: hjp@hjp.at
+License: MIT
 Project-URL: Bug Tracker, https://git.hjp.at:3000/hjp/procrusql/issues
 Project-URL: Repository, https://git.hjp.at:3000/hjp/procrusql
 Classifier: Programming Language :: Python :: 3
@@ -13,6 +14,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: license-file
 
 ProcruSQL
 =========

{procrusql-0.0.16 → procrusql-0.0.18}/src/procrusql/__init__.py

@@ -296,6 +296,33 @@ class HaveIndex(Node):
         self.ok = True
         log_state.info("%s is now ok", self.name)
 
+class HaveExtension(Node):
+    def __init__(self, name, depends, extension):
+        super().__init__(name, depends)
+        self.extension = extension
+
+    def check(self):
+        log_check.info("Checking %s", self.name)
+        csr = db.cursor(cursor_factory=extras.DictCursor)
+        csr.execute("select * from pg_extension where extname = %s", (self.extension,))
+        r = csr.fetchall()
+        if len(r) == 1:
+            # extension exists, all ok
+            self.set_order()
+            self.ok = True
+            log_state.info("%s is now ok", self.name)
+            return
+        if len(r) > 1:
+            raise RuntimeError(f"Found {len(r)} extensions with name {self.extension}")
+
+        # Create it
+        log_action.info(f"Creating extension {self.extension}")
+        q = sql.SQL("create extension {extension}".format(extension=self.extension))
+        csr.execute(q)
+        self.set_order()
+        self.ok = True
+        log_state.info("%s is now ok", self.name)
+
 
 def findnode(name):
     for w in want:

{procrusql-0.0.16 → procrusql-0.0.18}/src/procrusql/parser.py

@@ -80,7 +80,8 @@ def parse_ruleset(ps):
               parse_column_rule(ps2) or \
               parse_data_rule(ps2) or   \
               parse_index_rule(ps2) or  \
-              parse_view_rule(ps2)
+              parse_view_rule(ps2) or   \
+              parse_extension_rule(ps2)
         if ps3:
             ps2.ast.append(ps3.ast)
             ps2.position = ps3.position
@@ -288,6 +289,22 @@ def parse_view_rule(ps):
     ps2.skip_whitespace_and_comments()
     ps3 = parse_multiline_string(ps2)
 
+def parse_extension_rule(ps):
+    ps2 = ps.clone()
+    ps2.skip_whitespace_and_comments()
+    if not ps2.match(r"extension\b"):
+        ps.record_child_failure(ps2, "expected “extension”")
+        return
+    ps2.skip_whitespace_and_comments()
+    ps3 = parse_extension_name(ps2)
+    if not ps3:
+        ps.record_child_failure(ps2, "expected extension name")
+        return
+    ps2.skip_whitespace_and_comments()
+
+    ps2.ast = procrusql.HaveExtension(rulename(), [], ps3.ast[0])
+    ps2.position = ps3.position
+    return ps2
 
 
 def parse_table_name(ps):
@@ -339,6 +356,21 @@ def parse_index_name(ps):
         ps.record_child_failure(ps2, "expected index name")
         return
 
+def parse_extension_name(ps):
+    # this is an exact duplicate of parse_table_name and parse_column_name, but they will
+    # probably diverge, so I duplicated it. I probably should define a
+    # parse_identifier and redefine them in terms of it.
+    ps2 = ps.clone()
+    ps2.ast = []
+    ps2.skip_whitespace_and_comments()
+    if ps2.rest[0].isalpha():
+        m = ps2.match(r"\w+") # always succeeds since we already checked the first character
+        ps2.ast.append(m.group(0))
+        return ps2
+    else:
+        ps.record_child_failure(ps2, "expected extension name")
+        return
+
 def parse_column_definition(ps):
     ps2 = ps.clone()
     ps2.ast = []
@@ -348,6 +380,7 @@ def parse_column_definition(ps):
             "integer", "int", "serial", "bigint",
             "boolean",
             "text", "character varying",
+            "citext",
             "date", "timestamp with time zone", "timestamptz",
             "time",
             "inet",
@@ -355,11 +388,17 @@ def parse_column_definition(ps):
             "json", "jsonb",
             "uuid",
             r"integer\[\]", r"int\[\]", r"bigint\[\]",
+            r"text\[\]",
+            r"citext\[\]",
             "bytea",
         ),
         key=lambda x: -len(x) # longest match first
     )
-    pattern = "(" + "|".join(sqltypes) + ")" + r"([ \t]+(default .*|not null\b|primary key\b|unique\b|references \w+\b))*"
+    pattern = "(" + "|".join(sqltypes) + ")" + r"([ \t]+(default .*|not null\b|primary key\b|unique\b|references \w+\b( on delete cascade)?))*"
+    # XXX - I think we should separate constraints from columns
+    # Either completely (separate declarations in the source), or by producing
+    # two rules (HaveColumn, HaveForeignKey) from one declaration (if that is
+    # possible).
     m = ps2.match(pattern)
     if not m:
         ps.record_child_failure(ps2, "expected column definition")