Commits

Kirill Simonov  committed fd3a498

Updated the `NEWS` file.

Also removed `INSTALL` from the long description of the package.

  • Participants
  • Parent commits 3f8cc64

Comments (0)

Files changed (3)

 ===============
 
 
-2.0.0 (2010-09-XX)
-------------------
+2.0.0 beta 2 (2010-10-01)
+-------------------------
 
-* Initial release.
-* (list of the basic features supported in this release).
+* Refactored the translator from the expression graph to the term tree.
+* Added `Content-Disposition` header to `:json` and `:csv` renderers.
+* Merged the tutorial to the repository.
 
+
+2.0.0 beta 1 (2010-09-31)
+-------------------------
+
+* Initial beta release.
+* PostgreSQL and SQLite backends are (mostly) supported, the former
+  more than the latter.
+* The SQL translator needs more work, in particular, the term tree,
+  the frame structure and the serializer.
+* Lots of functions are either not implemented or missing a proper
+  serializer, especially in the SQLite backend.
+* Other areas which need more work before the final release: rendering,
+  introspection, regression tests and documentation.
+
 
 root = os.path.dirname(__file__)
 README = open(os.path.join(root, 'README')).read()
-INSTALL = open(os.path.join(root, 'INSTALL')).read()
 NEWS = open(os.path.join(root, 'NEWS')).read()
 
 # The distutils parameters are defined here.  Do not forget to update
 NAME = "HTSQL"
 VERSION = "2.0.0b1"
 DESCRIPTION = "Query language for the accidental programmer"
-LONG_DESCRIPTION = "\n".join([README, INSTALL, NEWS])
+LONG_DESCRIPTION = "\n".join([README, NEWS])
 AUTHOR = "Clark C. Evans and Kirill Simonov; Prometheus Research, LLC"
 AUTHOR_EMAIL = "cce@clarkevans.com"
 LICENSE = "Free To Use But Restricted"

File src/htsql/tr/assemble.py

         if self.space in self.term.routes:
             return self.term
         # Verify that the unit is singular on the term space.
-        if not self.term.spans(self.space):
+        if not self.term.space.spans(self.space):
             raise AssembleError("expected a singular expression",
                                 self.unit.mark)
         # Inject the unit space into the term.
         if self.unit in self.term.routes:
             return self.term
         # Verify that the unit is singular on the term space.
-        if not self.term.spans(self.space):
+        if not self.term.space.spans(self.space):
             raise AssembleError("expected a singular expression",
                                 self.unit.mark)
 
         routes = unit_term.routes.copy()
         routes[self.unit] = plural_term.tag
         unit_term = CorrelationTerm(self.state.tag(), unit_term, plural_term,
-                                    ties, lkid.space, routes)
+                                    ties, unit_term.space, routes)
         # If we attached the unit directly to the main term, we are done.
         if is_native:
             return unit_term