ソースを参照

Merge pull request #312 from tracim/fix/310/empty_content_in_revisions

Bastien Sevajol 9 年 前
コミット
c13cee4ff6
共有1 個のファイルを変更した3 個の追加1 個の削除を含む
  1. 3 1
      tracim/migration/versions/913efdf409e5_all_files_also_on_disk.py

+ 3 - 1
tracim/migration/versions/913efdf409e5_all_files_also_on_disk.py ファイルの表示

14
 from depot.io.utils import FileIntent
14
 from depot.io.utils import FileIntent
15
 from depot.manager import DepotManager
15
 from depot.manager import DepotManager
16
 import sqlalchemy as sa
16
 import sqlalchemy as sa
17
+from sqlalchemy.sql.expression import func
17
 
18
 
18
 # revision identifiers, used by Alembic.
19
 # revision identifiers, used by Alembic.
19
 revision = '913efdf409e5'
20
 revision = '913efdf409e5'
61
     delete_files_on_disk(connection=connection)
62
     delete_files_on_disk(connection=connection)
62
     select_query = revision_helper.select() \
63
     select_query = revision_helper.select() \
63
         .where(revision_helper.c.type == 'file') \
64
         .where(revision_helper.c.type == 'file') \
64
-        .where(revision_helper.c.depot_file.is_(None))
65
+        .where(revision_helper.c.depot_file.is_(None)) \
66
+        .where(func.length(revision_helper.c.file_content) > 0)
65
     files = connection.execute(select_query).fetchall()
67
     files = connection.execute(select_query).fetchall()
66
     for file in files:
68
     for file in files:
67
         file_filename = '{0}{1}'.format(
69
         file_filename = '{0}{1}'.format(