Merge pull request #1532 from zfi/master

Merge branch 0.101 to master

Author: zfi

db-updates/0000-admin.sql

@@ -25,3 +25,15 @@ CREATE TABLE if not exists blocklyprop.admin (
 ) ENGINE=InnoDB
   AUTO_INCREMENT=0
   DEFAULT CHARSET=utf8;
+
+-- Record schema change
+INSERT INTO blocklyprop.admin (
+    db_version, 
+    db_script,
+    notes
+    )
+VALUES (
+    0,
+    '0000-admin.sql',
+    'Create administrative table to track updates'
+    );

db-updates/0001-initial.sql

@@ -98,3 +98,16 @@ CREATE TABLE IF NOT EXISTS blocklyprop.user (
 ) ENGINE=InnoDB
   AUTO_INCREMENT=0
   DEFAULT CHARSET=utf8;
+
+
+-- Record schema change
+INSERT INTO blocklyprop.admin (
+    db_version, 
+    db_script,
+    notes
+    )
+VALUES (
+    1,
+    '0001-initial.sql',
+    'Create initial blocklyprop tables'
+    );

db-updates/0002-add_share-key.sql

@@ -12,4 +12,16 @@ CREATE TABLE IF NOT EXISTS blocklyprop.project_sharing (
   UNIQUE INDEX project_sharing_id_project_sharekey_uindex (id_project, sharekey),
   INDEX project_sharing_sharekey_index (sharekey)
 ) ENGINE=InnoDB
-  DEFAULT CHARSET=utf8;
+  DEFAULT CHARSET=utf8;
+
+-- Record schema change
+INSERT INTO blocklyprop.admin (
+    db_version, 
+    db_script,
+    notes
+    )
+VALUES (
+    2,
+    '0002-add-share-key.sql',
+    'Add project sharing support'
+    );

db-updates/0003-rich-text-editor.sql

@@ -2,4 +2,16 @@
  *  Add a description field to the project that supports HTML
  */
 ALTER TABLE blocklyprop.project
-  ADD description_html LONGTEXT NULL AFTER description;
+  ADD description_html LONGTEXT NULL AFTER description;
+
+-- Record schema change
+INSERT INTO blocklyprop.admin (
+    db_version, 
+    db_script,
+    notes
+    )
+VALUES (
+    3,
+    '0003-rich-text-editor.sql',
+    'Add HTML project description to project table'
+    );

db-updates/0004-friends.sql

@@ -54,3 +54,15 @@ CREATE TABLE IF NOT EXISTS blocklyprop.friend (
 
 CREATE UNIQUE INDEX friend_idRequestUser_idRequestedUser_uindex
   ON blocklyprop.friend (idRequestUser, idRequestedUser);
+
+-- Record schema change
+INSERT INTO blocklyprop.admin (
+    db_version, 
+    db_script,
+    notes
+    )
+VALUES (
+    4,
+    '0004-friends.sql',
+    'Implement friends feature for social media'
+    );

db-updates/0005-fix_share-key_autoincrement.sql

@@ -1,6 +1,20 @@
 /*
- *  Correct issue with project shaing id not incrementing
+ *  Correct issue with project sharing id not incrementing
  */
 
 ALTER TABLE blocklyprop.project_sharing MODIFY id BIGINT(20) NOT NULL AUTO_INCREMENT;
 
+
+-- Record schema change
+INSERT INTO blocklyprop.admin (
+    db_version, 
+    db_script,
+    notes
+    )
+VALUES (
+    5,
+    '0005-fix_share-key_autoincrement.sql',
+    'Correct issue with project sharing id not incrementing'
+    );
+
+

db-updates/0008-update-bp-default-char-col.sql

@@ -152,3 +152,15 @@ ALTER TABLE blocklyprop.user MODIFY screenname VARCHAR(250) CHARACTER SET utf8;
 
 SET foreign_key_checks = 1;
 
+
+-- Record schema change
+INSERT INTO blocklyprop.admin (
+    db_version, 
+    db_script,
+    notes
+    )
+VALUES (
+    8,
+    '0008-update-bp-default-char-col.sql',
+    'updates the character set and collation settings on the blocklyprop database'
+    );

db-updates/0009-motd.sql

@@ -18,3 +18,16 @@ CREATE TABLE IF NOT EXISTS blocklyprop.motd
   ENGINE=InnoDB
   AUTO_INCREMENT=0
   DEFAULT CHARSET=utf8;
+
+
+-- Record schema change
+INSERT INTO blocklyprop.admin (
+    db_version, 
+    db_script,
+    notes
+    )
+VALUES (
+    9,
+    '0009-motd.sql',
+    'Implement support for database-driven banner messages'
+    );

db-updates/0010-project-link-active.sql

@@ -20,3 +20,15 @@ ALTER TABLE blocklyprop.project_sharing ADD active BIT DEFAULT 0 NULL AFTER shar
  */
 UPDATE blocklyprop.project_sharing
     SET active = true;
+
+-- Record schema change
+INSERT INTO blocklyprop.admin (
+    db_version, 
+    db_script,
+    notes
+    )
+VALUES (
+    10,
+    '0010-project-link-active',
+    'Add field to support project link state'
+    );

db-updates/0011-project-code-block-version.sql

@@ -15,3 +15,15 @@
  */
 
 ALTER TABLE blocklyprop.project ADD code_block_version SMALLINT DEFAULT 0 NOT NULL AFTER code;
+
+-- Record schema change
+INSERT INTO blocklyprop.admin (
+    db_version, 
+    db_script,
+    notes
+    )
+VALUES (
+    11,
+    '0011-project-code-block-version',
+    'Add field to support project code block versioning'
+    );