knguyen     2005/04/22 14:40:16 CEST

  Modified files:
    core/src/webapp/WEB-INF/var/db/sql/schema/mysql 
                                                    jahia-schema.sql 
  Log:
  fix some issues with mysql
  
  Revision  Changes    Path
  1.6       +45 -15    
jahia/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schema.sql
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schema.sql.diff?r1=1.5&r2=1.6&f=h
  
  
  
  Index: jahia-schema.sql
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schema.sql,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- jahia-schema.sql  18 Apr 2005 10:48:41 -0000      1.5
  +++ jahia-schema.sql  22 Apr 2005 12:40:16 -0000      1.6
  @@ -840,7 +840,9 @@
                            siteid_sites_users INTEGER NOT NULL,
                            userid_sites_users VARCHAR (50),
       PRIMARY KEY(username_sites_users,siteid_sites_users)
  -) ENGINE=InnoDB;
  +);
  +
  +ALTER TABLE jahia_sites_users type=innodb;
   
   # -----------------------------------------------------------------------
   # jahia_sl2_uri
  @@ -854,7 +856,9 @@
                            namespace INTEGER,
       PRIMARY KEY(uri_id),
       INDEX jahia_sl2_uri_index (uri_string, namespace)
  -) ENGINE=InnoDB;
  +);
  +
  +ALTER TABLE jahia_sl2_uri type=innodb;
   
   # -----------------------------------------------------------------------
   # jahia_sl2_object
  @@ -866,7 +870,9 @@
                            uri_id BIGINT NOT NULL,
                            class_name VARCHAR (255) NOT NULL,
       PRIMARY KEY(uri_id)
  -) ENGINE=InnoDB;
  +);
  +
  +ALTER TABLE jahia_sl2_object type=innodb;
   
   # -----------------------------------------------------------------------
   # jahia_sl2_binding
  @@ -879,7 +885,9 @@
                            name VARCHAR (255) NOT NULL,
                            child_uuri_id BIGINT NOT NULL,
       PRIMARY KEY(uri_id,name,child_uuri_id)
  -) ENGINE=InnoDB;
  +);
  +
  +ALTER TABLE jahia_sl2_binding type=innodb;
   
   # -----------------------------------------------------------------------
   # jahia_sl2_parent_binding
  @@ -892,7 +900,9 @@
                            name VARCHAR (255) NOT NULL,
                            parent_uuri_id BIGINT NOT NULL,
       PRIMARY KEY(uri_id,name,parent_uuri_id)
  -) ENGINE=InnoDB;
  +);
  +
  +ALTER TABLE jahia_sl2_binding type=innodb;
   
   # -----------------------------------------------------------------------
   # jahia_sl2_links
  @@ -904,7 +914,9 @@
                            uri_id BIGINT NOT NULL,
                            link_to_id BIGINT NOT NULL,
       PRIMARY KEY(uri_id,link_to_id)
  -) ENGINE=InnoDB;
  +);
  +
  +ALTER TABLE jahia_sl2_links type=innodb;
   
   # -----------------------------------------------------------------------
   # jahia_sl2_locks
  @@ -922,7 +934,9 @@
                            is_exclusive INTEGER NOT NULL,
                            owner VARCHAR (255),
       PRIMARY KEY(lock_id)
  -) ENGINE=InnoDB;
  +);
  +
  +ALTER TABLE jahia_sl2_locks type=innodb;
   
   # -----------------------------------------------------------------------
   # jahia_sl2_branch
  @@ -935,7 +949,9 @@
                            branch_string VARCHAR (255),
                            namespace INTEGER,
       PRIMARY KEY(branch_id)
  -) ENGINE=InnoDB;
  +);
  +
  +ALTER TABLE jahia_sl2_branch type=innodb;
   
   # -----------------------------------------------------------------------
   # jahia_sl2_label
  @@ -948,7 +964,9 @@
                            label_string VARCHAR (255),
                            namespace INTEGER,
       PRIMARY KEY(label_id)
  -) ENGINE=InnoDB;
  +);
  +
  +ALTER TABLE jahia_sl2_label type=innodb;
   
   # -----------------------------------------------------------------------
   # jahia_sl2_version
  @@ -960,7 +978,9 @@
                            uri_id BIGINT NOT NULL,
                            is_versioned INTEGER,
       PRIMARY KEY(uri_id)
  -) ENGINE=InnoDB;
  +);
  +
  +ALTER TABLE jahia_sl2_version type=innodb;
   
   # -----------------------------------------------------------------------
   # jahia_sl2_version_history
  @@ -974,7 +994,9 @@
                            branch_id BIGINT NOT NULL,
                            revision_no VARCHAR (20),
       PRIMARY KEY(version_id)
  -) ENGINE=InnoDB;
  +);
  +
  +ALTER TABLE jahia_sl2_version_history type=innodb;
   
   # -----------------------------------------------------------------------
   # jahia_sl2_version_preds
  @@ -986,7 +1008,9 @@
                            version_id BIGINT NOT NULL,
                            predecessor_id BIGINT NOT NULL,
       PRIMARY KEY(version_id,predecessor_id)
  -) ENGINE=InnoDB;
  +);
  +
  +ALTER TABLE jahia_sl2_version_preds type=innodb;
   
   # -----------------------------------------------------------------------
   # jahia_sl2_version_labels
  @@ -998,7 +1022,9 @@
                            version_id BIGINT NOT NULL,
                            label_id BIGINT NOT NULL,
       PRIMARY KEY(version_id,label_id)
  -) ENGINE=InnoDB;
  +);
  +
  +ALTER TABLE jahia_sl2_version_labels type=innodb;
   
   # -----------------------------------------------------------------------
   # jahia_sl2_properties
  @@ -1014,7 +1040,9 @@
                            property_type VARCHAR (50) NOT NULL,
                            is_protected INTEGER NOT NULL,
       PRIMARY KEY(version_id,property_namespace,property_name)
  -) ENGINE=InnoDB;
  +);
  +
  +ALTER TABLE jahia_sl2_properties type=innodb;
   
   # -----------------------------------------------------------------------
   # jahia_sl2_permissions
  @@ -1031,7 +1059,9 @@
                            is_negative INTEGER NOT NULL,
                            succession INTEGER NOT NULL,
       PRIMARY KEY(object_id,subject_id,action_id)
  -) ENGINE=InnoDB;
  +);
  +
  +ALTER TABLE jahia_sl2_permissions type=innodb;
   
   # -----------------------------------------------------------------------
   # jahia_templates_set
  

Reply via email to