Changeset 829

Timestamp:

11/17/08 05:48:11 (7 weeks ago)

Author:

xi

Message:

Added the hide() macro.

Location:

trunk

Files:

• htsql/binders.py (modified) (3 diffs)
• htsql/bindings.py (modified) (3 diffs)
• htsql/codes.py (modified) (1 diff)
• htsql/functions.py (modified) (1 diff)
• htsql_contrib/migrate_command.py (modified) (1 diff)
• test/expect.yaml (modified) (6 diffs)
• test/regress/selection.yaml (modified) (1 diff)

trunk/htsql/binders.py

@@ -217 +217 @@
             title = binding.entitle()
             modifier = binding.modifier
+            if modifier.is_hidden:
+                title = None
             if isinstance(code.domain, domains.Tuple):
                 code = functions.Id.wrap(binding, binding.mark).encode()
@@ -338 +340 @@
         for binding in subbindings:
             title = None
-            order = None
-            is_projection = False
+            order = binding.modifier.order
+            is_projection = binding.modifier.is_projection
             if is_composite:
                 title = descriptions.CompositeTitle(
@@ -369 +371 @@
             if title is not None or order is not None or is_projection:
                 is_projection |= binding.modifier.is_projection
-                modifier = bindings.Modifier(order, is_projection)
+                modifier = bindings.Modifier(order, is_projection,
+                                             binding.modifier.is_hidden)
                 yield bindings.Proxy(binding, title=title, modifier=modifier)
             else:

trunk/htsql/bindings.py

@@ -57 +57 @@
 class Modifier(object):
 
-    def __init__(self, order=None, is_projection=False):
+    def __init__(self, order=None, is_projection=False, is_hidden=False):
         assert order is None or order in [+1, -1]
         assert isinstance(is_projection, bool)
+        assert isinstance(is_hidden, bool)
         self.order = order
         self.is_projection = is_projection
+        self.is_hidden = is_hidden
+
+    def clone(self, order=None, is_projection=None, is_hidden=None):
+        if order is None:
+            order = self.order
+        if is_projection is None:
+            is_projection = self.is_projection
+        if is_hidden is None:
+            is_hidden = self.is_hidden
+        return Modifier(order, is_projection, is_hidden)
 
 
@@ -267 +278 @@
         assert field.parent.table is reference.table
         if code is None and field.is_column:
-            code = codes.Column(field.column, reference, mark)
+            optimized_column, optimized_reference = self.optimize(
+                                    parent.top, field.column, reference)
+            code = codes.Column(optimized_column, optimized_reference, mark)
         if title is None:
             title = str(field.identifier())
@@ -273 +286 @@
         self.field = field
         self.reference = reference
+
+    def optimize(self, top, column, reference):
+        is_optimized = True
+        while is_optimized:
+            is_optimized = False
+            if reference.join is not None and reference.join.is_direct  \
+            and (reference not in top.sieves or
+                                    not top.sieves[reference].filters):
+                for src, dst in reference.join.pairs:
+                    if dst is column:
+                        reference = reference.parent
+                        column = src
+                        is_optimized = True
+                        break
+        return column, reference
 
     def lookup(self, identifier):

trunk/htsql/codes.py

@@ -163 +163 @@
         assert column.parent is reference.table
         super(Column, self).__init__(column.domain, mark)
-        #column, reference = self.optimize(column, reference)
         self.column = column
         self.reference = reference
-
-    def optimize(self, column, reference):
-        """ optimize fk column instances to prune joins (unused)
-
-        This mechanism replaces references in a table with corresponding 
-        columns in the current table.  For example, it converts a link
-        like ``person.organization.org_id`` to ``person.org_id``.
-        """
-        is_optimized = True
-        while is_optimized:
-            is_optimized = False
-            if reference.join is not None and reference.join.is_direct:
-                for src, dst in reference.join.pairs:
-                    if dst is column:
-                        reference = reference.parent
-                        column = src
-                        is_optimized = True
-                        break
-        return column, reference
 
     def get_references(self):

trunk/htsql/functions.py

@@ -2815 +2815 @@
 
 
+class Hide(Function):
+
+    name = 'hide'
+    declaration = [
+            ('unit', REQUIRED),
+    ]
+
+    @classmethod
+    def wrap(cls, parent, unit, mark, title=None, modifier=None):
+        if modifier is None:
+            modifier = bindings.Modifier()
+        modifier = modifier.clone(is_hidden=True)
+        return bindings.Proxy(unit, title=title, modifier=modifier)
+
+

trunk/htsql_contrib/migrate_command.py

@@ -26 +26 @@
         self.elements = base_elements
         self.self_references = self_references
+
+    def get_references(self):
+        references = super(DescendantSegment, self).get_references()
+        for reference in self.parent_references+self.self_references:
+            while reference is not None:
+                references.add(reference)
+                reference = reference.parent
+        return references
 
 

trunk/test/expect.yaml

@@ -1827 +1827 @@
           \                                 |\n | smith.maggy   | [smak, smbl, smen]\
           \                                   |\n\n  -----\n  /person{id(),array(project)}/\n\
+          \  (10 rows)\n"
+      - uri: /person{organization{name+},full_name+}
+        status: 200 OK
+        headers:
+        - [Content-Type, text/plain; charset=UTF-8]
+        body: " | person                                     |\n-+--------------------------------------------+-\n\
+          \ | organization{name}      | full_name        |\n-+-------------------------+------------------+-\n\
+          \ | Acorn Architecture      | WATANABE Hideo   |\n | Lake Shore Apartments\
+          \   | Tommy O'Mally    |\n | Lake Side Partners, LLC | Amy S. Buckworth\
+          \ |\n | Lake Side Partners, LLC | David Jones      |\n | Meyers Construction\
+          \     | Jack C. Meyers   |\n | Meyers Construction     | Jim Meyers    \
+          \   |\n | Meyers Construction     | Mark Thomas Hill |\n | Rudgen, Taupe,\
+          \ & Smith  | Jack Taupe       |\n | Rudgen, Taupe, & Smith  | José N. Marteñes\
+          \ |\n | Rudgen, Taupe, & Smith  | Margret N. Smith |\n\n  -----\n  /person{organization{name+},full_name+}/\n\
+          \  (10 rows)\n"
+      - uri: /organization{*,hide(is_active)-}
+        status: 200 OK
+        headers:
+        - [Content-Type, text/plain; charset=UTF-8]
+        body: " | organization                                                   \
+          \ |\n-+-----------------------------------------------------------------+-\n\
+          \ | org_id      | name                    | is_active | division_of |\n\
+          -+-------------+-------------------------+-----------+-------------+-\n\
+          \ | lakeside    | Lake Side Partners, LLC |           |             |\n\
+          \ | acorn       | Acorn Architecture      | true      |             |\n\
+          \ | lake-carmen | Lake Carmen Towers      | true      | lakeside    |\n\
+          \ | meyers      | Meyers Construction     | true      |             |\n\
+          \ | meyers_elec | Meyers Electric         | true      | meyers      |\n\
+          \ | lake-apts   | Lake Shore Apartments   | false     | lakeside    |\n\
+          \ | smith       | Rudgen, Taupe, & Smith  | false     |             |\n\n\
+          \  -----\n  /organization{*,hide(is_active)-}/\n  (7 rows)\n"
+      - uri: /organization{*,hide(is_active)-}/person{id()}
+        status: 200 OK
+        headers:
+        - [Content-Type, text/plain; charset=UTF-8]
+        body: " | organization                                                   \
+          \ | person        |\n-+-----------------------------------------------------------------+---------------+-\n\
+          \ | org_id      | name                    | is_active | division_of | id()\
+          \          |\n-+-------------+-------------------------+-----------+-------------+---------------+-\n\
+          \ | lakeside    | Lake Side Partners, LLC |           |             | lakeside.amy\
+          \  |\n |                                                               \
+          \  | lakeside.dave |\n | acorn       | Acorn Architecture      | true  \
+          \    |             | acorn.hideo   |\n | lake-carmen | Lake Carmen Towers\
+          \      | true      | lakeside    |               |\n | meyers      | Meyers\
+          \ Construction     | true      |             | meyers.hill   |\n |     \
+          \                                                            | meyers.jack\
+          \   |\n |                                                              \
+          \   | meyers.jim    |\n | meyers_elec | Meyers Electric         | true \
+          \     | meyers      |               |\n | lake-apts   | Lake Shore Apartments\
+          \   | false     | lakeside    | lake-apts.tom |\n | smith       | Rudgen,\
+          \ Taupe, & Smith  | false     |             | smith.jack    |\n |      \
+          \                                                           | smith.jose\
+          \    |\n |                                                             \
+          \    | smith.maggy   |\n\n  -----\n  /organization{*,hide(is_active)-}/person{id()}/\n\
+          \  (7 rows)\n"
+      - uri: /person{organization{hide(name)+},hide(full_name)+,*}
+        status: 200 OK
+        headers:
+        - [Content-Type, text/plain; charset=UTF-8]
+        body: " | person                                                         \
+          \      |\n-+----------------------------------------------------------------------+-\n\
+          \ | org_id    | nickname | full_name        | email                    \
+          \  |\n-+-----------+----------+------------------+----------------------------+-\n\
+          \ | acorn     | hideo    | WATANABE Hideo   | hideo.watanabe@example.com\
+          \ |\n | lake-apts | tom      | Tommy O'Mally    |                      \
+          \      |\n | lakeside  | amy      | Amy S. Buckworth |                 \
+          \           |\n | lakeside  | dave     | David Jones      | david.joines@example.com\
+          \   |\n | meyers    | jack     | Jack C. Meyers   | jack.meyers@example.com\
+          \    |\n | meyers    | jim      | Jim Meyers       | jim.meyers@example.com\
+          \     |\n | meyers    | hill     | Mark Thomas Hill | mark.hill@example.com\
+          \      |\n | smith     | jack     | Jack Taupe       | jack.taupe@example.com\
+          \     |\n | smith     | jose     | José N. Marteñes | jose.martenes@example.com\
+          \  |\n | smith     | maggy    | Margret N. Smith | \"\"                \
+          \         |\n\n  -----\n  /person{organization{hide(name)+},hide(full_name)+,*}/\n\
           \  (10 rows)\n"
     - id: comparison-tests
@@ -13382 +13456 @@
           SET SESSION AUTHORIZATION "htsql_regress.user";
           SET ROLE "htsql_regress.admin";
-          $KEYS(string, string) <- UPDATE "op"."person" AS "_person_1" SET ("email") = (E'mary.elliott@example.com') FROM "op"."person" AS "_person_2" LEFT OUTER JOIN "op"."organization" AS "_organization_1" ON ("_person_2"."org_id" = "_organization_1"."org_id") WHERE ((("_person_1"."org_id", "_person_1"."nickname") = ("_person_2"."org_id", "_person_2"."nickname")) AND (("_organization_1"."org_id" = E'meyers') AND ("_person_2"."nickname" = E'mary'))) RETURNING "_person_1"."org_id", "_person_1"."nickname";
+          $KEYS(string, string) <- UPDATE "op"."person" AS "_person_1" SET ("email") = (E'mary.elliott@example.com') FROM "op"."person" AS "_person_2" WHERE ((("_person_1"."org_id", "_person_1"."nickname") = ("_person_2"."org_id", "_person_2"."nickname")) AND (("_person_2"."org_id" = E'meyers') AND ("_person_2"."nickname" = E'mary'))) RETURNING "_person_1"."org_id", "_person_1"."nickname";
           INSERT INTO "hr"."private_info" ("_ppl_seq", "tax_ident") SELECT "_person_2"."_ppl_seq", E'XXX-YYY' FROM "op"."person" AS "_person_2" WHERE (ROW("_person_2"."org_id", "_person_2"."nickname") IN (%s)) <- $KEYS(string, string);
           UPDATE "hr"."private_info" AS "_private_info_1" SET ("tax_ident") = (E'XXX-YYY') FROM "op"."person" AS "_person_2" WHERE ((ROW("_person_2"."org_id", "_person_2"."nickname") IN (%s)) AND ("_person_2"."_ppl_seq" = "_private_info_1"."_ppl_seq")) <- $KEYS(string, string);
@@ -13391 +13465 @@
           SET ROLE "htsql_regress.admin";
           $KEYS(string, string) <- INSERT INTO "op"."person" ("email", "org_id", "nickname") SELECT E'elliott.mary@example.com', (SELECT "_organization_1"."org_id" FROM "op"."organization" AS "_organization_1" WHERE ("_organization_1"."org_id" = E'meyers')), E'mary' RETURNING "org_id", "nickname";
-          $KEYS(string, string) <- UPDATE "op"."person" AS "_person_1" SET ("email") = (E'elliott.mary@example.com') FROM "op"."person" AS "_person_2" LEFT OUTER JOIN "op"."organization" AS "_organization_1" ON ("_person_2"."org_id" = "_organization_1"."org_id") WHERE ((("_person_1"."org_id", "_person_1"."nickname") = ("_person_2"."org_id", "_person_2"."nickname")) AND (("_organization_1"."org_id" = E'meyers') AND ("_person_2"."nickname" = E'mary'))) RETURNING "_person_1"."org_id", "_person_1"."nickname";
+          $KEYS(string, string) <- UPDATE "op"."person" AS "_person_1" SET ("email") = (E'elliott.mary@example.com') FROM "op"."person" AS "_person_2" WHERE ((("_person_1"."org_id", "_person_1"."nickname") = ("_person_2"."org_id", "_person_2"."nickname")) AND (("_person_2"."org_id" = E'meyers') AND ("_person_2"."nickname" = E'mary'))) RETURNING "_person_1"."org_id", "_person_1"."nickname";
           INSERT INTO "hr"."private_info" ("_ppl_seq", "tax_ident") SELECT "_person_2"."_ppl_seq", E'YYY-XXX' FROM "op"."person" AS "_person_2" WHERE (ROW("_person_2"."org_id", "_person_2"."nickname") IN (%s)) <- $KEYS(string, string);
           UPDATE "hr"."private_info" AS "_private_info_1" SET ("tax_ident") = (E'YYY-XXX') FROM "op"."person" AS "_person_2" WHERE ((ROW("_person_2"."org_id", "_person_2"."nickname") IN (%s)) AND ("_person_2"."_ppl_seq" = "_private_info_1"."_ppl_seq")) <- $KEYS(string, string);
@@ -13496 +13570 @@
           SET SESSION AUTHORIZATION "htsql_regress.owner";
           SET ROLE "htsql_regress.owner";
-          $KEYS(string, string) <- UPDATE "op"."person" AS "_person_1" SET ("email") = (E'mary.elliott@example.com') FROM "op"."person" AS "_person_2" LEFT OUTER JOIN "op"."organization" AS "_organization_1" ON ("_person_2"."org_id" = "_organization_1"."org_id") WHERE ((("_person_1"."org_id", "_person_1"."nickname") = ("_person_2"."org_id", "_person_2"."nickname")) AND (("_organization_1"."org_id" = E'meyers') AND ("_person_2"."nickname" = E'mary'))) RETURNING "_person_1"."org_id", "_person_1"."nickname";
+          $KEYS(string, string) <- UPDATE "op"."person" AS "_person_1" SET ("email") = (E'mary.elliott@example.com') FROM "op"."person" AS "_person_2" WHERE ((("_person_1"."org_id", "_person_1"."nickname") = ("_person_2"."org_id", "_person_2"."nickname")) AND (("_person_2"."org_id" = E'meyers') AND ("_person_2"."nickname" = E'mary'))) RETURNING "_person_1"."org_id", "_person_1"."nickname";
           INSERT INTO "hr"."private_info" ("_ppl_seq", "tax_ident") SELECT "_person_2"."_ppl_seq", E'XXX-YYY' FROM "op"."person" AS "_person_2" WHERE (ROW("_person_2"."org_id", "_person_2"."nickname") IN (%s)) <- $KEYS(string, string);
           UPDATE "hr"."private_info" AS "_private_info_1" SET ("tax_ident") = (E'XXX-YYY') FROM "op"."person" AS "_person_2" WHERE ((ROW("_person_2"."org_id", "_person_2"."nickname") IN (%s)) AND ("_person_2"."_ppl_seq" = "_private_info_1"."_ppl_seq")) <- $KEYS(string, string);
@@ -13505 +13579 @@
           SET ROLE "htsql_regress.owner";
           $KEYS(string, string) <- INSERT INTO "op"."person" ("email", "org_id", "nickname") SELECT E'elliott@example.com', (SELECT "_organization_1"."org_id" FROM "op"."organization" AS "_organization_1" WHERE ("_organization_1"."org_id" = E'meyers')), E'mary' RETURNING "org_id", "nickname";
-          $KEYS(string, string) <- UPDATE "op"."person" AS "_person_1" SET ("email") = (E'elliott@example.com') FROM "op"."person" AS "_person_2" LEFT OUTER JOIN "op"."organization" AS "_organization_1" ON ("_person_2"."org_id" = "_organization_1"."org_id") WHERE ((("_person_1"."org_id", "_person_1"."nickname") = ("_person_2"."org_id", "_person_2"."nickname")) AND (("_organization_1"."org_id" = E'meyers') AND ("_person_2"."nickname" = E'mary'))) RETURNING "_person_1"."org_id", "_person_1"."nickname";
+          $KEYS(string, string) <- UPDATE "op"."person" AS "_person_1" SET ("email") = (E'elliott@example.com') FROM "op"."person" AS "_person_2" WHERE ((("_person_1"."org_id", "_person_1"."nickname") = ("_person_2"."org_id", "_person_2"."nickname")) AND (("_person_2"."org_id" = E'meyers') AND ("_person_2"."nickname" = E'mary'))) RETURNING "_person_1"."org_id", "_person_1"."nickname";
           INSERT INTO "hr"."private_info" ("_ppl_seq", "tax_ident") SELECT "_person_2"."_ppl_seq", E'YYY-XXX' FROM "op"."person" AS "_person_2" WHERE (ROW("_person_2"."org_id", "_person_2"."nickname") IN (%s)) <- $KEYS(string, string);
           UPDATE "hr"."private_info" AS "_private_info_1" SET ("tax_ident") = (E'YYY-XXX') FROM "op"."person" AS "_person_2" WHERE ((ROW("_person_2"."org_id", "_person_2"."nickname") IN (%s)) AND ("_person_2"."_ppl_seq" = "_private_info_1"."_ppl_seq")) <- $KEYS(string, string);
@@ -13513 +13587 @@
           SET SESSION AUTHORIZATION "htsql_regress.owner";
           SET ROLE "htsql_regress.owner";
-          SELECT "_person_1"."org_id" AS "_e_1", "_person_1"."nickname" AS "_e_2", "_person_1"."full_name" AS "_e_3", "_person_1"."email" AS "_e_4", "_organization_1"."org_id" AS "_e_5", "_person_1"."nickname" AS "_e_6" FROM "op"."person" AS "_person_1" LEFT OUTER JOIN "op"."organization" AS "_organization_1" ON ("_person_1"."org_id" = "_organization_1"."org_id") WHERE (("_organization_1"."org_id" = E'meyers') AND ("_person_1"."nickname" = E'mary')) ORDER BY "_e_5" ASC, "_e_6" ASC;
+          SELECT "_person_1"."org_id" AS "_e_1", "_person_1"."nickname" AS "_e_2", "_person_1"."full_name" AS "_e_3", "_person_1"."email" AS "_e_4", "_person_1"."org_id" AS "_e_5", "_person_1"."nickname" AS "_e_6" FROM "op"."person" AS "_person_1" WHERE (("_person_1"."org_id" = E'meyers') AND ("_person_1"."nickname" = E'mary')) ORDER BY "_e_5" ASC, "_e_6" ASC;
       - uri: /interact()
         status: 200 OK

trunk/test/regress/selection.yaml

@@ -774 +774 @@
   - uri: /project{id(),array(person)}
   - uri: /person{id(),array(project)}
+  - uri: /person{organization{name+},full_name+}
+  - uri: /organization{*,hide(is_active)-}
+  - uri: /organization{*,hide(is_active)-}/person{id()}
+  - uri: /person{organization{hide(name)+},hide(full_name)+,*}
 - 
   title: Comparison Tests