merge plus fix the test spelling too

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index 766039332..5a3a92a3e 100644
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -423,7 +423,7 @@ class SQLCompiler(engine.Compiled):
         name = orig_name = column.name
         if name is None:
             raise exc.CompileError("Cannot compile Column object until "
-                                   "it's 'name' is assigned.")
+                                   "its 'name' is assigned.")
 
         is_literal = column.is_literal
         if not is_literal and isinstance(name, sql._truncated_label):
diff --git a/test/sql/test_compiler.py b/test/sql/test_compiler.py
index fe52402ec..fa15c7aa2 100644
--- a/test/sql/test_compiler.py
+++ b/test/sql/test_compiler.py
@@ -2211,14 +2211,14 @@ class SelectTest(fixtures.TestBase, AssertsCompiledSQL):
 
         assert_raises_message(
             exc.CompileError,
-            "Cannot compile Column object until it's 'name' is assigned.",
+            "Cannot compile Column object until its 'name' is assigned.",
             str, sel2
         )
 
         sel3 = select([my_str]).as_scalar()
         assert_raises_message(
             exc.CompileError,
-            "Cannot compile Column object until it's 'name' is assigned.",
+            "Cannot compile Column object until its 'name' is assigned.",
             str, sel3
         )