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

Proposed by jftempo
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 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
=== modified file 'bin/addons/sync_client/monitor.py'
--- bin/addons/sync_client/monitor.py 2019-10-09 10:03:08 +0000
+++ bin/addons/sync_client/monitor.py 2019-12-06 08:57:12 +0000
@@ -366,7 +366,7 @@
366 'backup_path': fields.char('Backup Location', size=128),366 'backup_path': fields.char('Backup Location', size=128),
367 'backup_date': fields.datetime("Backup Date", readonly=True,367 'backup_date': fields.datetime("Backup Date", readonly=True,
368 required=True),368 required=True),
369 'backup_size': fields.integer('Backup Size', readonly=True),369 'backup_size': fields.integer_big('Backup Size', readonly=True),
370 'instance_state': fields.related('instance_id', 'state', type='selection',370 'instance_state': fields.related('instance_id', 'state', type='selection',
371 selection=[('draft', 'Draft'),371 selection=[('draft', 'Draft'),
372 ('active', 'Active'),372 ('active', 'Active'),
@@ -378,7 +378,7 @@
378 'cloud_date': fields.datetime('Cloud Date', readonly=True),378 'cloud_date': fields.datetime('Cloud Date', readonly=True),
379 'cloud_backup': fields.char('Cloud Dump', size=256, readonly=True),379 'cloud_backup': fields.char('Cloud Dump', size=256, readonly=True),
380 'cloud_error': fields.text('Cloud last error', readonly=True),380 'cloud_error': fields.text('Cloud last error', readonly=True),
381 'cloud_size': fields.integer('Cloud Size Zipped', readonly=True),381 'cloud_size': fields.integer_big('Cloud Size Zipped', readonly=True),
382 'nb_late_vi': fields.integer('# late VI jobs'),382 'nb_late_vi': fields.integer('# late VI jobs'),
383 'vi_details': fields.text('Last exec VI job'),383 'vi_details': fields.text('Last exec VI job'),
384 }384 }
385385
=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py 2019-11-04 09:13:41 +0000
+++ bin/osv/orm.py 2019-12-06 08:57:12 +0000
@@ -3218,7 +3218,9 @@
3218 ('timestamp', 'date', 'date', '::date'),3218 ('timestamp', 'date', 'date', '::date'),
3219 ('numeric', 'float', get_pg_type(f)[1], '::'+get_pg_type(f)[1]),3219 ('numeric', 'float', get_pg_type(f)[1], '::'+get_pg_type(f)[1]),
3220 ('float8', 'float', get_pg_type(f)[1], '::'+get_pg_type(f)[1]),3220 ('float8', 'float', get_pg_type(f)[1], '::'+get_pg_type(f)[1]),
3221 ('int4', 'integer_big', get_pg_type(f)[1], '::'+get_pg_type(f)[1]),
3221 ]3222 ]
3223
3222 if f_pg_type == 'varchar' and f._type == 'char' and f_pg_size < f.size:3224 if f_pg_type == 'varchar' and f._type == 'char' and f_pg_size < f.size:
3223 cr.execute('ALTER TABLE "%s" RENAME COLUMN "%s" TO temp_change_size' % (self._table, k)) # not_a_user_entry3225 cr.execute('ALTER TABLE "%s" RENAME COLUMN "%s" TO temp_change_size' % (self._table, k)) # not_a_user_entry
3224 cr.execute('ALTER TABLE "%s" ADD COLUMN "%s" VARCHAR(%d)' % (self._table, k, f.size)) # not_a_user_entry3226 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