4 files changed, 34 insertions, 3 deletions
diff --git a/keystone/common/sql/core.py b/keystone/common/sql/core.py
index 67863588..fdb45c74 100644
--- a/keystone/common/sql/core.py
+++ b/keystone/common/sql/core.py
@@ -26,10 +26,10 @@ from sqlalchemy.orm.attributes import InstrumentedAttribute
 import sqlalchemy.pool
 from sqlalchemy import types as sql_types
 
-from keystone.common import logging
 from keystone import config
 from keystone import exception
 from keystone.openstack.common import jsonutils
+from keystone.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)
diff --git a/keystone/common/sql/legacy.py b/keystone/common/sql/legacy.py
index c8adc900..d88e5a46 100644
--- a/keystone/common/sql/legacy.py
+++ b/keystone/common/sql/legacy.py
@@ -21,10 +21,10 @@ from sqlalchemy import exc
 
 
 from keystone.assignment.backends import sql as assignment_sql
-from keystone.common import logging
 from keystone import config
 from keystone.contrib.ec2.backends import sql as ec2_sql
 from keystone.identity.backends import sql as identity_sql
+from keystone.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)
diff --git a/keystone/common/sql/migrate_repo/versions/032_username_length.py b/keystone/common/sql/migrate_repo/versions/032_username_length.py
new file mode 100644
index 00000000..636ebd75
--- /dev/null
+++ b/keystone/common/sql/migrate_repo/versions/032_username_length.py
@@ -0,0 +1,31 @@
+import sqlalchemy as sql
+from sqlalchemy.orm import sessionmaker
+
+
+def upgrade(migrate_engine):
+    meta = sql.MetaData()
+    meta.bind = migrate_engine
+    user_table = sql.Table('user', meta, autoload=True)
+    user_table.c.name.alter(type=sql.String(255))
+
+
+def downgrade(migrate_engine):
+    meta = sql.MetaData()
+    meta.bind = migrate_engine
+    user_table = sql.Table('user', meta, autoload=True)
+    if migrate_engine.name != 'mysql':
+        # NOTE(aloga): sqlite does not enforce length on the
+        # VARCHAR types: http://www.sqlite.org/faq.html#q9
+        # postgresql and DB2 do not truncate.
+        maker = sessionmaker(bind=migrate_engine)
+        session = maker()
+        for user in session.query(user_table).all():
+            values = {'name': user.name[:64]}
+            update = (user_table.update().
+                      where(user_table.c.id == user.id).
+                      values(values))
+            migrate_engine.execute(update)
+
+        session.commit()
+        session.close()
+    user_table.c.name.alter(type=sql.String(64))
diff --git a/keystone/common/sql/nova.py b/keystone/common/sql/nova.py
index fd8d2481..c7abfb81 100644
--- a/keystone/common/sql/nova.py
+++ b/keystone/common/sql/nova.py
@@ -19,10 +19,10 @@
 import uuid
 
 from keystone import assignment
-from keystone.common import logging
 from keystone import config
 from keystone.contrib.ec2.backends import sql as ec2_sql
 from keystone import identity
+from keystone.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)