Merge lp:~jfb-tempo-consulting/unifield-server/US-6857 into lp:unifield-server

Proposed by jftempo on 2019-12-06
Status: Merged
Merged at revision: 5572
Proposed branch: lp:~jfb-tempo-consulting/unifield-server/US-6857
Merge into: lp:unifield-server
Diff against target: 35 lines (+4/-2)
2 files modified
bin/addons/sync_client/monitor.py (+2/-2)
bin/osv/orm.py (+2/-0)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-server/US-6857
Reviewer Review Type Date Requested Status
UniField Reviewer Team 2019-12-06 Pending
Review via email: mp+376451@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/sync_client/monitor.py'
2--- bin/addons/sync_client/monitor.py 2019-10-09 10:03:08 +0000
3+++ bin/addons/sync_client/monitor.py 2019-12-06 08:57:12 +0000
4@@ -366,7 +366,7 @@
5 'backup_path': fields.char('Backup Location', size=128),
6 'backup_date': fields.datetime("Backup Date", readonly=True,
7 required=True),
8- 'backup_size': fields.integer('Backup Size', readonly=True),
9+ 'backup_size': fields.integer_big('Backup Size', readonly=True),
10 'instance_state': fields.related('instance_id', 'state', type='selection',
11 selection=[('draft', 'Draft'),
12 ('active', 'Active'),
13@@ -378,7 +378,7 @@
14 'cloud_date': fields.datetime('Cloud Date', readonly=True),
15 'cloud_backup': fields.char('Cloud Dump', size=256, readonly=True),
16 'cloud_error': fields.text('Cloud last error', readonly=True),
17- 'cloud_size': fields.integer('Cloud Size Zipped', readonly=True),
18+ 'cloud_size': fields.integer_big('Cloud Size Zipped', readonly=True),
19 'nb_late_vi': fields.integer('# late VI jobs'),
20 'vi_details': fields.text('Last exec VI job'),
21 }
22
23=== modified file 'bin/osv/orm.py'
24--- bin/osv/orm.py 2019-11-04 09:13:41 +0000
25+++ bin/osv/orm.py 2019-12-06 08:57:12 +0000
26@@ -3218,7 +3218,9 @@
27 ('timestamp', 'date', 'date', '::date'),
28 ('numeric', 'float', get_pg_type(f)[1], '::'+get_pg_type(f)[1]),
29 ('float8', 'float', get_pg_type(f)[1], '::'+get_pg_type(f)[1]),
30+ ('int4', 'integer_big', get_pg_type(f)[1], '::'+get_pg_type(f)[1]),
31 ]
32+
33 if f_pg_type == 'varchar' and f._type == 'char' and f_pg_size < f.size:
34 cr.execute('ALTER TABLE "%s" RENAME COLUMN "%s" TO temp_change_size' % (self._table, k)) # not_a_user_entry
35 cr.execute('ALTER TABLE "%s" ADD COLUMN "%s" VARCHAR(%d)' % (self._table, k, f.size)) # not_a_user_entry

Subscribers

People subscribed via source and target branches