Sfoglia il codice sorgente

Dehardcoded against the DB engine (now defaults to myisam)

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@776 a333f486-631f-4898-b8df-5754b55c2be0
romainq 15 anni fa
parent
commit
08a639342a
2 ha cambiato i file con 11 aggiunte e 4 eliminazioni
  1. 8 1
      core/metamodel.class.php
  2. 3 3
      pages/testlist.inc.php

+ 8 - 1
core/metamodel.class.php

@@ -97,6 +97,13 @@ define('OPT_ATT_MUSTCHANGE', 8);
  */
 define('OPT_ATT_MUSTPROMPT', 16);
 
+/**
+ * DB Engine -should be moved into CMDBSource 
+ *
+ * @package     iTopORM
+ */
+//define('MYSQL_ENGINE', 'innodb');
+define('MYSQL_ENGINE', 'myisam');
 
 
 
@@ -2676,7 +2683,7 @@ abstract class MetaModel
 			if (!CMDBSource::IsTable($sTable))
 			{
 				$aErrors[$sClass]['*'][] = "table '$sTable' could not be found into the DB";
-				$aSugFix[$sClass]['*'][] = "CREATE TABLE `$sTable` (`$sKeyField` INT(11) NOT NULL $sAutoIncrement PRIMARY KEY) ENGINE = innodb CHARACTER SET utf8 COLLATE utf8_unicode_ci";
+				$aSugFix[$sClass]['*'][] = "CREATE TABLE `$sTable` (`$sKeyField` INT(11) NOT NULL $sAutoIncrement PRIMARY KEY) ENGINE = ".MYSQL_ENGINE." CHARACTER SET utf8 COLLATE utf8_unicode_ci";
 			}
 			// Check that the key field exists
 			//

+ 3 - 3
pages/testlist.inc.php

@@ -39,9 +39,9 @@ class TestSQLQuery extends TestScenarioOnDB
 	protected function DoPrepare()
 	{
 		parent::DoPrepare();
-		cmdbSource::CreateTable('CREATE TABLE `myTable` (myKey INT(11) NOT NULL auto_increment, column1 VARCHAR(255), column2 VARCHAR(255), PRIMARY KEY (`myKey`)) ENGINE = innodb');
-		cmdbSource::CreateTable('CREATE TABLE `myTable1` (myKey1 INT(11) NOT NULL auto_increment, column1_1 VARCHAR(255), column1_2 VARCHAR(255), PRIMARY KEY (`myKey1`)) ENGINE = innodb');
-		cmdbSource::CreateTable('CREATE TABLE `myTable2` (myKey2 INT(11) NOT NULL auto_increment, column2_1 VARCHAR(255), column2_2 VARCHAR(255), PRIMARY KEY (`myKey2`)) ENGINE = innodb');
+		cmdbSource::CreateTable('CREATE TABLE `myTable` (myKey INT(11) NOT NULL auto_increment, column1 VARCHAR(255), column2 VARCHAR(255), PRIMARY KEY (`myKey`)) ENGINE = '.MYSQL_ENGINE);
+		cmdbSource::CreateTable('CREATE TABLE `myTable1` (myKey1 INT(11) NOT NULL auto_increment, column1_1 VARCHAR(255), column1_2 VARCHAR(255), PRIMARY KEY (`myKey1`)) ENGINE = '.MYSQL_ENGINE);
+		cmdbSource::CreateTable('CREATE TABLE `myTable2` (myKey2 INT(11) NOT NULL auto_increment, column2_1 VARCHAR(255), column2_2 VARCHAR(255), PRIMARY KEY (`myKey2`)) ENGINE = '.MYSQL_ENGINE);
 	}
 
 	protected function DoExecute()