[Fmsystem-commits] [16607] more on integration

[sigurdne]

Revision: 16607
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16607
Author:   sigurdne
Date:     2017-04-21 04:27:47 -0400 (Fri, 21 Apr 2017)
Log Message:
-----------
more on integration

Modified Paths:
--------------
    trunk/property/setup/tables_current.inc.php
    trunk/property/setup/tables_update.inc.php

Modified: trunk/property/setup/tables_current.inc.php
===================================================================
--- trunk/property/setup/tables_current.inc.php 2017-04-21 05:22:20 UTC (rev 
16606)
+++ trunk/property/setup/tables_current.inc.php 2017-04-21 08:27:47 UTC (rev 
16607)
@@ -1497,10 +1497,11 @@
                ),
                'fm_ecodimb_role_user_substitute' => array(
                        'fd' => array(
+                               'id' => array('type' => 'auto', 'precision' => 
'4', 'nullable' => False),
                                'user_id' => array('type' => 'int', 'precision' 
=> '4', 'nullable' => False),
                                'substitute_user_id' => array('type' => 'int', 
'precision' => '4', 'nullable' => False),
                        ),
-                       'pk' => array('user_id', 'substitute_user_id'),
+                       'pk' => array('id'),
                        'ix' => array(),
                        'fk' => array(),
                        'uc' => array()

Modified: trunk/property/setup/tables_update.inc.php
===================================================================
--- trunk/property/setup/tables_update.inc.php  2017-04-21 05:22:20 UTC (rev 
16606)
+++ trunk/property/setup/tables_update.inc.php  2017-04-21 08:27:47 UTC (rev 
16607)
@@ -9528,10 +9528,11 @@
                $GLOBALS['phpgw_setup']->oProc->CreateTable(
                        'fm_ecodimb_role_user_substitute', array(
                                'fd' => array(
+                                       'id' => array('type' => 'auto', 
'precision' => '4', 'nullable' => False),
                                        'user_id' => array('type' => 'int', 
'precision' => '4', 'nullable' => False),
                                        'substitute_user_id' => array('type' => 
'int', 'precision' => '4', 'nullable' => False),
                                ),
-                               'pk' => array('user_id', 'substitute_user_id'),
+                               'pk' => array('id'),
                                'ix' => array(),
                                'fk' => array(),
                                'uc' => array()