summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES10
-rw-r--r--lib/sqlalchemy/databases/access.py3
-rw-r--r--lib/sqlalchemy/databases/mssql.py2
-rw-r--r--lib/sqlalchemy/databases/mysql.py2
-rw-r--r--lib/sqlalchemy/databases/postgres.py2
-rw-r--r--lib/sqlalchemy/databases/sybase.py2
-rw-r--r--lib/sqlalchemy/sql/compiler.py22
-rw-r--r--test/sql/constraints.py18
8 files changed, 50 insertions, 11 deletions
diff --git a/CHANGES b/CHANGES
index ce1e8ddbc..d34bf8b81 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@ CHANGES
=======
0.5beta2
========
+ - 0.5beta2 includes all bugfixes listed under release
+ "0.4.7".
+
- orm
- In addition to expired attributes, deferred attributes
also load if their data is present in the result set.
@@ -113,6 +116,13 @@ CHANGES
looking for the name within the DB's catalog tables.
[ticket:571]
+ - The index name generated when you say "index=True"
+ on a Column is truncated to the length appropriate
+ for the dialect. Additionally, an Index with a too-
+ long name cannot be explicitly dropped with
+ Index.drop(), similar to [ticket:571].
+ [ticket:820]
+
- postgres
- Repaired server_side_cursors to properly detect
text() clauses.
diff --git a/lib/sqlalchemy/databases/access.py b/lib/sqlalchemy/databases/access.py
index f33452200..55b48e4bc 100644
--- a/lib/sqlalchemy/databases/access.py
+++ b/lib/sqlalchemy/databases/access.py
@@ -408,7 +408,8 @@ class AccessSchemaGenerator(compiler.SchemaGenerator):
class AccessSchemaDropper(compiler.SchemaDropper):
def visit_index(self, index):
- self.append("\nDROP INDEX [%s].[%s]" % (index.table.name, index.name))
+
+ self.append("\nDROP INDEX [%s].[%s]" % (index.table.name, self._validate_identifier(index.name, False)))
self.execute()
class AccessDefaultRunner(base.DefaultRunner):
diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py
index 1cacd81ef..4f6db935f 100644
--- a/lib/sqlalchemy/databases/mssql.py
+++ b/lib/sqlalchemy/databases/mssql.py
@@ -1031,7 +1031,7 @@ class MSSQLSchemaDropper(compiler.SchemaDropper):
def visit_index(self, index):
self.append("\nDROP INDEX %s.%s" % (
self.preparer.quote_identifier(index.table.name),
- self.preparer.quote_identifier(index.name)
+ self.preparer.quote(self._validate_identifier(index.name, False), index.quote)
))
self.execute()
diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index 426e97a81..ed01b77d7 100644
--- a/lib/sqlalchemy/databases/mysql.py
+++ b/lib/sqlalchemy/databases/mysql.py
@@ -2062,7 +2062,7 @@ class MySQLSchemaGenerator(compiler.SchemaGenerator):
class MySQLSchemaDropper(compiler.SchemaDropper):
def visit_index(self, index):
self.append("\nDROP INDEX %s ON %s" %
- (self.preparer.format_index(index),
+ (self.preparer.quote(self._validate_identifier(index.name, False), index.quote),
self.preparer.format_table(index.table)))
self.execute()
diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py
index 124242086..c30ca8b28 100644
--- a/lib/sqlalchemy/databases/postgres.py
+++ b/lib/sqlalchemy/databases/postgres.py
@@ -753,7 +753,7 @@ class PGSchemaGenerator(compiler.SchemaGenerator):
if index.unique:
self.append("UNIQUE ")
self.append("INDEX %s ON %s (%s)" \
- % (preparer.format_index(index),
+ % (preparer.quote(self._validate_identifier(index.name, True), index.quote),
preparer.format_table(index.table),
string.join([preparer.format_column(c) for c in index.columns], ', ')))
whereclause = index.kwargs.get('postgres_where', None)
diff --git a/lib/sqlalchemy/databases/sybase.py b/lib/sqlalchemy/databases/sybase.py
index cc8597068..45a98bec5 100644
--- a/lib/sqlalchemy/databases/sybase.py
+++ b/lib/sqlalchemy/databases/sybase.py
@@ -844,7 +844,7 @@ class SybaseSQLSchemaDropper(compiler.SchemaDropper):
def visit_index(self, index):
self.append("\nDROP INDEX %s.%s" % (
self.preparer.quote_identifier(index.table.name),
- self.preparer.quote_identifier(index.name)
+ self.preparer.quote(self._validate_identifier(index.name, False), index.quote)
))
self.execute()
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index b57fd3b18..28685cabc 100644
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -742,6 +742,19 @@ class DDLBase(engine.SchemaIterator):
findalterables.traverse(c)
return alterables
+ def _validate_identifier(self, ident, truncate):
+ if truncate:
+ if len(ident) > self.dialect.max_identifier_length:
+ counter = getattr(self, 'counter', 0)
+ self.counter = counter + 1
+ return ident[0:self.dialect.max_identifier_length - 6] + "_" + hex(self.counter)[2:]
+ else:
+ return ident
+ else:
+ self.dialect.validate_identifier(ident)
+ return ident
+
+
class SchemaGenerator(DDLBase):
def __init__(self, dialect, connection, checkfirst=False, tables=None, **kwargs):
super(SchemaGenerator, self).__init__(connection, **kwargs)
@@ -901,7 +914,7 @@ class SchemaGenerator(DDLBase):
if index.unique:
self.append("UNIQUE ")
self.append("INDEX %s ON %s (%s)" \
- % (preparer.format_index(index),
+ % (preparer.quote(self._validate_identifier(index.name, True), index.quote),
preparer.format_table(index.table),
string.join([preparer.quote(c.name, c.quote) for c in index.columns], ', ')))
self.execute()
@@ -930,7 +943,7 @@ class SchemaDropper(DDLBase):
return not self.checkfirst or self.dialect.has_table(self.connection, table.name, schema=table.schema)
def visit_index(self, index):
- self.append("\nDROP INDEX " + self.preparer.format_index(index))
+ self.append("\nDROP INDEX " + self.preparer.quote(index, self._validate_identifier(index.name, False)))
self.execute()
def drop_foreignkey(self, constraint):
@@ -1050,10 +1063,7 @@ class IdentifierPreparer(object):
def format_constraint(self, constraint):
return self.quote(constraint.name, constraint.quote)
-
- def format_index(self, index):
- return self.quote(index.name, index.quote)
-
+
def format_table(self, table, use_schema=True, name=None):
"""Prepare a quoted table and schema name."""
diff --git a/test/sql/constraints.py b/test/sql/constraints.py
index 5ce5cca34..b719ac93d 100644
--- a/test/sql/constraints.py
+++ b/test/sql/constraints.py
@@ -201,7 +201,25 @@ class ConstraintTest(TestBase, AssertsExecutionResults):
winner='sweden')
ss = events.select().execute().fetchall()
+ def test_too_long_idx_name(self):
+ dialect = testing.db.dialect.__class__()
+ dialect.max_identifier_length = 20
+ schemagen = dialect.schemagenerator(dialect, None)
+ schemagen.execute = lambda : None
+
+ t1 = Table("sometable", MetaData(), Column("foo", Integer))
+ schemagen.visit_index(Index("this_name_is_too_long_for_what_were_doing", t1.c.foo))
+ self.assertEquals(schemagen.buffer.getvalue(), "CREATE INDEX this_name_is_t_1 ON sometable (foo)")
+ schemagen.buffer.truncate(0)
+ schemagen.visit_index(Index("this_other_name_is_too_long_for_what_were_doing", t1.c.foo))
+ self.assertEquals(schemagen.buffer.getvalue(), "CREATE INDEX this_other_nam_2 ON sometable (foo)")
+
+ schemadrop = dialect.schemadropper(dialect, None)
+ schemadrop.execute = lambda: None
+ self.assertRaises(exc.IdentifierError, schemadrop.visit_index, Index("this_name_is_too_long_for_what_were_doing", t1.c.foo))
+
+
class ConstraintCompilationTest(TestBase, AssertsExecutionResults):
class accum(object):
def __init__(self):
View Lorry Controller Status