ufload3 2.2__tar.gz → 2.5__tar.gz

{ufload3-2.2/ufload3.egg-info → ufload3-2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ufload3
-Version: 2.2
+Version: 2.5
 Summary: UniField  python3 loader
 Author: MSF
 Project-URL: Homepage, https://github.com/Unifield/ufload3

{ufload3-2.2 → ufload3-2.5}/ufload3/__init__.py

@@ -1,7 +1,7 @@
 from . import cloud; assert cloud
 from . import db; assert db
 
-__version__ = '2.2'
+__version__ = '2.5'
 
 # null progress, can be overridden by importers
 def _progress(p):

{ufload3-2.2 → ufload3-2.5}/ufload3/db.py

@@ -94,7 +94,15 @@ def psql(args, sql, db='postgres', silent=False):
 
 def psql_file(args, file, db='postgres', silent=False):
     return _run(args, mkpsql_file(args, file, db), silent)
-    
+
+def _check_column_exists(args, table, column, db):
+    v = _run(args, mkpsql(args, """SELECT c.relname
+            FROM pg_class c, pg_attribute a
+            WHERE c.relname='%s' AND a.attname='%s' AND c.oid=a.attrelid;""" % (table, column), db), get_out=True)
+    if v and v[0] == 0:
+        return v[1].strip()
+    return False
+
 def load_zip_into(args, db, f, sz):
     if sz == 0:
         ufload3.progress("Note: No progress percent available.")
@@ -391,6 +399,13 @@ def delive(args, db):
 
     rc = psql(args, 'alter table sync_client_sync_server_connection ADD COLUMN IF NOT EXISTS ufload_automatic_patching_prod_value boolean;', db)
     rc = psql(args, 'update sync_client_sync_server_connection set ufload_automatic_patching_prod_value=automatic_patching;', db)
+
+    rc = psql(args, 'alter table users_last_login ADD COLUMN IF NOT EXISTS date_prod_value timestamp without time zone;', db)
+    rc = psql(args, 'update users_last_login set date_prod_value=date;', db)
+
+    rc = psql(args, 'alter table res_users ADD COLUMN IF NOT EXISTS user_email_prod_value varchar(240);', db)
+    rc = psql(args, 'update res_users set user_email_prod_value=user_email;', db)
+
     rc = psql(args, 'update sync_client_sync_server_connection set automatic_patching = \'f\', protocol = \'xmlrpc\', login = \'%s\', database = \'%s\', host = \'127.0.0.1\', port = %d;' % (adminuser, ss, port), db)
     if rc != 0:
         return rc
@@ -414,14 +429,23 @@ def delive(args, db):
     if rc != 0:
         return rc
     # Automated import settings
-    psql(args, 'UPDATE automated_import SET report_path=\'\', src_path=\'\', ftp_url=\'\', dest_path=\'\', ftp_ok=\'f\', ftp_port=\'\',dest_path_failure=\'\', ftp_login=\'\', ftp_password=\'\', ftp_protocol=\'\';', db)
+    psql(args, 'UPDATE automated_import SET active=\'f\', report_path=\'\', src_path=\'\', ftp_url=\'\', dest_path=\'\', ftp_ok=\'f\', ftp_port=\'\',dest_path_failure=\'\', ftp_login=\'\', ftp_password=\'\', ftp_protocol=\'\';', db)
+
+    if _check_column_exists(args, "automated_import", "sharepoint_cert", db):
+        psql(args, 'UPDATE automated_import SET sharepoint_cert=NULL;', db)
+
+    if _check_column_exists(args, "msf_instance", "cloud_cert_content", db):
+        psql(args, 'UPDATE msf_instance SET cloud_cert_content=NULL;', db)
+
+    if _check_column_exists(args, "automated_import", "email_notification_type", db):
+        psql(args, 'UPDATE automated_import set email=NULL, email2=NULL, email3=NULL;', db)
 
     # Automated export jobs
     rc = psql(args, 'update ir_cron set active = \'f\' where model = \'automated.export\';', db)
     if rc != 0:
         return rc
     # Automated export settings
-    psql(args, 'UPDATE automated_export SET report_path=\'\', ftp_url=\'\', dest_path=\'\', ftp_ok=\'f\', ftp_port=\'\',dest_path_failure=\'\', ftp_login=\'\', ftp_password=\'\', ftp_protocol=\'\';', db)
+    psql(args, 'UPDATE automated_export SET active=\'f\', report_path=\'\', ftp_url=\'\', dest_path=\'\', ftp_ok=\'f\', ftp_port=\'\',dest_path_failure=\'\', ftp_login=\'\', ftp_password=\'\', ftp_protocol=\'\';', db)
 
     # Now we check for arguments allowing auto-sync and silent-upgrade
     if args.autosync:

{ufload3-2.2 → ufload3-2.5/ufload3.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ufload3
-Version: 2.2
+Version: 2.5
 Summary: UniField  python3 loader
 Author: MSF
 Project-URL: Homepage, https://github.com/Unifield/ufload3