added ORM support

1 files changed, 16 insertions, 8 deletions

diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py
index 19d7c81fa..ec22e8633 100644
--- a/lib/sqlalchemy/dialects/postgresql/base.py
+++ b/lib/sqlalchemy/dialects/postgresql/base.py
@@ -230,7 +230,7 @@ RESERVED_WORDS = set(
     "default", "deferrable", "desc", "distinct", "do", "else", "end",
     "except", "false", "fetch", "for", "foreign", "from", "grant", "group",
     "having", "in", "initially", "intersect", "into", "leading", "limit",
-    "localtime", "localtimestamp", "new", "not", "null", "off", "offset",
+    "localtime", "localtimestamp", "new", "not", "null", "of", "off", "offset",
     "old", "on", "only", "or", "order", "placing", "primary", "references",
     "returning", "select", "session_user", "some", "symmetric", "table",
     "then", "to", "trailing", "true", "union", "unique", "user", "using",
@@ -1014,14 +1014,22 @@ class PGCompiler(compiler.SQLCompiler):
             return ""
 
     def for_update_clause(self, select):
-        if select.for_update == 'nowait':
-            if select.for_update_of is not None:
-                return " FOR UPDATE OF " + select.for_update_of + " NOWAIT"
-            return " FOR UPDATE NOWAIT"
-        elif select.for_update == 'read':
-            return " FOR SHARE"
+
+        if select.for_update == 'read':
+            return ' FOR SHARE'
         elif select.for_update == 'read_nowait':
-            return " FOR SHARE NOWAIT"
+            return ' FOR SHARE NOWAIT'
+
+        tmp = ' FOR UPDATE'
+        if isinstance(select.for_update_of, list):
+            tmp += ' OF ' + ', '.join([of[0] for of in select.for_update_of])
+        elif isinstance(select.for_update_of, tuple):
+            tmp += ' OF ' + select.for_update_of[0]
+
+        if select.for_update == 'nowait':
+            return tmp + ' NOWAIT'
+        elif select.for_update:
+            return tmp
         else:
             return super(PGCompiler, self).for_update_clause(select)