ProcruSQL 0.0.15__tar.gz → 0.0.16__tar.gz

{ProcruSQL-0.0.15 → procrusql-0.0.16}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.1
 Name: ProcruSQL
-Version: 0.0.15
+Version: 0.0.16
 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
 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
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent

{ProcruSQL-0.0.15 → procrusql-0.0.16}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = ProcruSQL
-version = 0.0.15
+version = 0.0.16
 author = Peter J. Holzer
 author_email = hjp@hjp.at
 description = Make a database fit its description
@@ -9,6 +9,7 @@ long_description_content_type = text/markdown
 url = https://git.hjp.at:3000/hjp/procrusql
 project_urls = 
 	Bug Tracker = https://git.hjp.at:3000/hjp/procrusql/issues
+	Repository = https://git.hjp.at:3000/hjp/procrusql
 classifiers = 
 	Programming Language :: Python :: 3
 	License :: OSI Approved :: MIT License

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

@@ -1,11 +1,12 @@
 Metadata-Version: 2.1
 Name: ProcruSQL
-Version: 0.0.15
+Version: 0.0.16
 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
 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
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent

{ProcruSQL-0.0.15 → procrusql-0.0.16}/src/procrusql/__init__.py

@@ -48,11 +48,12 @@ class Node:
         self.order = order
 
 class HaveData(Node):
-    def __init__(self, name, depends, table, key, extra):
+    def __init__(self, name, depends, table, key, extra, schema="public"):
         super().__init__(name, depends)
         self.table = table
         self.key = key
         self.extra = extra
+        self.schema = schema
 
     def check(self):
         log_check.info("Checking %s", self.name)
@@ -63,8 +64,9 @@ class HaveData(Node):
         ]
         key_check = sql.SQL(" and ").join(key_checks)
         q = sql.SQL(
-                "select * from {table} where {key_check}"
+                "select * from {schema}.{table} where {key_check}"
             ).format(
+                schema=sql.Identifier(self.schema),
                 table=sql.Identifier(self.table),
                 key_check=key_check
             )
@@ -78,8 +80,9 @@ class HaveData(Node):
                 if self.result[0][c] != self.extra[c]:
                     log_action.info("Updating %s: %s <- %s", key_values, c, self.extra[c])
                     q = sql.SQL(
-                        "update {table} set {column}={placeholder} where {key_check}"
+                        "update {schema}.{table} set {column}={placeholder} where {key_check}"
                     ).format(
+                        schema=sql.Identifier(self.schema),
                         table=sql.Identifier(self.table),
                         column=sql.Identifier(c),
                         placeholder=sql.Placeholder(),
@@ -96,8 +99,9 @@ class HaveData(Node):
             columns = list(self.key.keys()) + list(self.extra.keys())
             values = key_values + extra_values
             q = sql.SQL(
-                    "insert into {table}({columns}) values({placeholders}) returning *"
+                    "insert into {schema}.{table}({columns}) values({placeholders}) returning *"
                 ).format(
+                    schema=sql.Identifier(self.schema),
                     table=sql.Identifier(self.table),
                     columns=sql.SQL(", ").join([sql.Identifier(x) for x in columns]),
                     placeholders=sql.SQL(", ").join([sql.Placeholder() for x in columns]),

{ProcruSQL-0.0.15 → procrusql-0.0.16}/src/procrusql/parser.py

@@ -43,7 +43,7 @@ class ParseState:
         linesbefore = self.text[:position].split("\n")
         linesafter = self.text[position:].split("\n")
         good = "\x1B[40;32m"
-        bad = "\x1B[40;31m"
+        bad = "\x1B[40;31;1m"
         reset = "\x1B[0m"
         s = reset + message + "\n"
         lines = []
@@ -79,7 +79,8 @@ def parse_ruleset(ps):
         ps3 = parse_table_rule(ps2) or  \
               parse_column_rule(ps2) or \
               parse_data_rule(ps2) or   \
-              parse_index_rule(ps2)
+              parse_index_rule(ps2) or  \
+              parse_view_rule(ps2)
         if ps3:
             ps2.ast.append(ps3.ast)
             ps2.position = ps3.position
@@ -273,6 +274,20 @@ def parse_index_rule(ps):
 
     return ps2
 
+def parse_view_rule(ps):
+    ps2 = ps.clone()
+    ps2.skip_whitespace_and_comments()
+    if not ps2.match(r"view\b"):
+        ps.record_child_failure(ps2, "expected “view”")
+        return
+    ps2.skip_whitespace_and_comments()
+    ps3 = parse_table_name(ps2)
+    if not ps3:
+        ps.record_child_failure(ps2, "expected view name")
+        return
+    ps2.skip_whitespace_and_comments()
+    ps3 = parse_multiline_string(ps2)
+
 
 
 def parse_table_name(ps):
@@ -340,6 +355,7 @@ def parse_column_definition(ps):
             "json", "jsonb",
             "uuid",
             r"integer\[\]", r"int\[\]", r"bigint\[\]",
+            "bytea",
         ),
         key=lambda x: -len(x) # longest match first
     )