From 834b7aff4a17c420bba0bed6fc02a1b91c57e3b4 Mon Sep 17 00:00:00 2001 From: Philip Witty Date: Mon, 19 Oct 2015 16:29:18 +0100 Subject: [PATCH] Fix MySQL init scripts * Fix a few failing statements in script * Changed max length of owner/repo name to 255 (limit of 100 in github and 255 in gitlab). MySQL can't handle a unique field of more than 767 bytes by default --- shared/database/mysql/1_init.sql | 16 ++++++++-------- shared/database/postgres/1_init.sql | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/shared/database/mysql/1_init.sql b/shared/database/mysql/1_init.sql index b20f7948a..0952f93f1 100644 --- a/shared/database/mysql/1_init.sql +++ b/shared/database/mysql/1_init.sql @@ -18,9 +18,9 @@ CREATE TABLE users ( CREATE TABLE repos ( repo_id INTEGER PRIMARY KEY AUTO_INCREMENT ,repo_user_id INTEGER -,repo_owner VARCHAR(500) -,repo_name VARCHAR(500) -,repo_full_name VARCHAR(1000) +,repo_owner VARCHAR(255) +,repo_name VARCHAR(255) +,repo_full_name VARCHAR(511) ,repo_avatar VARCHAR(500) ,repo_link VARCHAR(1000) ,repo_clone VARCHAR(1000) @@ -45,9 +45,9 @@ CREATE TABLE stars ( ,UNIQUE(star_repo_id, star_user_id) ); -CREATE INDEX ix_star_user ON builds (star_user_id); +CREATE INDEX ix_star_user ON stars (star_user_id); -CREATE TABLE keys ( +CREATE TABLE `keys` ( key_id INTEGER PRIMARY KEY AUTO_INCREMENT ,key_repo_id INTEGER ,key_public MEDIUMBLOB @@ -112,7 +112,7 @@ CREATE TABLE IF NOT EXISTS logs ( ); CREATE TABLE IF NOT EXISTS nodes ( - node_id INTEGER PRIMARY KEY AUTOINCREMENT + node_id INTEGER PRIMARY KEY AUTO_INCREMENT ,node_addr VARCHAR(1024) ,node_arch VARCHAR(50) ,node_cert MEDIUMBLOB @@ -130,7 +130,7 @@ DROP TABLE nodes; DROP TABLE logs; DROP TABLE jobs; DROP TABLE builds; -DROP TABLE keys; +DROP TABLE `keys`; DROP TABLE stars; DROP TABLE repos; -DROP TABLE users; \ No newline at end of file +DROP TABLE users; diff --git a/shared/database/postgres/1_init.sql b/shared/database/postgres/1_init.sql index d98f3699c..27cb92e01 100644 --- a/shared/database/postgres/1_init.sql +++ b/shared/database/postgres/1_init.sql @@ -18,9 +18,9 @@ CREATE TABLE users ( CREATE TABLE repos ( repo_id SERIAL PRIMARY KEY ,repo_user_id INTEGER -,repo_owner VARCHAR(500) -,repo_name VARCHAR(500) -,repo_full_name VARCHAR(1000) +,repo_owner VARCHAR(255) +,repo_name VARCHAR(255) +,repo_full_name VARCHAR(511) ,repo_avatar VARCHAR(500) ,repo_link VARCHAR(1000) ,repo_clone VARCHAR(1000) @@ -133,4 +133,4 @@ DROP TABLE builds; DROP TABLE keys; DROP TABLE stars; DROP TABLE repos; -DROP TABLE users; \ No newline at end of file +DROP TABLE users;