Ignore:
Timestamp:
02/04/10 15:24:25 (14 years ago)
Author:
pedroerp
Message:

Ticket #899 - Utilizando a porta padrão do db expresso nas demais conexões de setup do workflow.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/workflow/setup/tables_update.inc.php

    r1979 r1981  
    2020                                'dbname' => $GLOBALS['phpgw']->ADOdb->database, 
    2121                                'host' => $GLOBALS['phpgw']->ADOdb->host, 
     22                                'port' => $GLOBALS['phpgw']->ADOdb->port, 
    2223                                'user' => $GLOBALS['phpgw']->ADOdb->user, 
    2324                                'password' => $GLOBALS['phpgw']->ADOdb->password); 
    … …  
    415416                        /* connect to the new database */ 
    416417                        $workflowDB = $GLOBALS['phpgw']->ADOdb; 
    417                         if ($workflowDB->connect($workflowHostInfo['host'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 
     418                        if ($workflowDB->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 
    418419                        { 
    419420                                /* create a sample application (Music CD Loan) */ 
    … …  
    482483 
    483484                        /* reconnect to the previous database */ 
    484                         $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 
     485                        $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 
    485486                } 
    486487 
    … …  
    514515                        /* connect to the workflow database */ 
    515516                        $workflowDB = $GLOBALS['phpgw']->ADOdb; 
    516                         if ($workflowDB->connect($workflowHostInfo['host'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 
     517                        if ($workflowDB->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 
    517518                        { 
    518519                                /* change the type of the employee ID (funcionario_id field) */ 
    … …  
    538539 
    539540                        /* reconnect to the previous database */ 
    540                         $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 
     541                        $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 
    541542                } 
    542543 
    … …  
    573574                        /* connect to the new database */ 
    574575                        $workflowDB = $GLOBALS['phpgw']->ADOdb; 
    575                         if ($workflowDB->connect($workflowHostInfo['host'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 
     576                        if ($workflowDB->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 
    576577                        { 
    577578                                /* add a new column to the area table (orgchart) */ 
    … …  
    581582 
    582583                        /* reconnect to the previous database */ 
    583                         $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 
     584                        $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 
    584585                } 
    585586 
    … …  
    638639                        /* connect to the Workflow database */ 
    639640                        $workflowDB = $GLOBALS['phpgw']->ADOdb; 
    640                         if ($workflowDB->connect($workflowHostInfo['host'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 
     641                        if ($workflowDB->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 
    641642                        { 
    642643                                $result = $GLOBALS['phpgw']->ADOdb->query('SELECT admin_access_id, tipo, numvalue, nivel FROM admin_access'); 
    … …  
    668669 
    669670                        /* reconnect to the previous database */ 
    670                         $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 
     671                        $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 
    671672                        foreach ($adminAccessData as $newRow) 
    672673                                $result = $GLOBALS['phpgw']->ADOdb->query("INSERT INTO egw_wf_admin_access(admin_access_id, tipo, numvalue, nivel) VALUES (?, ?, ?, ?)", $newRow); 
    … …  
    694695                        /* connect to the new database */ 
    695696                        $workflowDB = $GLOBALS['phpgw']->ADOdb; 
    696                         if ($workflowDB->connect($workflowHostInfo['host'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 
     697                        if ($workflowDB->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 
    697698                        { 
    698699                                /* add a new column to the funcionario_status table (orgchart) */ 
    … …  
    703704 
    704705                        /* reconnect to the previous database */ 
    705                         $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 
     706                        $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 
    706707                } 
    707708 
    … …  
    738739                        /* connect to the new database */ 
    739740                        $workflowDB = $GLOBALS['phpgw']->ADOdb; 
    740                         if ($workflowDB->connect($workflowHostInfo['host'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 
     741                        if ($workflowDB->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 
    741742                        { 
    742743                                /* add a new column to the organizacao table (orgchart) */ 
    … …  
    745746 
    746747                        /* reconnect to the previous database */ 
    747                         $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 
     748                        $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 
    748749                } 
    749750 
    … …  
    780781                        /* connect to the new database */ 
    781782                        $workflowDB = $GLOBALS['phpgw']->ADOdb; 
    782                         if ($workflowDB->connect($workflowHostInfo['host'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 
     783                        if ($workflowDB->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 
    783784                        { 
    784785                                /* create the new tables and add the referencial constraints */ 
    … …  
    808809 
    809810                        /* reconnect to the previous database */ 
    810                         $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 
     811                        $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 
    811812                } 
    812813 
    … …  
    933934                        /* connect to the new database */ 
    934935                        $workflowDB = $GLOBALS['phpgw']->ADOdb; 
    935                         if ($workflowDB->connect($workflowHostInfo['host'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 
     936                        if ($workflowDB->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 
    936937                        { 
    937938                                $result = $workflowDB->query("SELECT 1 FROM pg_tables WHERE (schemaname = 'public') AND (tablename = 'funcionario_status')"); 
    … …  
    957958                        } 
    958959                        /* reconnect to the previous database */ 
    959                         $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 
     960                        $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 
    960961                } 
    961962 
    … …  
    10391040                        /* connect to the new database */ 
    10401041                        $workflowDB = $GLOBALS['phpgw']->ADOdb; 
    1041                         if ($workflowDB->connect($workflowHostInfo['host'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 
     1042                        if ($workflowDB->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 
    10421043                        { 
    10431044                                /* add a new column to the area organization (orgchart) */ 
    … …  
    10481049 
    10491050                        /* reconnect to the previous database */ 
    1050                         $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 
     1051                        $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 
    10511052                } 
    10521053 
    … …  
    10651066                        /* connect to the new database */ 
    10661067                        $workflowDB = $GLOBALS['phpgw']->ADOdb; 
    1067                         if ($workflowDB->connect($workflowHostInfo['host'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 
     1068                        if ($workflowDB->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 
    10681069                        { 
    10691070                                /* gather some information */ 
    … …  
    11091110 
    11101111                        /* reconnect to the previous database */ 
    1111                         $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 
     1112                        $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 
    11121113                } 
    11131114 
    … …  
    11571158                        /* connect to workflow database */ 
    11581159                        $workflowDB = $GLOBALS['phpgw']->ADOdb; 
    1159                         if ($workflowDB->connect($workflowHostInfo['host'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 
     1160                        if ($workflowDB->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], 'workflow')) 
    11601161                        { 
    11611162                                /* add the new columns */ 
    … …  
    11831184 
    11841185                        /* reconnect to the previous database */ 
    1185                         $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 
     1186                        $GLOBALS['phpgw']->ADOdb->connect($workflowHostInfo['host'].":".$workflowHostInfo['port'], $workflowHostInfo['user'], $workflowHostInfo['password'], $workflowHostInfo['dbname']); 
    11861187                } 
    11871188                #updating the current version 
Note: See TracChangeset for help on using the changeset viewer.