- fixed max identifier length on postgres (63) [ticket:571]

- fixed doc typo ("in_" operator)
- misc indent stuff

diff --git a/CHANGES b/CHANGES
index f54ff078be9d3a09540336ef3cca2b46e7299abe..81dd74e1ab98253ce8cd4879fa1a3b22dbea2c8b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,9 @@
 - sql
     - got connection-bound metadata to work with implicit execution
     - cleanup to connection-bound sessions, SessionTransaction
-    
+- postgres
+    - fixed max identifier length (63) [ticket:571]
+
 0.3.9
 - general
     - better error message for NoSuchColumnError [ticket:607]

diff --git a/doc/build/content/sqlconstruction.txt b/doc/build/content/sqlconstruction.txt
index a672fb5cec650ae79db70c948ab2853be09ed59f..2c3a68aea4cf5b474e046d76cffdb808c3472c4f 100644 (file)
--- a/doc/build/content/sqlconstruction.txt
+++ b/doc/build/content/sqlconstruction.txt
@@ -318,7 +318,7 @@ Select statements can also generate a WHERE clause based on the parameters you g
 
 #### Operators {@name=operators}
 
-Supported column operators so far are all the numerical comparison operators, i.e. '==', '>', '>=', etc., as well as `like()`, `startswith()`, `endswith()`, `between()`, and `in()`.  Boolean operators include `not_()`, `and_()` and `or_()`, which also can be used inline via '~', '&', and '|'.  Math operators are '+', '-', '*', '/'.  Any custom operator can be specified via the `op()` function shown below.
+Supported column operators so far are all the numerical comparison operators, i.e. '==', '>', '>=', etc., as well as `like()`, `startswith()`, `endswith()`, `between()`, and `in_()`.  Boolean operators include `not_()`, `and_()` and `or_()`, which also can be used inline via '~', '&', and '|'.  Math operators are '+', '-', '*', '/'.  Any custom operator can be specified via the `op()` function shown below.
  
     {python}
     # "like" operator

diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py
index 068a4d0a1cb86bebb17cbbd89e9a06cd2697729f..d3726fc1ff02de58d10a20659e2384e1aa06e64c 100644 (file)
--- a/lib/sqlalchemy/databases/postgres.py
+++ b/lib/sqlalchemy/databases/postgres.py
@@ -275,7 +275,7 @@ class PGDialect(ansisql.ANSIDialect):
         return PGExecutionContext(self, *args, **kwargs)
 
     def max_identifier_length(self):
-        return 68
+        return 63
         
     def type_descriptor(self, typeobj):
         if self.version == 2:

diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py
index 6677e4ab94628afb92a7351e408a120732cee0ec..a00a35ab663386bc6980bf287e33efece5ed0144 100644 (file)
--- a/lib/sqlalchemy/orm/properties.py
+++ b/lib/sqlalchemy/orm/properties.py
@@ -91,7 +91,7 @@ class PropertyLoader(StrategizedProperty):
 
         self.association = association
         self.order_by = order_by
-        self.attributeext=attributeext
+        self.attributeext = attributeext
         if isinstance(backref, str):
             # propigate explicitly sent primary/secondary join conditions to the BackRef object if
             # just a string was sent

diff --git a/lib/sqlalchemy/sql_util.py b/lib/sqlalchemy/sql_util.py
index debf1da4f9c5b5ca37216b2d9e360e3be74ec39b..9235b9c4ec3a233645bd9103671c4bd254b90841 100644 (file)
--- a/lib/sqlalchemy/sql_util.py
+++ b/lib/sqlalchemy/sql_util.py
@@ -53,7 +53,7 @@ class TableCollection(object):
         for table in self.tables:
             vis.traverse(table)
         sorter = topological.QueueDependencySorter( tuples, self.tables )
-        head =  sorter.sort()
+        head = sorter.sort()
         sequence = []
         def to_sequence( node, seq=sequence):
             seq.append( node.item )