Changeset 521ce04 for db_struct.sql

Timestamp:

May 24, 2011, 1:41:18 PM (12 years ago)

Author:

Blacklight <blacklight@…>

Branches:

master

Children:

bf4166d

Parents:

814b23e (diff), 91088ae (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

• Слияние с веткой new_poseditor

File:

• db_struct.sql (modified) (9 diffs)

db_struct.sql

@@ -959 +959 @@
 CREATE TABLE IF NOT EXISTS `news` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
+  `type` varchar(8) NOT NULL,
   `title` varchar(64) NOT NULL,
   `text` text NOT NULL,
   `date` datetime NOT NULL,
-  `owner` int(11) NOT NULL,
-  UNIQUE KEY `id` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+  `autor` int(11) NOT NULL,
+  `ex_date` date NOT NULL,
+  `img_ext` varchar(4) NOT NULL,
+  UNIQUE KEY `id` (`id`),
+  KEY `type` (`type`),
+  KEY `ex_date` (`ex_date`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+
 
 --
@@ -1078 +1084 @@
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `search_str` varchar(16) NOT NULL,
-  `replace_str` varchar(256) NOT NULL,
+  `replace_str` varchar(512) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `id` (`id`),
@@ -1383 +1389 @@
 CREATE TABLE IF NOT EXISTS `users` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(30) NOT NULL,
-  `pass` varchar(35) NOT NULL,
-  `passch` varchar(35) NOT NULL,
-  `email` varchar(50) NOT NULL,
+  `name` varchar(32) NOT NULL,
+  `pass` varchar(32) NOT NULL,
+  `passch` varchar(32) NOT NULL,
+  `email` varchar(64) NOT NULL,
   `date_reg` datetime NOT NULL,
   `confirm` varchar(32) NOT NULL,
@@ -1392 +1398 @@
   `lastlogin` datetime NOT NULL,
   `rname` varchar(32) NOT NULL,
-  `tel` varchar(15) NOT NULL,
-  `adres` varchar(100) NOT NULL,
+  `tel` varchar(16) NOT NULL,
+  `adres` varchar(128) NOT NULL,
   `worker` tinyint(4) NOT NULL,
   UNIQUE KEY `id` (`id`),
@@ -1466 +1472 @@
 -- Дамп данных таблицы `users_data`
 --
-
-
 -- --------------------------------------------------------
 
@@ -1561 +1565 @@
 (6, 'generic', 'Общие объекты', ''),
 (7, 'sys_acl', 'Управление привилегиями', 'view,edit'),
-(8, 'doc_realiz', 'Реализация', 'view,edit,create,apply,cancel,forcecancel,delete,today_cancel'),
+(8, 'doc_realizaciya', 'Реализация', 'view,edit,create,apply,cancel,forcecancel,delete,today_cancel'),
 (9, 'doc_zayavka', 'Документ заявки', 'view,edit,create,apply,cancel,forcecancel,delete,today_cancel'),
 (10, 'doc_kompredl', 'Коммерческое предложение', 'view,edit,create,apply,cancel,forcecancel,delete,today_cancel'),
@@ -1603 +1607 @@
 
 CREATE TABLE IF NOT EXISTS `wiki` (
-  `name` varchar(50) NOT NULL,
+  `name` varchar(64) NOT NULL,
   `date` datetime NOT NULL,
   `autor` int(11) NOT NULL,
@@ -1609 +1613 @@
   `changeautor` int(11) NOT NULL,
   `text` text NOT NULL,
+  `img_ext` varchar(4) NOT NULL,
   UNIQUE KEY `name` (`name`),
   KEY `date` (`date`),
@@ -1632 +1637 @@
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `uid` int(11) NOT NULL DEFAULT '0',
-  `comment` varchar(50) NOT NULL,
+  `comment` varchar(64) NOT NULL,
   UNIQUE KEY `id` (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;