From 7f42970ba005ca27f85e4375267bd32b8ad35341 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 14 Oct 2011 02:00:46 +0200
Subject: [feature/remove-imagesets] Fix create_schema_files, get rid of
 imagesets

PHPBB3-10336
---
 phpBB/develop/create_schema_files.php | 31 -------------------------------
 1 file changed, 31 deletions(-)

(limited to 'phpBB/develop/create_schema_files.php')

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 2057d292b7..dfdb66aa73 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1639,14 +1639,12 @@ function get_schema_struct()
 			'style_active'			=> array('BOOL', 1),
 			'template_id'			=> array('UINT', 0),
 			'theme_id'				=> array('UINT', 0),
-			'imageset_id'			=> array('UINT', 0),
 		),
 		'PRIMARY_KEY'	=> 'style_id',
 		'KEYS'			=> array(
 			'style_name'		=> array('UNIQUE', 'style_name'),
 			'template_id'		=> array('INDEX', 'template_id'),
 			'theme_id'			=> array('INDEX', 'theme_id'),
-			'imageset_id'		=> array('INDEX', 'imageset_id'),
 		),
 	);
 
@@ -1679,35 +1677,6 @@ function get_schema_struct()
 		),
 	);
 
-	$schema_data['phpbb_styles_imageset'] = array(
-		'COLUMNS'		=> array(
-			'imageset_id'				=> array('UINT', NULL, 'auto_increment'),
-			'imageset_name'				=> array('VCHAR_UNI:255', ''),
-			'imageset_copyright'		=> array('VCHAR_UNI', ''),
-			'imageset_path'				=> array('VCHAR:100', ''),
-		),
-		'PRIMARY_KEY'		=> 'imageset_id',
-		'KEYS'				=> array(
-			'imgset_nm'			=> array('UNIQUE', 'imageset_name'),
-		),
-	);
-
-	$schema_data['phpbb_styles_imageset_data'] = array(
-		'COLUMNS'		=> array(
-			'image_id'				=> array('UINT', NULL, 'auto_increment'),
-			'image_name'			=> array('VCHAR:200', ''),
-			'image_filename'		=> array('VCHAR:200', ''),
-			'image_lang'			=> array('VCHAR:30', ''),
-			'image_height'			=> array('USINT', 0),
-			'image_width'			=> array('USINT', 0),
-			'imageset_id'			=> array('UINT', 0),
-		),
-		'PRIMARY_KEY'		=> 'image_id',
-		'KEYS'				=> array(
-			'i_d'			=> array('INDEX', 'imageset_id'),
-		),
-	);
-
 	$schema_data['phpbb_topics'] = array(
 		'COLUMNS'		=> array(
 			'topic_id'					=> array('UINT', NULL, 'auto_increment'),
-- 
cgit v1.2.1


From 7fa14e654ad8880613897b45f5effb287d3bfd2d Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 14 Oct 2011 03:12:44 +0200
Subject: [ticket/10413] Make create_schema_files usable

PHPBB3-10413
---
 phpBB/develop/create_schema_files.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'phpBB/develop/create_schema_files.php')

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index efe8837b26..9649997412 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -12,11 +12,7 @@
 * If you overwrite the original schema files please make sure you save the file with UNIX linefeeds.
 */
 
-die("Please read the first lines of this script for instructions on how to enable it");
-
-@set_time_limit(0);
-
-$schema_path = './../install/schemas/';
+$schema_path = dirname(__FILE__).'/../install/schemas/';
 
 if (!is_writable($schema_path))
 {
@@ -242,7 +238,7 @@ $supported_dbms = array('firebird', 'mssql', 'mysql_40', 'mysql_41', 'oracle', '
 
 foreach ($supported_dbms as $dbms)
 {
-	$fp = fopen($schema_path . '_' . $dbms . '_schema.sql', 'wt');
+	$fp = fopen($schema_path . '' . $dbms . '_schema.sql', 'wt');
 
 	$line = '';
 
-- 
cgit v1.2.1


From 8cf22f552935417911306cb2830d7522791c9098 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 14 Oct 2011 03:41:02 +0200
Subject: [ticket/10189] Add "automatically generated" comment into
 schema-files

PHPBB3-10189
---
 phpBB/develop/create_schema_files.php | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'phpBB/develop/create_schema_files.php')

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index efe8837b26..05acf7177d 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -246,6 +246,32 @@ foreach ($supported_dbms as $dbms)
 
 	$line = '';
 
+	switch ($dbms)
+	{
+		case 'mysql_40':
+		case 'mysql_41':
+		case 'firebird':
+		case 'sqlite':
+			fwrite($fp, "# DO NOT EDIT THIS FILE, IT IS GENERATED\n");
+			fwrite($fp, "#\n");
+			fwrite($fp, "# To change the contents of this file, edit\n");
+			fwrite($fp, "# phpBB/develop/create_schema_files.php and\n");
+			fwrite($fp, "# run it.\n");
+		break;
+
+		case 'mssql':
+		case 'oracle':
+		case 'postgres':
+			fwrite($fp, "/*\n");
+			fwrite($fp, " * DO NOT EDIT THIS FILE, IT IS GENERATED\n");
+			fwrite($fp, " *\n");
+			fwrite($fp, " * To change the contents of this file, edit\n");
+			fwrite($fp, " * phpBB/develop/create_schema_files.php and\n");
+			fwrite($fp, " * run it.\n");
+			fwrite($fp, " */\n\n");
+		break;
+	}
+
 	// Write Header
 	switch ($dbms)
 	{
-- 
cgit v1.2.1


From c3f3435228accc44e2fd8d358c21b81f8ec66d87 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 14 Oct 2011 04:29:28 +0200
Subject: [ticket/10189] Get rid of $id$ from schema files

PHPBB3-10189
---
 phpBB/develop/create_schema_files.php | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'phpBB/develop/create_schema_files.php')

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 05acf7177d..9ce5f72922 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -246,6 +246,7 @@ foreach ($supported_dbms as $dbms)
 
 	$line = '';
 
+	// Write Header
 	switch ($dbms)
 	{
 		case 'mysql_40':
@@ -272,37 +273,21 @@ foreach ($supported_dbms as $dbms)
 		break;
 	}
 
-	// Write Header
 	switch ($dbms)
 	{
-		case 'mysql_40':
-		case 'mysql_41':
-			$line = "#\n# \$I" . "d: $\n#\n\n";
-		break;
-
 		case 'firebird':
-			$line = "#\n# \$I" . "d: $\n#\n\n";
 			$line .= custom_data('firebird') . "\n";
 		break;
 
 		case 'sqlite':
-			$line = "#\n# \$I" . "d: $\n#\n\n";
 			$line .= "BEGIN TRANSACTION;\n\n";
 		break;
 
-		case 'mssql':
-			$line = "/*\n\n \$I" . "d: $\n\n*/\n\n";
-			// no need to do this, no transaction support for schema changes
-			//$line .= "BEGIN TRANSACTION\nGO\n\n";
-		break;
-
 		case 'oracle':
-			$line = "/*\n\n \$I" . "d: $\n\n*/\n\n";
 			$line .= custom_data('oracle') . "\n";
 		break;
 
 		case 'postgres':
-			$line = "/*\n\n \$I" . "d: $\n\n*/\n\n";
 			$line .= "BEGIN;\n\n";
 			$line .= custom_data('postgres') . "\n";
 		break;
-- 
cgit v1.2.1


From 8d33dea2cdc68473fbcf3c45ac8bdbe8fd185054 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 16 Oct 2011 19:30:33 +0200
Subject: [ticket/10413] Fix CS

PHPBB3-10413
---
 phpBB/develop/create_schema_files.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/develop/create_schema_files.php')

diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 9649997412..1ba03707d0 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -12,7 +12,7 @@
 * If you overwrite the original schema files please make sure you save the file with UNIX linefeeds.
 */
 
-$schema_path = dirname(__FILE__).'/../install/schemas/';
+$schema_path = dirname(__FILE__) . '/../install/schemas/';
 
 if (!is_writable($schema_path))
 {
@@ -238,7 +238,7 @@ $supported_dbms = array('firebird', 'mssql', 'mysql_40', 'mysql_41', 'oracle', '
 
 foreach ($supported_dbms as $dbms)
 {
-	$fp = fopen($schema_path . '' . $dbms . '_schema.sql', 'wt');
+	$fp = fopen($schema_path . $dbms . '_schema.sql', 'wt');
 
 	$line = '';
 
-- 
cgit v1.2.1