- simplifying schema for the option table

5 files changed, 12 insertions, 17 deletions

diff --git a/core/Option.php b/core/Option.php
index a34a3e8f73..d7158509d1 100644
--- a/core/Option.php
+++ b/core/Option.php
@@ -1,6 +1,4 @@
 <?php
-
-
 //TODO 
 // - design Caching, in terms of API, piwik.php loading data for a given website (from one file)
 // - design Options, how WP plugins make use of it, reuse same pattern
@@ -28,13 +26,3 @@ function Piwik_UpdateOption($name, $value)
 	}
 }
 
-/**
- * 
- CREATE TABLE `piwik_trunk`.`option` (
-`idoption` BIGINT NOT NULL AUTO_INCREMENT ,
-`option_name` VARCHAR( 64 ) NOT NULL ,
-`option_value` LONGTEXT NOT NULL ,
-PRIMARY KEY ( `idoption` , `option_name` )
-) ENGINE = MYISAM 
- *
- */
diff --git a/core/Piwik.php b/core/Piwik.php
index 16cb618a0b..9e0ab7c0f8 100644
--- a/core/Piwik.php
+++ b/core/Piwik.php
@@ -601,10 +601,9 @@ class Piwik
 			",
 			
 			'option' => "CREATE TABLE {$prefixTables}option (
-								idoption BIGINT NOT NULL AUTO_INCREMENT ,
 								option_name VARCHAR( 64 ) NOT NULL ,
 								option_value LONGTEXT NOT NULL ,
-								PRIMARY KEY ( idoption , option_name )
+								PRIMARY KEY ( option_name )
 								)
 			",
 								
diff --git a/core/Updater.php b/core/Updater.php
index 0363b71038..2b26e333c5 100644
--- a/core/Updater.php
+++ b/core/Updater.php
@@ -142,7 +142,7 @@ class Piwik_Updater
 				}
 				else
 				{
-					$currentVersion = '0.01';
+					$currentVersion = '0.0.1';
 				}
 				$this->recordComponentSuccessfullyUpdated($name, $currentVersion);
 			}
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index 4536cebbb6..eccc3f33b9 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -203,8 +203,11 @@ class Piwik_Installation_Controller extends Piwik_Controller
 		{

 			Piwik::createTables();

 			Piwik::createAnonymousUser();

-			Piwik::createTablesIndex();

-			

+			Piwik::createTablesIndex();
+			require_once "Version.php";
+			require_once "Updater.php";

+			$updater = new Piwik_Updater();
+			$updater->recordComponentSuccessfullyUpdated('core', Piwik_Version::VERSION);

 			$view->tablesCreated = true;

 			$view->showNextStep = true;

 		}

diff --git a/tests/core/PHP_Related.test.php b/tests/core/PHP_Related.test.php
index 1d7709f5ab..5b71ac84c5 100644
--- a/tests/core/PHP_Related.test.php
+++ b/tests/core/PHP_Related.test.php
@@ -24,6 +24,11 @@ class Test_PHP_Related extends UnitTestCase
 	{
 	}
 	
+	function test_versionTrailingZero()
+	{
+		$this->assertTrue(version_compare('0.1','0.01') == 0);
+	}
+	
 	function test_equal()
 	{
 		//aaaaaaaaaaaahhhhhhhhhhhh