Changeset 57fb915 for db_struct.sql

Timestamp:

May 2, 2011, 12:37:27 PM (12 years ago)

Author:

Blacklight <blacklight@…>

Branches:

master

Children:

577bf9c

Parents:

b81f564 (diff), 085f143 (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 скопирваны изменеия из trunk. Подготовка к слиянию.

File:

• db_struct.sql (modified) (9 diffs)

db_struct.sql

@@ -29 +29 @@
   `id` int(11) NOT NULL auto_increment,
   `date` bigint(20) NOT NULL default '0',
-  `ip` varchar(30) NOT NULL default '',
-  `agent` varchar(100) NOT NULL default '',
-  `refer` varchar(200) NOT NULL,
-  `file` varchar(20) NOT NULL default '',
-  `query` varchar(50) NOT NULL default '',
+  `ip` varchar(32) NOT NULL default '',
+  `agent` varchar(128) NOT NULL default '',
+  `refer` varchar(128) NOT NULL,
+  `file` varchar(32) NOT NULL default '',
+  `query` varchar(128) NOT NULL default '',
   UNIQUE KEY `id` (`id`),
   KEY `time` (`date`),
@@ -54 +54 @@
 CREATE TABLE IF NOT EXISTS `currency` (
   `id` int(11) NOT NULL auto_increment,
-  `name` varchar(10) NOT NULL,
+  `name` varchar(8) NOT NULL,
   `coeff` decimal(8,4) NOT NULL,
   UNIQUE KEY `id` (`id`),
@@ -74 +74 @@
   `id` int(11) NOT NULL auto_increment,
   `group` int(11) NOT NULL,
-  `name` varchar(100) NOT NULL,
-  `fullname` varchar(200) NOT NULL,
+  `name` varchar(128) NOT NULL,
+  `fullname` varchar(256) NOT NULL,
   `tel` varchar(64) NOT NULL,
-  `adres` varchar(300) NOT NULL,
-  `gruzopol` varchar(300) NOT NULL,
+  `adres` varchar(512) NOT NULL,
+  `gruzopol` varchar(512) NOT NULL,
   `inn` varchar(24) NOT NULL,
   `dir_fio` varchar(128) NOT NULL,
@@ -84 +84 @@
   `pfio` varchar(128) NOT NULL,
   `pdol` varchar(128) NOT NULL,
-  `okevd` varchar(5) NOT NULL,
-  `okpo` varchar(10) NOT NULL,
-  `rs` varchar(22) NOT NULL,
-  `bank` varchar(50) NOT NULL,
-  `ks` varchar(50) NOT NULL,
-  `bik` varchar(12) NOT NULL,
-  `email` varchar(50) NOT NULL,
+  `okevd` varchar(8) NOT NULL,
+  `okpo` varchar(16) NOT NULL,
+  `rs` varchar(32) NOT NULL,
+  `bank` varchar(64) NOT NULL,
+  `ks` varchar(32) NOT NULL,
+  `bik` int(11) NOT NULL,
+  `email` varchar(64) NOT NULL,
   `type` tinyint(4) NOT NULL default '1',
   `pasp_num` varchar(12) NOT NULL,
   `pasp_date` date NOT NULL,
-  `pasp_kem` varchar(60) NOT NULL,
+  `pasp_kem` varchar(64) NOT NULL,
   `comment` text NOT NULL,
   `no_mail` tinyint(4) NOT NULL,
   `responsible` int(11) NOT NULL,
   `data_sverki` date NOT NULL,
+  `dishonest` tinyint(4) NOT NULL COMMENT='Недобросовестный',
   UNIQUE KEY `id` (`id`),
   UNIQUE KEY `uniq_name` (`group`,`name`),
@@ -127 +128 @@
   `id` int(11) NOT NULL auto_increment,
   `ag_id` int(11) NOT NULL,
-  `name` varchar(50) NOT NULL,
-  `name2` varchar(50) NOT NULL,
-  `surname` varchar(50) NOT NULL,
-  `range` varchar(50) NOT NULL,
-  `pasp_ser` varchar(5) NOT NULL,
-  `pasp_num` varchar(10) NOT NULL,
-  `pasp_kem` varchar(100) NOT NULL,
-  `pasp_data` varchar(15) NOT NULL,
+  `name` varchar(64) NOT NULL,
+  `name2` varchar(64) NOT NULL,
+  `surname` varchar(64) NOT NULL,
+  `range` varchar(64) NOT NULL,
+  `pasp_ser` varchar(8) NOT NULL,
+  `pasp_num` varchar(16) NOT NULL,
+  `pasp_kem` varchar(128) NOT NULL,
+  `pasp_data` varchar(16) NOT NULL,
   `mark_del` bigint(20) NOT NULL,
   UNIQUE KEY `id` (`id`),
@@ -164 +165 @@
 CREATE TABLE IF NOT EXISTS `doc_agent_group` (
   `id` int(11) NOT NULL auto_increment,
-  `name` varchar(50) NOT NULL,
+  `name` varchar(64) NOT NULL,
   `pid` int(11) NOT NULL,
-  `desc` varchar(100) NOT NULL,
+  `desc` varchar(128) NOT NULL,
   UNIQUE KEY `id` (`id`),
   KEY `pid` (`pid`)
@@ -199 +200 @@
   `hidden` tinyint(4) NOT NULL COMMENT 'Индекс сокрытия',
   `unit` int(11) NOT NULL COMMENT 'Единица измерения',
+  `warranty` int(11) NOT NULL COMMENT 'Гарантийный срок',
+  `warranty_type` tinyint(4) NOT NULL COMMENT 'Гарантия производителя',
   UNIQUE KEY `id` (`id`),
   KEY `group` (`group`),
@@ -1390 +1393 @@
   `tel` varchar(15) NOT NULL,
   `adres` varchar(100) NOT NULL,
+  `worker` tinyint(4) NOT NULL,
   UNIQUE KEY `id` (`id`),
   KEY `passch` (`passch`)
@@ -1430 +1434 @@
   `uid` int(11) NOT NULL default '0',
   `param` varchar(25) NOT NULL,
-  `value` varchar(100) NOT NULL,
+  `value` varchar(128) NOT NULL,
   UNIQUE KEY `uid` (`uid`,`param`),
   KEY `value` (`value`)