- more docs

- query will unique tupled results
- fixed [ticket:605] which is for psycopg1 anyway...

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py
index 7e6664fa6..068a4d0a1 100644
--- a/lib/sqlalchemy/databases/postgres.py
+++ b/lib/sqlalchemy/databases/postgres.py
@@ -70,7 +70,7 @@ class PG1DateTime(sqltypes.DateTime):
             return None
         second_parts = str(value.second).split(".")
         seconds = int(second_parts[0])
-        microseconds = int(second_parts[1])
+        microseconds = int(float(second_parts[1]))
         return datetime.datetime(value.year, value.month, value.day,
                                  value.hour, value.minute, seconds,
                                  microseconds)
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 9d31df8c0..8724f55a4 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -1035,7 +1035,7 @@ class Query(object):
             session._register_persistent(value)
 
         if mappers_or_columns:
-            return zip(*([result] + [o[1] for o in process]))
+            return list(util.OrderedSet(zip(*([result] + [o[1] for o in process]))))
         else:
             return result.data