diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-10-14 02:00:46 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-10-14 02:00:46 +0200 |
| commit | 7f42970ba005ca27f85e4375267bd32b8ad35341 (patch) | |
| tree | 06627c4c6673676e18ff5ebd11f46d5b581ff6ab | |
| parent | 85407986ead970b60ca75fdada9de774248c9a81 (diff) | |
| download | forums-7f42970ba005ca27f85e4375267bd32b8ad35341.tar forums-7f42970ba005ca27f85e4375267bd32b8ad35341.tar.gz forums-7f42970ba005ca27f85e4375267bd32b8ad35341.tar.bz2 forums-7f42970ba005ca27f85e4375267bd32b8ad35341.tar.xz forums-7f42970ba005ca27f85e4375267bd32b8ad35341.zip | |
[feature/remove-imagesets] Fix create_schema_files, get rid of imagesets
PHPBB3-10336
| -rw-r--r-- | phpBB/develop/create_schema_files.php | 31 | ||||
| -rw-r--r-- | phpBB/install/schemas/mssql_schema.sql | 2 |
2 files changed, 1 insertions, 32 deletions
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'), diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql index fe69670ded..b78a1b7fdc 100644 --- a/phpBB/install/schemas/mssql_schema.sql +++ b/phpBB/install/schemas/mssql_schema.sql @@ -1307,7 +1307,7 @@ CREATE TABLE [phpbb_styles] ( [style_copyright] [varchar] (255) DEFAULT ('') NOT NULL , [style_active] [int] DEFAULT (1) NOT NULL , [template_id] [int] DEFAULT (0) NOT NULL , - [theme_id] [int] DEFAULT (0) NOT NULL + [theme_id] [int] DEFAULT (0) NOT NULL ) ON [PRIMARY] GO |