Permalink
Browse files

Updating the MySQL Hierarchy and Scheduling table definitions to work…

… with

fixes in harmoni-0.12.0.
  • Loading branch information...
1 parent e80d104 commit 175e0a18f274cd079b5637fb9da377951b1cb500 @adamfranco committed Sep 14, 2007
Showing with 34 additions and 10 deletions.
  1. +8 −6 SQL/MySQL/Hierarchy.sql
  2. +2 −2 SQL/MySQL/Scheduling.sql
  3. +9 −1 docs/changelog.html
  4. +8 −0 docs/changelog.txt
  5. +7 −1 docs/raw/changelog/changelog.xml
View
@@ -4,7 +4,7 @@
-- @copyright Copyright © 2005, Middlebury College
-- @license http://www.gnu.org/copyleft/gpl.html GNU General Public License (GPL)
--
--- @version $Id: Hierarchy.sql,v 1.1 2007/09/11 19:06:29 adamfranco Exp $
+-- @version $Id: Hierarchy.sql,v 1.2 2007/09/14 19:53:37 adamfranco Exp $
-- */
-- --------------------------------------------------------
@@ -13,7 +13,7 @@
--
CREATE TABLE `hierarchy` (
- `hierarchy_id` varchar(75) NOT NULL default '0',
+ `hierarchy_id` varchar(75) NOT NULL,
`hierarchy_display_name` varchar(255) NOT NULL default '',
`hierarchy_description` text NOT NULL,
`hierarchy_multiparent` enum('0','1') NOT NULL default '1',
@@ -31,8 +31,9 @@ TYPE=InnoDB;
--
CREATE TABLE j_node_node (
- fk_parent varchar(75) NOT NULL default '0',
- fk_child varchar(75) NOT NULL default '0',
+ fk_hierarchy varchar(75) NOT NULL,
+ fk_parent varchar(75) NOT NULL,
+ fk_child varchar(75) NOT NULL,
PRIMARY KEY (fk_parent,fk_child),
KEY fk_parent (fk_parent),
KEY fk_child (fk_child)
@@ -47,10 +48,10 @@ TYPE=InnoDB;
--
CREATE TABLE node (
- node_id varchar(75) NOT NULL default '0',
+ node_id varchar(75) NOT NULL,
node_display_name varchar(255) NOT NULL default '',
node_description text NOT NULL,
- fk_hierarchy varchar(75) NOT NULL default '0',
+ fk_hierarchy varchar(75) NOT NULL,
fk_type int(10) unsigned NOT NULL default '0',
az_node_changed timestamp NULL default NULL,
PRIMARY KEY (fk_hierarchy,node_id),
@@ -68,6 +69,7 @@ CREATE TABLE node (
--
CREATE TABLE node_ancestry (
+ fk_hierarchy varchar(75) NOT NULL,
fk_node varchar(255) NOT NULL default '',
fk_ancestor varchar(255) default NULL,
`level` smallint(6) NOT NULL default '0',
View
@@ -5,7 +5,7 @@
-- @copyright Copyright © 2006, Middlebury College
-- @license http://www.gnu.org/copyleft/gpl.html GNU General Public License (GPL)
--
--- @version $Id: Scheduling.sql,v 1.2 2007/09/14 19:53:37 adamfranco Exp $
+-- @version $Id: Scheduling.sql,v 1.3 2007/09/14 19:55:58 adamfranco Exp $
-- */
-- --------------------------------------------------------
@@ -24,7 +24,7 @@ CREATE TABLE `sc_item` (
`master_id` varchar(170) character set latin1 collate latin1_general_ci default NULL,
`fk_creator_id` varchar(170) default NULL,
PRIMARY KEY (`id`),
- KEY `start` (`start`,`end`,`fk_sc_item_stat_type`,`master_id`)
+ KEY `start` (`start_date`,`end_date`,`fk_sc_item_stat_type`,`master_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='This table holds all of the ScheduleItems.';
--
View
@@ -22,7 +22,15 @@
</head>
<body>
<h1>Harmoni Change-Log</h1>
-<h2>Version 0.12.0</h2>
+<h2>Version 0.12.1</h2>
+<h3>2007-09-14</h3>
+<ul>
+ <li> Bug Fix:
+ Updating the MySQL Hierarchy and Scheduling table definitions to work with
+ fixes in harmoni-0.12.0.
+ (<em>2007-09-14 - Adam Franco</em>)</li>
+ </ul>
+<br><h2>Version 0.12.0</h2>
<h3>2007-09-13</h3>
<ul>
<li>
View
@@ -3,6 +3,14 @@
Name: Harmoni Change-Log
+v. 0.12.1 (2007-09-14)
+----------------------------------------------------
+
+ * Bug Fix:
+ Updating the MySQL Hierarchy and Scheduling table definitions to work with
+ fixes in harmoni-0.12.0.
+ (2007-09-14 - Adam Franco)
+
v. 0.12.0 (2007-09-13)
----------------------------------------------------
@@ -3,11 +3,17 @@
@package harmoni.docs
@copyright Copyright &copy; 2005, Middlebury College
@license http://www.gnu.org/copyleft/gpl.html GNU General Public License (GPL)
- @version $Id: changelog.xml,v 1.165 2007/09/14 13:58:33 adamfranco Exp $
+ @version $Id: changelog.xml,v 1.166 2007/09/14 19:53:39 adamfranco Exp $
-->
<!DOCTYPE changelog SYSTEM "../dtds/changelog.dtd">
<changelog name="Harmoni Change-Log">
+ <version number="0.12.1" date="2007-09-14">
+ <fix author='adam' date='2007-09-14'>
+ Updating the MySQL Hierarchy and Scheduling table definitions to work with
+ fixes in harmoni-0.12.0.
+ </fix>
+ </version>
<version number="0.12.0" date="2007-09-13">
<important author='adam' date='2007-09-11'>
In order to support PostgreSQL without refactoring of the Database Handler,

0 comments on commit 175e0a1

Please sign in to comment.