Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit 8755ad4

Browse files
author
Michael Grauer
committed
ENH: refs #0297. More mysql sanity cleanups.
1 parent 40a5062 commit 8755ad4

File tree

10 files changed

+29
-29
lines changed

10 files changed

+29
-29
lines changed

‎core/database/mysql/3.0.1.sql‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ CREATE TABLE IF NOT EXISTS `assetstore` (
2525
`path` varchar(512) NOT NULL,
2626
`type` tinyint(4) NOT NULL,
2727
PRIMARY KEY (`assetstore_id`)
28-
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=10 ;
28+
) DEFAULT CHARSET=utf8;
2929

3030

3131
-- --------------------------------------------------------
@@ -46,7 +46,7 @@ CREATE TABLE IF NOT EXISTS `bitstream` (
4646
`date` timestamp NOT NULL,
4747
PRIMARY KEY (`bitstream_id`),
4848
KEY `itemrevision_id` (`itemrevision_id`)
49-
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=680 ;
49+
) DEFAULT CHARSET=utf8;
5050

5151
-- --------------------------------------------------------
5252

@@ -69,7 +69,7 @@ CREATE TABLE IF NOT EXISTS `community` (
6969
`view` bigint(20) NOT NULL DEFAULT '0',
7070
PRIMARY KEY (`community_id`),
7171
KEY `name` (`name`)
72-
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
72+
) DEFAULT CHARSET=utf8;
7373

7474
-- --------------------------------------------------------
7575

@@ -84,7 +84,7 @@ CREATE TABLE IF NOT EXISTS `errorlog` (
8484
`message` text NOT NULL,
8585
`datetime` timestamp NULL DEFAULT NULL ,
8686
PRIMARY KEY (`errorlog_id`)
87-
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
87+
) DEFAULT CHARSET=utf8;
8888

8989
-- --------------------------------------------------------
9090

@@ -103,7 +103,7 @@ CREATE TABLE IF NOT EXISTS `folder` (
103103
`view` bigint(20) NOT NULL DEFAULT '0',
104104
PRIMARY KEY (`folder_id`),
105105
KEY `parent_id` (`parent_id`)
106-
) DEFAULT CHARSET=utf8 COMMENT='Describes a directory' AUTO_INCREMENT=23 ;
106+
) DEFAULT CHARSET=utf8 COMMENT='Describes a directory';
107107

108108
-- --------------------------------------------------------
109109

@@ -145,7 +145,7 @@ CREATE TABLE IF NOT EXISTS `group` (
145145
`name` varchar(255) NOT NULL,
146146
PRIMARY KEY (`group_id`),
147147
KEY `community_id` (`community_id`)
148-
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
148+
) DEFAULT CHARSET=utf8;
149149

150150
INSERT INTO `group` (group_id,community_id,name) VALUES (0,0,'Anonymous');
151151
-- --------------------------------------------------------
@@ -165,7 +165,7 @@ CREATE TABLE IF NOT EXISTS `item` (
165165
`download` bigint(20) NOT NULL DEFAULT '0',
166166
`sizebytes` BIGINT( 20 ) NOT NULL DEFAULT '0',
167167
PRIMARY KEY (`item_id`)
168-
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=37 ;
168+
) DEFAULT CHARSET=utf8;
169169

170170
-- --------------------------------------------------------
171171

@@ -235,7 +235,7 @@ CREATE TABLE IF NOT EXISTS `itemrevision` (
235235
UNIQUE KEY `item_id` (`item_id`,`revision`),
236236
KEY `user_id` (`user_id`),
237237
KEY `date` (`date`)
238-
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=685 ;
238+
) DEFAULT CHARSET=utf8;
239239

240240
-- --------------------------------------------------------
241241

@@ -250,7 +250,7 @@ CREATE TABLE IF NOT EXISTS `itemkeyword` (
250250
PRIMARY KEY (`keyword_id`),
251251
UNIQUE KEY `value` (`value`),
252252
KEY `relevance` (`relevance`)
253-
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
253+
) DEFAULT CHARSET=utf8;
254254

255255
-- --------------------------------------------------------
256256

@@ -266,7 +266,7 @@ CREATE TABLE IF NOT EXISTS `metadata` (
266266
`description` varchar(512) NOT NULL,
267267
PRIMARY KEY (`metadata_id`),
268268
KEY `metadatatype_id` (`metadatatype_id`)
269-
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
269+
) DEFAULT CHARSET=utf8;
270270

271271
-- --------------------------------------------------------
272272

@@ -293,7 +293,7 @@ CREATE TABLE IF NOT EXISTS `metadatatype` (
293293
`metadatatype_id` int(11) NOT NULL AUTO_INCREMENT,
294294
`name` varchar(255) NOT NULL,
295295
PRIMARY KEY (`metadatatype_id`)
296-
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
296+
) DEFAULT CHARSET=utf8;
297297

298298
-- --------------------------------------------------------
299299

@@ -332,7 +332,7 @@ CREATE TABLE IF NOT EXISTS `user` (
332332
`view` bigint(20) NOT NULL DEFAULT '0',
333333
PRIMARY KEY (`user_id`),
334334
KEY `email` (`email`)
335-
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
335+
) DEFAULT CHARSET=utf8;
336336

337337

338338
-- --------------------------------------------------------

‎core/database/upgrade/3.0.11.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public function mysql()
1515
`community_id` bigint(20),
1616
`user_id` bigint(20),
1717
PRIMARY KEY (`communityinvitation_id`)
18-
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=10 ;
18+
) DEFAULT CHARSET=utf8;
1919
";
2020
$this->db->query($sql);
2121
}

‎core/database/upgrade/3.0.9.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public function mysql()
1515
`resource_id` bigint(20),
1616
`resource_type` tinyint(4),
1717
PRIMARY KEY (`uniqueidentifier_id`)
18-
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=10 ;
18+
) DEFAULT CHARSET=utf8;
1919
";
2020
$this->db->query($sql);
2121
}

‎modules/api/database/mysql/1.0.0.sql‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ CREATE TABLE IF NOT EXISTS `api_userapi` (
88
`token_expiration_time` int(11) NOT NULL,
99
`creation_date` timestamp NULL DEFAULT NULL ,
1010
PRIMARY KEY (`userapi_id`)
11-
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=10 ;
11+
) DEFAULT CHARSET=utf8;
1212

13-
CREATE TABLE api_token (
13+
CREATE TABLE IF NOT EXISTS api_token (
1414
token_id bigint(20) NOT NULL AUTO_INCREMENT,
1515
userapi_id bigint(20) NOT NULL,
1616
token varchar(40) NOT NULL,
1717
expiration_date timestamp NULL DEFAULT NULL ,
1818
PRIMARY KEY (`token_id`)
19-
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=10 ;
19+
) DEFAULT CHARSET=utf8;

‎modules/communityagreement/database/mysql/1.0.0.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ CREATE TABLE IF NOT EXISTS communityagreement_agreement (
88
`agreement` text NOT NULL,
99
PRIMARY KEY (`agreement_id`),
1010
KEY `community_id` (`community_id`)
11-
) AUTO_INCREMENT=200;
11+
) DEFAULT CHARSET=utf8;

‎modules/helloworld/database/mysql/1.0.0.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
CREATE TABLE IF NOT EXISTS `helloworld_hello` (
33
`hello_id` bigint(20) NOT NULL AUTO_INCREMENT,
44
PRIMARY KEY (`hello_id`)
5-
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=10 ;
5+
) DEFAULT CHARSET=utf8;
66

77

88
INSERT INTO `midas`.`helloworld_hello` (`hello_id`) VALUES ('1');

‎modules/helloworld/database/upgrade/1.0.1.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function mysql()
2222
$sql = "CREATE TABLE IF NOT EXISTS helloworld_helloupgrade1 (
2323
id int(11) NOT NULL AUTO_INCREMENT,
2424
PRIMARY KEY (id)
25-
)";
25+
) DEFAULT CHARSET=utf8";
2626
$this->db->query($sql);
2727
}
2828

‎modules/helloworld/database/upgrade/1.0.2.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function mysql()
2626
$sql = "CREATE TABLE IF NOT EXISTS helloworld_helloupgrade2 (
2727
id int(11) NOT NULL AUTO_INCREMENT,
2828
PRIMARY KEY (id)
29-
)";
29+
) DEFAULT CHARSET=utf8";
3030
$this->db->query($sql);
3131
}
3232

‎modules/scheduler/database/mysql/1.0.0.sql‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `scheduler_job` (
1010
`status` tinyint(4),
1111
`params` text,
1212
PRIMARY KEY (`job_id`)
13-
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=10 ;
13+
) DEFAULT CHARSET=utf8;
1414

1515

1616
DROP TABLE IF EXISTS scheduler_workflow;
@@ -22,7 +22,7 @@ CREATE TABLE scheduler_workflow (
2222

2323
PRIMARY KEY (workflow_id),
2424
UNIQUE KEY name_version (workflow_name, workflow_version)
25-
) ENGINE=InnoDB;
25+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
2626

2727
DROP TABLE IF EXISTS scheduler_node;
2828
CREATE TABLE scheduler_node (
@@ -33,7 +33,7 @@ CREATE TABLE scheduler_node (
3333

3434
PRIMARY KEY (node_id),
3535
KEY workflow_id (workflow_id)
36-
) ENGINE=InnoDB;
36+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
3737

3838
DROP TABLE IF EXISTS scheduler_node_connection;
3939
CREATE TABLE scheduler_node_connection (
@@ -42,7 +42,7 @@ CREATE TABLE scheduler_node_connection (
4242
outgoing_node_id INTEGER UNSIGNED NOT NULL,
4343

4444
PRIMARY KEY (node_connection_id)
45-
) ENGINE=InnoDB;
45+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
4646

4747
DROP TABLE IF EXISTS scheduler_variable_handler;
4848
CREATE TABLE scheduler_variable_handler (
@@ -51,7 +51,7 @@ CREATE TABLE scheduler_variable_handler (
5151
class VARCHAR(255) NOT NULL,
5252

5353
PRIMARY KEY (workflow_id, class)
54-
) ENGINE=InnoDB;
54+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
5555

5656
DROP TABLE IF EXISTS scheduler_execution;
5757
CREATE TABLE scheduler_execution (
@@ -67,7 +67,7 @@ CREATE TABLE scheduler_execution (
6767

6868
PRIMARY KEY (execution_id, workflow_id),
6969
KEY execution_parent (execution_parent)
70-
) ENGINE=InnoDB;
70+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
7171

7272
DROP TABLE IF EXISTS scheduler_execution_state;
7373
CREATE TABLE scheduler_execution_state (
@@ -78,4 +78,4 @@ CREATE TABLE scheduler_execution_state (
7878
node_thread_id INTEGER UNSIGNED NOT NULL,
7979

8080
PRIMARY KEY (execution_id, node_id)
81-
) ENGINE=InnoDB;
81+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

‎modules/scheduler/database/upgrade/1.0.1.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public function mysql()
1515
`date` timestamp,
1616
`log` text,
1717
PRIMARY KEY (`log_id`)
18-
) ";
18+
) DEFAULT CHARSET=utf8";
1919
$this->db->query($sql);
2020

2121
}

0 commit comments

Comments
 (0)