diff options
author | Gluzskiy Alexandr <sss123next@list.ru> | 2010-03-26 15:00:27 +0200 |
---|---|---|
committer | Gluzskiy Alexandr <sss123next@list.ru> | 2010-03-26 15:00:27 +0200 |
commit | d379fedd1e998a5b92213adf89ec5f2376ab7198 (patch) | |
tree | b8a179ea3041681b19359035f160edf252391029 /www-apps/trac/files/9138-mysql-key-size-r9405.patch | |
parent | 8234ae2bfefc148dddbcb5180aab8fec632a6d2d (diff) |
deleted: www-apps/trac/files
new file: www-apps/trac/files/9138-mysql-key-size-r9405.patch
new file: www-apps/trac/files/postinst-en.txt
new file: www-apps/trac/files/postupgrade-en.txt
new file: www-apps/trac/files/tracd.confd
new file: www-apps/trac/files/tracd.initd
new file: www-apps/trac/files/tracd.initd.2
modified: www-apps/trac/trac-9999.ebuild
Diffstat (limited to 'www-apps/trac/files/9138-mysql-key-size-r9405.patch')
-rw-r--r-- | www-apps/trac/files/9138-mysql-key-size-r9405.patch | 107 |
1 files changed, 107 insertions, 0 deletions
diff --git a/www-apps/trac/files/9138-mysql-key-size-r9405.patch b/www-apps/trac/files/9138-mysql-key-size-r9405.patch new file mode 100644 index 0000000..ab5d468 --- /dev/null +++ b/www-apps/trac/files/9138-mysql-key-size-r9405.patch @@ -0,0 +1,107 @@ +diff --git a/trac/db/mysql_backend.py b/trac/db/mysql_backend.py +--- a/trac/db/mysql_backend.py ++++ b/trac/db/mysql_backend.py +@@ -121,7 +121,9 @@ + name = '`%s`' % c + table_col = filter((lambda x: x.name == c), table.columns) + if len(table_col) == 1 and table_col[0].type.lower() == 'text': +- if name == '`rev`': ++ if table_col[0].key_size is not None: ++ name += '(%d)' % table_col[0].key_size ++ elif name == '`rev`': + name += '(20)' + elif name == '`path`': + name += '(255)' +diff --git a/trac/db/schema.py b/trac/db/schema.py +--- a/trac/db/schema.py ++++ b/trac/db/schema.py +@@ -35,11 +35,12 @@ + class Column(object): + """Declare a table column in a database schema.""" + +- def __init__(self, name, type='text', size=None, unique=False, ++ def __init__(self, name, type='text', size=None, key_size=None, + auto_increment=False): + self.name = name + self.type = type + self.size = size ++ self.key_size = key_size + self.auto_increment = auto_increment + + +diff --git a/trac/db_default.py b/trac/db_default.py +--- a/trac/db_default.py ++++ b/trac/db_default.py +@@ -91,17 +91,17 @@ + Column('value')], + Table('revision', key=('repos', 'rev'))[ + Column('repos', type='int'), +- Column('rev'), ++ Column('rev', key_size=20), + Column('time', type='int64'), + Column('author'), + Column('message'), + Index(['repos', 'time'])], + Table('node_change', key=('repos', 'rev', 'path', 'change_type'))[ + Column('repos', type='int'), +- Column('rev'), +- Column('path'), ++ Column('rev', key_size=20), ++ Column('path', key_size=255), + Column('node_type', size=1), +- Column('change_type', size=1), ++ Column('change_type', size=1, key_size=2), + Column('base_path'), + Column('base_rev'), + Index(['repos', 'rev'])], +diff --git a/trac/upgrades/db23.py b/trac/upgrades/db23.py +--- a/trac/upgrades/db23.py ++++ b/trac/upgrades/db23.py +@@ -15,17 +15,17 @@ + Column('value')], + Table('revision', key=('repos', 'rev'))[ + Column('repos'), +- Column('rev'), ++ Column('rev', key_size=20), + Column('time', type='int'), + Column('author'), + Column('message'), + Index(['repos', 'time'])], + Table('node_change', key=('repos', 'rev', 'path', 'change_type'))[ +- Column('repos'), +- Column('rev'), +- Column('path'), ++ Column('repos', key_size=56), ++ Column('rev', key_size=20), ++ Column('path', key_size=255), + Column('node_type', size=1), +- Column('change_type', size=1), ++ Column('change_type', size=1, key_size=2), + Column('base_path'), + Column('base_rev'), + Index(['repos', 'rev'])]] +diff --git a/trac/upgrades/db24.py b/trac/upgrades/db24.py +--- a/trac/upgrades/db24.py ++++ b/trac/upgrades/db24.py +@@ -24,17 +24,17 @@ + Column('value')], + Table('revision', key=('repos', 'rev'))[ + Column('repos', type='int'), +- Column('rev'), ++ Column('rev', key_size=20), + Column('time', type='int'), + Column('author'), + Column('message'), + Index(['repos', 'time'])], + Table('node_change', key=('repos', 'rev', 'path', 'change_type'))[ + Column('repos', type='int'), +- Column('rev'), +- Column('path'), ++ Column('rev', key_size=20), ++ Column('path', key_size=255), + Column('node_type', size=1), +- Column('change_type', size=1), ++ Column('change_type', size=1, key_size=2), + Column('base_path'), + Column('base_rev'), + Index(['repos', 'rev'])]] |