0001-user-add-a-deleted-flag-24430.patch

Benjamin Dauvergne, 04 janvier 2020 18:17

Voir les différences: en ligne côte à côte

Subject: [PATCH 1/5] user: add a deleted flag (#24430)

 tests/test_sql.py | 23 +++++++++++++++++++++++
 wcs/sql.py        | 17 ++++++++++++-----
 wcs/users.py      |  1 +
 3 files changed, 36 insertions(+), 5 deletions(-)

         conn.commit()
         cur.close()
     @postgresql
     def test_migration_29_user_deleted():
         conn, cur = sql.get_connection_and_cursor()
         cur.execute('UPDATE wcs_meta SET value = 28 WHERE key = %s', ('sql_level',))
         conn.commit()
         cur.close()
         sql.SqlUser.wipe()
         user = sql.SqlUser()
         user.name = 'Jean Sénisme'
         user.store()
         assert sql.SqlUser.count() == 1
         conn, cur = sql.get_connection_and_cursor()
         cur.execute('ALTER TABLE users DROP COLUMN deleted')
         assert not column_exists_in_table(cur, 'users', 'deleted')
         sql.migrate()
         assert column_exists_in_table(cur, 'users', 'ascii_name')
         assert migration_level(cur) >= 28
         assert sql.SqlUser.count() == 1
         assert not sql.SqlUser.get(id=user.id).deleted
     def drop_formdef_tables():
         conn, cur = sql.get_connection_and_cursor()
         cur.execute('''SELECT table_name FROM information_schema.tables''')

                                         verified_fields text[],
                                         name_identifiers text[],
                                         lasso_dump text,
                                         last_seen timestamp)''' % table_name)
                                         last_seen timestamp,
                                         deleted boolean DEFAULT(FALSE))''' % table_name)
         cur.execute('''SELECT column_name FROM information_schema.columns
                         WHERE table_schema = 'public'
                           AND table_name = %s''', (table_name,))
-...
         needed_fields = set(['id', 'name', 'email', 'roles', 'is_admin',
             'anonymous', 'name_identifiers', 'verified_fields',
             'lasso_dump', 'last_seen', 'fts', 'ascii_name'])
             'lasso_dump', 'last_seen', 'fts', 'ascii_name', 'deleted'])
         from wcs.admin.settings import UserFieldsFormDef
         formdef = UserFieldsFormDef()
-...
         if not 'ascii_name' in existing_fields:
             cur.execute('ALTER TABLE %s ADD COLUMN ascii_name varchar' % table_name)
         if not 'deleted' in existing_fields:
             cur.execute('ALTER TABLE %s ADD COLUMN deleted DEFAULT(FALSE)' % table_name)
         # delete obsolete fields
         for field in (existing_fields - needed_fields):
             cur.execute('''ALTER TABLE %s DROP COLUMN %s''' % (table_name, field))
-...
             ('lasso_dump', 'text'),
             ('last_seen', 'timestamp'),
             ('ascii_name', 'varchar'),
             ('deleted', 'boolean'),
+        ]
         id = None
-...
                     'verified_fields': self.verified_fields,
                     'lasso_dump': self.lasso_dump,
                     'last_seen': None,
                     'deleted': self.deleted,
+            }
             if self.last_seen:
                 sql_dict['last_seen'] = datetime.datetime.fromtimestamp(self.last_seen),
-...
             o = cls()
             (o.id, o.name, o.email, o.roles, o.is_admin, o.anonymous,
              o.name_identifiers, o.verified_fields, o.lasso_dump,
              o.last_seen, ascii_name) = [str_encode(x) for x in tuple(row[:11])]
              o.last_seen, ascii_name, o.deleted) = [str_encode(x) for x in tuple(row[:12])]
             if o.last_seen:
                 o.last_seen = time.mktime(o.last_seen.timetuple())
             if o.roles:
-...
         return result
     SQL_LEVEL = 34
     SQL_LEVEL = 35
     def migrate_global_views(conn, cur):
         cur.execute('''SELECT COUNT(*) FROM information_schema.tables
-...
             # 31: add user_label to formdata
             # 33: add anonymised field to global view
             migrate_views(conn, cur)
         if sql_level < 21:
         if sql_level < 35:
             # 3: introduction of _structured for user fields
             # 4: removal of identification_token
             # 12: (first part) add fts to users
             # 16: add verified_fields to users
             # 21: (first part) add ascii_name to users
             # 35: add deleted
             do_user_table()
         if sql_level < 6:
             # 6: add actions_roles_array to tables and views

         verified_fields = None
         name_identifiers = None
         lasso_dump = None
         deleted = False
         last_seen = None
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-user-add-a-deleted-flag-24430.patch