[pLog-svn] r3166 - in plog/trunk: . class/database/pdb/datadictclass/database/pdb/drivers

[Jon Daley]

 	I didn't run through the whole wizard, but the first 
pre-installation step says everything is good to go.

On Thu, 30 Mar 2006, Jon Daley wrote:
> 	I can try it, probably not until this weekend.
>
> On Fri, 31 Mar 2006, Mark Wu wrote:
>
>> Hi Oscar & Jon:
>> 
>> Can you kindly try it works in your environment or not?
>> 
>> It works in my environment (winxp and mysql 4.1).
>> 
>> Mark
>> 
>>> -----Original Message-----
>>> From: plog-svn-bounces at devel.lifetype.net
>>> [mailto:plog-svn-bounces at devel.lifetype.net] On Behalf Of
>>> mark at devel.lifetype.net
>>> Sent: Friday, March 31, 2006 10:52 AM
>>> To: plog-svn at devel.lifetype.net
>>> Subject: [pLog-svn] r3166 - in plog/trunk: .
>>> class/database/pdb/datadictclass/database/pdb/drivers
>>> 
>>> Author: mark
>>> Date: 2006-03-31 02:51:36 +0000 (Fri, 31 Mar 2006) New Revision: 3166
>>> 
>>> Modified:
>>>    plog/trunk/class/database/pdb/datadict/pdbbasedatadict.class.php
>>>    plog/trunk/class/database/pdb/drivers/pdbdriverbase.class.php
>>>    plog/trunk/class/database/pdb/drivers/pdbmysqldriver.class.php
>>>    plog/trunk/wizard.php
>>> Log:
>>> I think we can install properly through the new installation
>>> wizard, I just fix the following:
>>> 
>>> 1. Fix some missing variable in dict class to make the table
>>> option works 2. Fix a reference variable error in mysql
>>> driver 3. Change the createTable option in wizard.php to make
>>> it generate the table with TYPE=MyISAM
>>> 
>>> Modified:
>>> plog/trunk/class/database/pdb/datadict/pdbbasedatadict.class.php
>>> ===================================================================
>>> ---
>>> plog/trunk/class/database/pdb/datadict/pdbbasedatadict.cl
>>> ass.php	2006-03-30 18:58:06 UTC (rev 3165)
>>> +++
>>> plog/trunk/class/database/pdb/datadict/pdbbasedatadict.cl
>>> ass.php	2006-03-31 02:51:36 UTC (rev 3166)
>>> @@ -704,7 +704,7 @@
>>>              if
>>> (isset($tableoptions[$this->upperName.'_CONSTRAINTS']))
>>>                  $s .=
>>> "\n".$tableoptions[$this->upperName.'_CONSTRAINTS'];
>>> 
>>> -            $s .= "\n)";
>>> +            $s .= "\n) ";
>>>              if (isset($tableoptions[$this->upperName])) $s
>>> .= $tableoptions[$this->upperName];
>>>              $sql[] = $s;
>>> 
>>> 
>>> Modified:
>>> plog/trunk/class/database/pdb/drivers/pdbdriverbase.class.php
>>> ===================================================================
>>> ---
>>> plog/trunk/class/database/pdb/drivers/pdbdriverbase.class.php
>>> 2006-03-30 18:58:06 UTC (rev 3165)
>>> +++
>>> plog/trunk/class/database/pdb/drivers/pdbdriverbase.class.php
>>> 2006-03-31 02:51:36 UTC (rev 3166)
>>> @@ -304,6 +304,7 @@
>>>
>>>              $class->dataProvider = $this;
>>>              $class->connection = &$this;
>>> +            $class->upperName = strtoupper($driverName);
>>>
>>>              return( $class );
>>>          }
>>> 
>>> Modified:
>>> plog/trunk/class/database/pdb/drivers/pdbmysqldriver.class.php
>>> ===================================================================
>>> ---
>>> plog/trunk/class/database/pdb/drivers/pdbmysqldriver.cl
>>> ass.php	2006-03-30 18:58:06 UTC (rev 3165)
>>> +++
>>> plog/trunk/class/database/pdb/drivers/pdbmysqldriver.cl
>>> ass.php	2006-03-31 02:51:36 UTC (rev 3166)
>>> @@ -136,7 +136,7 @@
>>>  		/**
>>>  		 * @see PDbDriverBase::getDriverDataDictionary()
>>>  		 */
>>> -        function &getDriverDataDictionary()
>>> +        function getDriverDataDictionary()
>>>          {
>>>              return( PDbDriverBase::getDriverDataDictionary(
>>> 'mysql' ));
>>>          }
>>> 
>>> Modified: plog/trunk/wizard.php
>>> ===================================================================
>>> --- plog/trunk/wizard.php	2006-03-30 18:58:06 UTC (rev 3165)
>>> +++ plog/trunk/wizard.php	2006-03-31 02:51:36 UTC (rev 3166)
>>> @@ -635,6 +635,7 @@
>>>              global $Inserts;
>>>
>>>              $createDb = $this->_request->getValue(
>>> "createDatabase" );
>>> +            $message = '';
>>>
>>>              // only check for errors in case the database
>>> table should already exist!
>>>              if( !$createDb ) {
>>> @@ -697,11 +698,11 @@
>>>              // create a data dictionary to give us the right
>>> sql code needed to create the tables
>>>              $dict = NewDataDictionary( $this->_db );
>>> 
>>> -            // create the tables
>>> +           // create the tables
>>>              $errors = false;
>>>
>>>              foreach( $Tables as $name => $table ) {
>>> -                $sqlarray = $dict->CreateTableSQL(
>>> $this->_dbPrefix.$name, $table );
>>> +                $sqlarray = $dict->CreateTableSQL(
>>> + $this->_dbPrefix.$name, $table, array( "MYSQL" => "TYPE=MyISAM" ) );
>>>
>>>                  // each table may need more than one sql
>>> query because of indexes, triggers, etc...
>>>                  $ok = true;
>>> @@ -1113,6 +1114,10 @@
>>>                  // generate the code with the changes for the table
>>>                  $sqlarray = $dict->ChangeTableSQL(
>>> $this->_dbPrefix.$name, $table );
>>> 
>>> +                echo "===";
>>> +                print_r($sqlarray);
>>> +                echo "===";
>>> +
>>>                  //print("<hr/><pre>");
>>>                  foreach( $sqlarray as $sql ) {
>>>                      //print($sql."<br/>");
>>> 
>>> _______________________________________________
>>> pLog-svn mailing list
>>> pLog-svn at devel.lifetype.net
>>> http://devel.lifetype.net/mailman/listinfo/plog-svn
>> 
>> _______________________________________________
>> pLog-svn mailing list
>> pLog-svn at devel.lifetype.net
>> http://devel.lifetype.net/mailman/listinfo/plog-svn
>> 
>
> **************************************
> Jon Daley
> http://jon.limedaley.com/
>
> If the person you are talking to doesn't appear to be
> listening, be patient.  It may simply be that he has
> a small piece of fluff in his ear.
> -- Pooh's Little Instruction Book
> _______________________________________________
> pLog-svn mailing list
> pLog-svn at devel.lifetype.net
> http://devel.lifetype.net/mailman/listinfo/plog-svn
>

**************************************
Jon Daley
http://jon.limedaley.com/

It's kind of fun to do the impossible.
-- Walt Disney