Permalink
Browse files

Fixed and moved SQL files; updated Makefile

  • Loading branch information...
MedeaMelana committed May 30, 2012
1 parent e6968a3 commit f61a1344957c9c9283f984b5f47c8bb872a820b0
Showing with 11 additions and 27 deletions.
  1. +3 −10 Makefile
  2. +0 −1 mbh-create-database.sql
  3. BIN mbh-data.sql.zip
  4. +1 −0 sql/create-database.sql
  5. +7 −16 mbh-create.sql → sql/create-tables.sql
View
@@ -9,14 +9,7 @@ clean:
install:
mvn clean install -Dmaven.test.skip
upload: install
# uploading WAR to remote /root
# run `make deploy` on remote to desploy
scp target/manbijthond-web-0.0.1-SNAPSHOT.war mbh:
dump:
mysqldump -u root --no-data waisda-whitelabel MatchingTag Video DictionaryEntry Game TagEntry User ResetPassword Participant > mbh-create.sql
mysqldump -u root --no-create-info waisda-whitelabel MatchingTag Video DictionaryEntry > mbh-data.sql
sed -i '' -E 's/AUTO_INCREMENT=[0-9]+ //' mbh-create.sql
zip mbh-data.sql.zip mbh-data.sql
rm mbh-data.sql
# dump the current database structure to sql/create-tables.sql
mysqldump -u root --no-data waisda MatchingTag Video DictionaryEntry Game TagEntry User ResetPassword Participant > sql/create-tables.sql
sed -i '' -E 's/AUTO_INCREMENT=[0-9]+ //' sql/create-tables.sql
View
@@ -1 +0,0 @@
create database manbijthond charset utf8 collate utf8_general_ci;
View
Binary file not shown.
View
@@ -0,0 +1 @@
create database waisda charset utf8 collate utf8_general_ci;
@@ -98,28 +98,19 @@ DROP TABLE IF EXISTS `TagEntry`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `TagEntry` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`dictionary` varchar(31) DEFAULT NULL COMMENT 'Dictionary in which tag is found (awards extra points)',
`normalizedTag` varchar(63) NOT NULL DEFAULT '' COMMENT 'Normalized version of tag',
`id` int(11) NOT NULL DEFAULT '0',
`dictionary` varchar(31) CHARACTER SET utf8 DEFAULT NULL COMMENT 'Dictionary in which tag is found (awards extra points)',
`normalizedTag` varchar(63) CHARACTER SET utf8 NOT NULL DEFAULT '' COMMENT 'Normalized version of tag',
`score` int(11) NOT NULL COMMENT 'Computed score (stored for performance)',
`tag` varchar(63) NOT NULL DEFAULT '' COMMENT 'Tag as entered by user',
`tag` varchar(63) CHARACTER SET utf8 NOT NULL DEFAULT '' COMMENT 'Tag as entered by user',
`gametime` int(11) NOT NULL COMMENT 'Time relative to video, in ms',
`typingDuration` int(11) NOT NULL COMMENT 'How long it took the user to type the tag, in ms',
`game_id` int(11) NOT NULL COMMENT 'Game to which tag belongs',
`owner_id` int(11) NOT NULL COMMENT 'Player who entered the tag',
`matchingTagEntry_id` int(11) DEFAULT NULL COMMENT 'Matching tag, if any (may be set later; awards extra points)',
`pioneer` tinyint(1) NOT NULL COMMENT 'Whether there was no match when tag was entered',
`creationDate` datetime NOT NULL COMMENT 'Date at which tag was entered',
PRIMARY KEY (`id`),
KEY `FKD4E26D182D915173` (`game_id`),
KEY `FKD4E26D189C6246EB` (`owner_id`),
KEY `FKD4E26D1885D046F6` (`matchingTagEntry_id`),
KEY `normalizedTag` (`normalizedTag`),
KEY `creationDate` (`creationDate`),
KEY `FKD4E26D181D4DB63E` (`game_id`),
KEY `FKD4E26D18C3E74E41` (`matchingTagEntry_id`),
KEY `FKD4E26D188C1EABB6` (`owner_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Tag entries by users in specific Game sessions';
`creationDate` datetime NOT NULL COMMENT 'Date at which tag was entered'
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -188,4 +179,4 @@ CREATE TABLE `Participant` (
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2012-05-06 16:41:32
-- Dump completed on 2012-05-30 22:39:22

0 comments on commit f61a134

Please sign in to comment.