roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gango...@apache.org
Subject svn commit: r232624 - in /incubator/roller/trunk: metadata/database/120-to-130-migration-raw.sql metadata/database/createdb-raw.sql src/org/roller/pojos/PingTargetData.java
Date Sun, 14 Aug 2005 17:40:58 GMT
Author: gangolli
Date: Sun Aug 14 10:40:54 2005
New Revision: 232624

URL: http://svn.apache.org/viewcvs?rev=232624&view=rev
Log:
Fixes for ROL-754.  Change column named condition to conditioncode to avoid conflicting with
new keyword in MySQL 5.x.

Added:
    incubator/roller/trunk/metadata/database/120-to-130-migration-raw.sql   (with props)
Modified:
    incubator/roller/trunk/metadata/database/createdb-raw.sql   (contents, props changed)
    incubator/roller/trunk/src/org/roller/pojos/PingTargetData.java   (contents, props changed)

Added: incubator/roller/trunk/metadata/database/120-to-130-migration-raw.sql
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/database/120-to-130-migration-raw.sql?rev=232624&view=auto
==============================================================================
--- incubator/roller/trunk/metadata/database/120-to-130-migration-raw.sql (added)
+++ incubator/roller/trunk/metadata/database/120-to-130-migration-raw.sql Sun Aug 14 10:40:54
2005
@@ -0,0 +1,22 @@
+
+-- Migration of Roller 1.2 to 1.3 database schema.
+
+-- -----------------------------------------------------
+
+-- For ROL-754. MySQL 5.x introduced a new keyword "condition"
+-- which made the use of "condition" as a column name in the "pingtarget" table illegal.
+-- This renames the column to "conditioncode".   There is a corresponding change in the
+-- Hibernate mapping metadata.
+
+-- Create the new column.  If your database will not autopopulate new columns with default
values, you may
+-- have to remove the "not null" clause here.
+alter table pingtarget add column conditioncode integer default 0 not null;
+
+-- Transfer old column data to the new column.  This is not critical as currently it is not
used, and
+-- later the data will be generated by usage in the ping processor.
+update pingtarget pt set pt.conditioncode=pt.condition;
+
+-- Drop the old column.
+alter table pingtarget drop column condition;
+
+-- -----------------------------------------------------
\ No newline at end of file

Propchange: incubator/roller/trunk/metadata/database/120-to-130-migration-raw.sql
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/roller/trunk/metadata/database/createdb-raw.sql
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/database/createdb-raw.sql?rev=232624&r1=232623&r2=232624&view=diff
==============================================================================
--- incubator/roller/trunk/metadata/database/createdb-raw.sql (original)
+++ incubator/roller/trunk/metadata/database/createdb-raw.sql Sun Aug 14 10:40:54 2005
@@ -1,453 +1,453 @@
-
--- Run this script to create the Roller database tables in your database.
--- Make sure you run the correct version of this script.
---
--- * For MySQL run the script createdb.sql found in the mysql directory.
--- * For PostgreSQL run the script createdb.sql found in the postgresql directory.
--- * For HSQLDB run the script createdb.sql found in the hsqldb directory.
--- 
--- For those who grabbed Roller source from CVS, don't try to run the script 
--- named createdb-raw.sql, it is the source from which the above scripts are 
--- created.
-
--- *****************************************************
--- Create the tables and indices
-
-create table rolleruser (
-    id              varchar(48) not null primary key,
-    username        varchar(255) not null,
-    passphrase      varchar(255) not null,
-    fullname        varchar(255) not null,
-    emailaddress    varchar(255) not null,
-    datecreated     timestamp not null
-);
-alter table rolleruser add constraint rolleruser_username_uq unique ( username@INDEXSIZE@
);
-
-create table userrole (
-    id               varchar(48) not null primary key,
-    rolename         varchar(255) not null,
-    username         varchar(255) not null,
-    userid           varchar(48) not null
-);
-create index userrole_userid_index on userrole( userid );
-create index userrole_username_index on userrole( username@INDEXSIZE@ );
-
-create table usercookie (
-    id              varchar(48) not null primary key,
-    username        varchar(255) not null,
-    cookieid        varchar(100) not null,
-    datecreated     timestamp not null
-);
-create index usercookie_username_index on usercookie( username@INDEXSIZE@ );
-create index usercookie_cookieid_index on usercookie( cookieid@INDEXSIZE@ );
-
-create table webpage (
-    id              varchar(48)  not null primary key,
-    name            varchar(255)  not null,
-    description     varchar(255)  null,
-    link            varchar(255)  null,
-    websiteid       varchar(255)  not null,
-    template        @TEXT_SQL_TYPE@ not null,
-    updatetime      timestamp     not null
-);
-create index webpage_name_index on webpage( name@INDEXSIZE@ );
-create index webpage_link_index on webpage( link@INDEXSIZE@ );
-create index webpage_id_index on webpage( websiteid );
-
-create table website (
-    id                varchar(48) not null primary key,
-    name              varchar(255) not null,
-    description       varchar(255) not null,
-    userid            varchar(48) not null,
-    defaultpageid     varchar(48) default 0 not null,
-    weblogdayid       varchar(48) not null,
-    ignorewords       @TEXT_SQL_TYPE@,
-    enablebloggerapi  @BOOLEAN_SQL_TYPE_FALSE@ not null,
-    editorpage        varchar(255) null,
-    bloggercatid      varchar(48) null,
-    defaultcatid      varchar(48) null,
-    allowcomments     @BOOLEAN_SQL_TYPE_TRUE@ not null,
-    emailcomments     @BOOLEAN_SQL_TYPE_FALSE@ not null,
-    emailfromaddress  varchar(255) null,
-    editortheme       varchar(255) null,
-    locale            varchar(20) null,
-    timezone          varchar(50) null,
-    defaultplugins    varchar(255) null,
-    pinnedtomain      @BOOLEAN_SQL_TYPE_FALSE@ not null,
-    isenabled         @BOOLEAN_SQL_TYPE_TRUE@ not null
-);
-create index website_id_index on website( id );
-create index website_userid_index on website( userid );
-create index website_isenabled_index on website( isenabled );
-
-create table folder (
-    id               varchar(48) not null primary key,
-    name             varchar(255) not null,
-    description      varchar(255) null,
-    websiteid        varchar(48) not null,
-    parentid        varchar(48)
-);
-create index folder_websiteid_index on folder( websiteid );
-
-create table folderassoc (
-    id               varchar(48) not null primary key,
-    folderid         varchar(48) not null,
-    ancestorid       varchar(40),
-    relation         varchar(20) not null
-);
-create index folderassoc_folderid_index on folderassoc( folderid );
-create index folderassoc_ancestorid_index on folderassoc( ancestorid );
-create index folderassoc_relation_index on folderassoc( relation );
-
-create table bookmark (
-    id               varchar(48) not null primary key,
-    folderid         varchar(48) not null,
-    name             varchar(255) not null,
-    description      varchar(255) null,
-    url              varchar(255) not null,
-    weight           integer default 0 not null,
-    priority         integer default 100 not null,
-    image            varchar(255) null,
-    feedurl          varchar(255) null
-);
-create index bookmark_folderid_index on bookmark( folderid );
-
-
-create table weblogcategory (
-    id               varchar(48)  not null primary key,
-    name             varchar(255) not null,
-    description      varchar(255) null,
-    websiteid        varchar(48)  not null,
-    image            varchar(255) null
-);
-create index weblogcategory_websiteid_index on weblogcategory( websiteid );
--- alter table weblogcategory add unique category_nameparentid_uq (parentid, name(20));
-
-create table weblogcategoryassoc (
-    id               varchar(48) not null primary key,
-    categoryid       varchar(48) not null,
-    ancestorid       varchar(40),
-    relation         varchar(20) not null
-);
-create index weblogcategoryassoc_categoryid_index on weblogcategoryassoc( categoryid );
-create index weblogcategoryassoc_ancestorid_index on weblogcategoryassoc( ancestorid );
-create index weblogcategoryassoc_relation_index on weblogcategoryassoc( relation );
-
-create table weblogentry (
-    id              varchar(48)  not null primary key,
-    anchor          varchar(255)  not null,
-    title           varchar(255)  not null,
-    text            @TEXT_SQL_TYPE@ not null,
-    pubtime         timestamp     not null,
-    updatetime      timestamp     not null,
-    websiteid       varchar(48)  not null,
-    categoryid      varchar(48)  not null,
-    publishentry    @BOOLEAN_SQL_TYPE_TRUE@ not null,
-    link            varchar(255) null,
-    plugins         varchar(255) null,
-    allowcomments   @BOOLEAN_SQL_TYPE_FALSE@ not null, 
-    commentdays     integer default 7 not null,
-    rightToLeft     @BOOLEAN_SQL_TYPE_FALSE@ not null,
-    pinnedtomain     @BOOLEAN_SQL_TYPE_FALSE@ not null
-);
-create index weblogentry_websiteid_index on weblogentry( websiteid );
-create index weblogentry_categoryid_index on weblogentry( categoryid );
-create index weblogentry_pubtime_index on weblogentry( pubtime,publishentry,websiteid );
-create index weblogentry_pinnedtomain_index on weblogentry(pinnedtomain);
-create index weblogentry_publishentry_index on weblogentry(publishentry);
-
-create table newsfeed (
-    id              varchar(48) not null primary key,
-    name            varchar(255) not null,
-    description     varchar(255) not null,
-    link            varchar(255) not null,
-    websiteid       varchar(48) not null
-);
-create index newsfeed_websiteid_index on newsfeed( websiteid );
-
-
-create table comment (
-    id      varchar(48) not null primary key,
-    entryid varchar(48) not null,
-    name    varchar(255) null,
-    email   varchar(255) null,
-    url     varchar(255) null,
-    content @TEXT_SQL_TYPE@ null,
-    posttime timestamp   not null,
-    spam    @BOOLEAN_SQL_TYPE_FALSE@ not null,
-    notify  @BOOLEAN_SQL_TYPE_FALSE@ not null,
-    remotehost varchar(128) null
-);
-create index comment_entryid_index on comment( entryid );
-
--- Ping Feature Tables
-
-create table pingtarget (
-    id           varchar(48) not null primary key,
-    name         varchar(255) not null, -- short descriptive name of the ping target
-    pingurl      varchar(255) not null,  -- URL to receive the ping
-    websiteid    varchar(48) null, -- if not null, this is a custom target defined by the
associated website
-    condition    integer default 0 not null, -- condition code
-    lastsuccess  timestamp null -- last successful use
-);
-create index pingtarget_websiteid_index on pingtarget( websiteid );
-
--- auto ping configurations
-create table autoping (
-    id            varchar(48) not null primary key,
-    websiteid     varchar(48) not null, -- fk reference to website for which this auto ping
configuration applies
-    pingtargetid  varchar(48) not null -- fk reference to the ping target to be pinged when
the website changes
-);
-create index autoping_websiteid_index on autoping( websiteid );
-create index autoping_pingtargetid_index on autoping( pingtargetid );
-
-create table pingcategory (
-    id            varchar(48) not null primary key,
-    autopingid  varchar(48) not null, -- fk reference to ping configuration
-    categoryid    varchar(48) not null -- fk reference to category
-);
-create index pingcategory_autopingid_index on pingcategory( autopingid );
-create index pingcategory_categoryid_index on pingcategory( categoryid );
-
-create table pingqueueentry (
-    id             varchar(48) not null primary key,
-    entrytime      timestamp not null, -- timestamp of original entry onto the ping queue
-    pingtargetid   varchar(48) not null,  -- weak fk reference to ping target (not constrained)
-    websiteid      varchar(48) not null,  -- weak fk reference to website originating the
ping (not constrained)
-    attempts       integer not null -- number of ping attempts that have been made for this
entry
-);
-create index pingqueueentry_entrytime_index on pingqueueentry( entrytime );
-create index pingqueueentry_pingtargetid_index on pingqueueentry( pingtargetid );
-create index pingqueueentry_websiteid_index on pingqueueentry( websiteid );
-
-
--- Referer tracks URLs that refer to websites and entries
-create table referer (
-    id        varchar(48) not null primary key,
-    websiteid varchar(48) not null,
-    entryid   varchar(48),
-    datestr   varchar(10),
-    refurl    varchar(255) not null,
-    refpermalink varchar(255),
-    reftime   timestamp,
-    requrl    varchar(255),
-    title     varchar(255),
-    excerpt   @TEXT_SQL_TYPE@ null,
-    dayhits   integer default 0 not null,
-    totalhits integer default 0 not null,
-    visible   @BOOLEAN_SQL_TYPE_FALSE@ not null,
-    duplicate @BOOLEAN_SQL_TYPE_FALSE@ not null
-);
-create index referer_websiteid_index on referer( websiteid );
-create index referer_entryid_index on referer( entryid );
-create index referer_refurl_index on referer( refurl@INDEXSIZE@ );
-create index referer_requrl_index on referer( requrl@INDEXSIZE@ );
-create index referer_datestr_index on referer( datestr );
-create index referer_refpermalink_index on referer( refpermalink@INDEXSIZE@ );
-create index referer_duplicate_index on referer( duplicate );
-
--- Configuration options for Roller, should only ever be one row
-create table rollerconfig (
-    id              varchar(48) not null primary key,
-    sitedescription varchar(255) null,
-    sitename        varchar(255) null,
-    emailaddress    varchar(255) null,
-    absoluteurl     varchar(255) null,
-    adminusers      varchar(255) null,
-    encryptpasswords @BOOLEAN_SQL_TYPE_TRUE@ not null,
-    algorithm       varchar(10) null,
-    newuserallowed  @BOOLEAN_SQL_TYPE_FALSE@ not null,
-    editorpages     varchar(255) null,
-    userthemes      varchar(255) not null,
-    indexdir        varchar(255) null,
-    memdebug        @BOOLEAN_SQL_TYPE_FALSE@ not null,
-    autoformatcomments @BOOLEAN_SQL_TYPE_FALSE@ not null,
-    escapecommenthtml @BOOLEAN_SQL_TYPE_TRUE@ not null,
-    emailcomments   @BOOLEAN_SQL_TYPE_FALSE@ not null,
-    enableaggregator @BOOLEAN_SQL_TYPE_FALSE@ not null,
-    enablelinkback  @BOOLEAN_SQL_TYPE_FALSE@ not null,
-    rsscachetime    integer default 3000 not null,
-    rssusecache     @BOOLEAN_SQL_TYPE_TRUE@ not null,
-    uploadallow     varchar(255) null,
-    uploadforbid    varchar(255) null,
-    uploadenabled   @BOOLEAN_SQL_TYPE_TRUE@ not null,
-    uploaddir       varchar(255) not null,
-    uploadpath      varchar(255) not null,
-    uploadmaxdirmb  decimal(5,2) default 4.0 not null,
-    uploadmaxfilemb decimal(5,2) default 1.5 not null,
-    dbversion       varchar(10) null,
-    refspamwords    @TEXT_SQL_TYPE@
-);
-
-create table roller_properties (
-    name     varchar(255) not null primary key,
-    value    @TEXT_SQL_TYPE@
-);
-
--- Entry attribute: metadata for weblog entries
-create table entryattribute (
-    id       varchar(48) not null primary key,
-    entryid  varchar(48) not null,
-    name     varchar(255) not null,
-    value    @TEXT_SQL_TYPE@ not null
-);
-create index entryattribute_entryid_index on entryattribute( entryid );
-alter table entryattribute add constraint entryattribute_name_uq unique ( entryid, name@INDEXSIZE@
);
-
-create table rag_group_subscription (
-    id               varchar(48) not null primary key,
-    group_id         varchar(48) not null,
-    subscription_id  varchar(48) not null
-);
-create index rag_group_subscription_gid on rag_group_subscription(group_id@INDEXSIZE@); 
-create index rag_group_subscription_sid on rag_group_subscription(subscription_id@INDEXSIZE@);

-
-create table rag_config (
-    id               varchar(48) not null primary key,
-    default_group_id varchar(48),
-    title            varchar(255) not null,
-    description      varchar(255),
-    site_url         varchar(255),
-    output_dir       varchar(255),
-    cache_dir        varchar(255) not null,
-    template_dir     varchar(255),
-    main_page        varchar(255),
-    admin_name       varchar(255),
-    admin_email      varchar(255) not null,
-    group_page       varchar(255),
-    proxy_host       varchar(255),
-    proxy_port       integer default -1
-);
-
-create table rag_group (
-    id               varchar(48) not null primary key,
-    handle           varchar(255) not null,
-    title            varchar(255) not null,
-    description      varchar(255),
-    cat_restriction  @TEXT_SQL_TYPE@,
-    group_page       varchar(255),
-    max_page_entries integer default 30,
-    max_feed_entries integer default 30
-);
-alter table rag_group add constraint rag_group_handle_uq unique ( handle@INDEXSIZE@ );
-create index rag_group_handle on rag_group(handle@INDEXSIZE@); 
-
-create table rag_subscription (
-    id               varchar(48) not null primary key,
-    title            varchar(255),
-    feed_url         varchar(255) not null,
-    site_url         varchar(255),
-    author           varchar(255),
-    last_updated     timestamp,
-    inbound_links    integer default -1,
-    inbound_blogs    integer default -1
-);
-alter table rag_subscription add constraint rag_feed_url_uq unique ( feed_url@INDEXSIZE_LARGE@
);
-create index rag_subscription_feed_url on rag_subscription(feed_url@INDEXSIZE@); 
-
-create table rag_entry (
-    id               varchar(48) not null primary key,
-    subscription_id  varchar(48) not null,
-    handle           varchar(255),
-    title            varchar(255),
-    guid             varchar(255),
-    permalink        @TEXT_SQL_TYPE@ not null,
-    author           varchar(255),
-    content          @TEXT_SQL_TYPE@,
-    categories       @TEXT_SQL_TYPE@,
-    published        timestamp not null,
-    updated          timestamp    
-);
-create index rag_entry_sid on rag_entry(subscription_id@INDEXSIZE@); 
-
--- *****************************************************
--- Now add the foreign key relationships
-
--- user, role and website
-
-alter table website add constraint website_userid_fk
-    foreign key ( userid ) references rolleruser ( id );
-
-alter table userrole add constraint userrole_userid_fk
-    foreign key ( userid ) references rolleruser( id );
-
--- page, entry, category, comment
-
-alter table webpage add constraint weblogpage_websiteid_fk
-    foreign key ( websiteid ) references website( id );
-
-alter table weblogentry add constraint weblogentry_websiteid_fk
-    foreign key ( websiteid ) references website( id );
-
-alter table weblogentry add constraint weblogentry_categoryid_fk
-    foreign key ( categoryid ) references weblogcategory( id );
-
-alter table weblogcategory add constraint weblogcategory_websiteid_fk
-    foreign key ( websiteid ) references website( id );
-
-alter table comment add constraint comment_entryid_fk
-    foreign key ( entryid ) references weblogentry( id );
-
-alter table entryattribute add constraint att_entryid_fk
-    foreign key ( entryid ) references weblogentry( id );
-
--- referer
-
-alter table referer add constraint referer_entryid_fk
-    foreign key ( entryid ) references weblogentry( id );
-
-alter table referer add constraint referer_websiteid_fk
-    foreign key ( websiteid ) references website( id );
-
--- folder and bookmark
-
-alter table folder add constraint folder_websiteid_fk
-    foreign key ( websiteid ) references website( id );
-
--- alter table folder add constraint folder_parentid_fk
---     foreign key ( parentid ) references folder( id );
-
-alter table bookmark add constraint bookmark_folderid_fk
-    foreign key ( folderid ) references folder( id );
-
--- newsfeed
-
-alter table newsfeed add constraint newsfeed_websiteid_fk
-    foreign key ( websiteid ) references website( id );
-
--- pingtarget, autoping, pingcategory
-
-alter table pingtarget add constraint pingtarget_websiteid_fk
-    foreign key (websiteid) references website(id);
-
-alter table autoping add constraint autoping_websiteid_fk
-    foreign key (websiteid) references website(id);
-
-alter table autoping add constraint autoping_pingtargetid_fk
-    foreign key (pingtargetid) references pingtarget(id);
-
-alter table pingcategory add constraint pingcategory_autopingid_fk
-    foreign key (autopingid) references autoping(id);
-
-alter table pingcategory add constraint pingcategory_categoryid_fk
-    foreign key (categoryid) references weblogcategory(id);
-
-
--- THE FOLLOWING CONSTRAINTS CAN NOT BE SUPPORTED FOR IMPORTING new-user.xml
--- alter table website add constraint website_defaultpageid_fk foreign key ( defaultpageid
) references webpage ( id );
--- alter table website add constraint website_weblogdayid_fk foreign key ( weblogdayid )
references webpage ( id );
--- alter table webpage add constraint webpage_websiteid_fk foreign key ( websiteid ) references
website( id );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+-- Run this script to create the Roller database tables in your database.
+-- Make sure you run the correct version of this script.
+--
+-- * For MySQL run the script createdb.sql found in the mysql directory.
+-- * For PostgreSQL run the script createdb.sql found in the postgresql directory.
+-- * For HSQLDB run the script createdb.sql found in the hsqldb directory.
+-- 
+-- For those who grabbed Roller source from CVS, don't try to run the script 
+-- named createdb-raw.sql, it is the source from which the above scripts are 
+-- created.
+
+-- *****************************************************
+-- Create the tables and indices
+
+create table rolleruser (
+    id              varchar(48) not null primary key,
+    username        varchar(255) not null,
+    passphrase      varchar(255) not null,
+    fullname        varchar(255) not null,
+    emailaddress    varchar(255) not null,
+    datecreated     timestamp not null
+);
+alter table rolleruser add constraint rolleruser_username_uq unique ( username@INDEXSIZE@
);
+
+create table userrole (
+    id               varchar(48) not null primary key,
+    rolename         varchar(255) not null,
+    username         varchar(255) not null,
+    userid           varchar(48) not null
+);
+create index userrole_userid_index on userrole( userid );
+create index userrole_username_index on userrole( username@INDEXSIZE@ );
+
+create table usercookie (
+    id              varchar(48) not null primary key,
+    username        varchar(255) not null,
+    cookieid        varchar(100) not null,
+    datecreated     timestamp not null
+);
+create index usercookie_username_index on usercookie( username@INDEXSIZE@ );
+create index usercookie_cookieid_index on usercookie( cookieid@INDEXSIZE@ );
+
+create table webpage (
+    id              varchar(48)  not null primary key,
+    name            varchar(255)  not null,
+    description     varchar(255)  null,
+    link            varchar(255)  null,
+    websiteid       varchar(255)  not null,
+    template        @TEXT_SQL_TYPE@ not null,
+    updatetime      timestamp     not null
+);
+create index webpage_name_index on webpage( name@INDEXSIZE@ );
+create index webpage_link_index on webpage( link@INDEXSIZE@ );
+create index webpage_id_index on webpage( websiteid );
+
+create table website (
+    id                varchar(48) not null primary key,
+    name              varchar(255) not null,
+    description       varchar(255) not null,
+    userid            varchar(48) not null,
+    defaultpageid     varchar(48) default 0 not null,
+    weblogdayid       varchar(48) not null,
+    ignorewords       @TEXT_SQL_TYPE@,
+    enablebloggerapi  @BOOLEAN_SQL_TYPE_FALSE@ not null,
+    editorpage        varchar(255) null,
+    bloggercatid      varchar(48) null,
+    defaultcatid      varchar(48) null,
+    allowcomments     @BOOLEAN_SQL_TYPE_TRUE@ not null,
+    emailcomments     @BOOLEAN_SQL_TYPE_FALSE@ not null,
+    emailfromaddress  varchar(255) null,
+    editortheme       varchar(255) null,
+    locale            varchar(20) null,
+    timezone          varchar(50) null,
+    defaultplugins    varchar(255) null,
+    pinnedtomain      @BOOLEAN_SQL_TYPE_FALSE@ not null,
+    isenabled         @BOOLEAN_SQL_TYPE_TRUE@ not null
+);
+create index website_id_index on website( id );
+create index website_userid_index on website( userid );
+create index website_isenabled_index on website( isenabled );
+
+create table folder (
+    id               varchar(48) not null primary key,
+    name             varchar(255) not null,
+    description      varchar(255) null,
+    websiteid        varchar(48) not null,
+    parentid        varchar(48)
+);
+create index folder_websiteid_index on folder( websiteid );
+
+create table folderassoc (
+    id               varchar(48) not null primary key,
+    folderid         varchar(48) not null,
+    ancestorid       varchar(40),
+    relation         varchar(20) not null
+);
+create index folderassoc_folderid_index on folderassoc( folderid );
+create index folderassoc_ancestorid_index on folderassoc( ancestorid );
+create index folderassoc_relation_index on folderassoc( relation );
+
+create table bookmark (
+    id               varchar(48) not null primary key,
+    folderid         varchar(48) not null,
+    name             varchar(255) not null,
+    description      varchar(255) null,
+    url              varchar(255) not null,
+    weight           integer default 0 not null,
+    priority         integer default 100 not null,
+    image            varchar(255) null,
+    feedurl          varchar(255) null
+);
+create index bookmark_folderid_index on bookmark( folderid );
+
+
+create table weblogcategory (
+    id               varchar(48)  not null primary key,
+    name             varchar(255) not null,
+    description      varchar(255) null,
+    websiteid        varchar(48)  not null,
+    image            varchar(255) null
+);
+create index weblogcategory_websiteid_index on weblogcategory( websiteid );
+-- alter table weblogcategory add unique category_nameparentid_uq (parentid, name(20));
+
+create table weblogcategoryassoc (
+    id               varchar(48) not null primary key,
+    categoryid       varchar(48) not null,
+    ancestorid       varchar(40),
+    relation         varchar(20) not null
+);
+create index weblogcategoryassoc_categoryid_index on weblogcategoryassoc( categoryid );
+create index weblogcategoryassoc_ancestorid_index on weblogcategoryassoc( ancestorid );
+create index weblogcategoryassoc_relation_index on weblogcategoryassoc( relation );
+
+create table weblogentry (
+    id              varchar(48)  not null primary key,
+    anchor          varchar(255)  not null,
+    title           varchar(255)  not null,
+    text            @TEXT_SQL_TYPE@ not null,
+    pubtime         timestamp     not null,
+    updatetime      timestamp     not null,
+    websiteid       varchar(48)  not null,
+    categoryid      varchar(48)  not null,
+    publishentry    @BOOLEAN_SQL_TYPE_TRUE@ not null,
+    link            varchar(255) null,
+    plugins         varchar(255) null,
+    allowcomments   @BOOLEAN_SQL_TYPE_FALSE@ not null, 
+    commentdays     integer default 7 not null,
+    rightToLeft     @BOOLEAN_SQL_TYPE_FALSE@ not null,
+    pinnedtomain     @BOOLEAN_SQL_TYPE_FALSE@ not null
+);
+create index weblogentry_websiteid_index on weblogentry( websiteid );
+create index weblogentry_categoryid_index on weblogentry( categoryid );
+create index weblogentry_pubtime_index on weblogentry( pubtime,publishentry,websiteid );
+create index weblogentry_pinnedtomain_index on weblogentry(pinnedtomain);
+create index weblogentry_publishentry_index on weblogentry(publishentry);
+
+create table newsfeed (
+    id              varchar(48) not null primary key,
+    name            varchar(255) not null,
+    description     varchar(255) not null,
+    link            varchar(255) not null,
+    websiteid       varchar(48) not null
+);
+create index newsfeed_websiteid_index on newsfeed( websiteid );
+
+
+create table comment (
+    id      varchar(48) not null primary key,
+    entryid varchar(48) not null,
+    name    varchar(255) null,
+    email   varchar(255) null,
+    url     varchar(255) null,
+    content @TEXT_SQL_TYPE@ null,
+    posttime timestamp   not null,
+    spam    @BOOLEAN_SQL_TYPE_FALSE@ not null,
+    notify  @BOOLEAN_SQL_TYPE_FALSE@ not null,
+    remotehost varchar(128) null
+);
+create index comment_entryid_index on comment( entryid );
+
+-- Ping Feature Tables
+
+create table pingtarget (
+    id           varchar(48) not null primary key,
+    name         varchar(255) not null, -- short descriptive name of the ping target
+    pingurl      varchar(255) not null,  -- URL to receive the ping
+    websiteid    varchar(48) null, -- if not null, this is a custom target defined by the
associated website
+    conditioncode    integer default 0 not null, -- condition code
+    lastsuccess  timestamp null -- last successful use
+);
+create index pingtarget_websiteid_index on pingtarget( websiteid );
+
+-- auto ping configurations
+create table autoping (
+    id            varchar(48) not null primary key,
+    websiteid     varchar(48) not null, -- fk reference to website for which this auto ping
configuration applies
+    pingtargetid  varchar(48) not null -- fk reference to the ping target to be pinged when
the website changes
+);
+create index autoping_websiteid_index on autoping( websiteid );
+create index autoping_pingtargetid_index on autoping( pingtargetid );
+
+create table pingcategory (
+    id            varchar(48) not null primary key,
+    autopingid  varchar(48) not null, -- fk reference to ping configuration
+    categoryid    varchar(48) not null -- fk reference to category
+);
+create index pingcategory_autopingid_index on pingcategory( autopingid );
+create index pingcategory_categoryid_index on pingcategory( categoryid );
+
+create table pingqueueentry (
+    id             varchar(48) not null primary key,
+    entrytime      timestamp not null, -- timestamp of original entry onto the ping queue
+    pingtargetid   varchar(48) not null,  -- weak fk reference to ping target (not constrained)
+    websiteid      varchar(48) not null,  -- weak fk reference to website originating the
ping (not constrained)
+    attempts       integer not null -- number of ping attempts that have been made for this
entry
+);
+create index pingqueueentry_entrytime_index on pingqueueentry( entrytime );
+create index pingqueueentry_pingtargetid_index on pingqueueentry( pingtargetid );
+create index pingqueueentry_websiteid_index on pingqueueentry( websiteid );
+
+
+-- Referer tracks URLs that refer to websites and entries
+create table referer (
+    id        varchar(48) not null primary key,
+    websiteid varchar(48) not null,
+    entryid   varchar(48),
+    datestr   varchar(10),
+    refurl    varchar(255) not null,
+    refpermalink varchar(255),
+    reftime   timestamp,
+    requrl    varchar(255),
+    title     varchar(255),
+    excerpt   @TEXT_SQL_TYPE@ null,
+    dayhits   integer default 0 not null,
+    totalhits integer default 0 not null,
+    visible   @BOOLEAN_SQL_TYPE_FALSE@ not null,
+    duplicate @BOOLEAN_SQL_TYPE_FALSE@ not null
+);
+create index referer_websiteid_index on referer( websiteid );
+create index referer_entryid_index on referer( entryid );
+create index referer_refurl_index on referer( refurl@INDEXSIZE@ );
+create index referer_requrl_index on referer( requrl@INDEXSIZE@ );
+create index referer_datestr_index on referer( datestr );
+create index referer_refpermalink_index on referer( refpermalink@INDEXSIZE@ );
+create index referer_duplicate_index on referer( duplicate );
+
+-- Configuration options for Roller, should only ever be one row
+create table rollerconfig (
+    id              varchar(48) not null primary key,
+    sitedescription varchar(255) null,
+    sitename        varchar(255) null,
+    emailaddress    varchar(255) null,
+    absoluteurl     varchar(255) null,
+    adminusers      varchar(255) null,
+    encryptpasswords @BOOLEAN_SQL_TYPE_TRUE@ not null,
+    algorithm       varchar(10) null,
+    newuserallowed  @BOOLEAN_SQL_TYPE_FALSE@ not null,
+    editorpages     varchar(255) null,
+    userthemes      varchar(255) not null,
+    indexdir        varchar(255) null,
+    memdebug        @BOOLEAN_SQL_TYPE_FALSE@ not null,
+    autoformatcomments @BOOLEAN_SQL_TYPE_FALSE@ not null,
+    escapecommenthtml @BOOLEAN_SQL_TYPE_TRUE@ not null,
+    emailcomments   @BOOLEAN_SQL_TYPE_FALSE@ not null,
+    enableaggregator @BOOLEAN_SQL_TYPE_FALSE@ not null,
+    enablelinkback  @BOOLEAN_SQL_TYPE_FALSE@ not null,
+    rsscachetime    integer default 3000 not null,
+    rssusecache     @BOOLEAN_SQL_TYPE_TRUE@ not null,
+    uploadallow     varchar(255) null,
+    uploadforbid    varchar(255) null,
+    uploadenabled   @BOOLEAN_SQL_TYPE_TRUE@ not null,
+    uploaddir       varchar(255) not null,
+    uploadpath      varchar(255) not null,
+    uploadmaxdirmb  decimal(5,2) default 4.0 not null,
+    uploadmaxfilemb decimal(5,2) default 1.5 not null,
+    dbversion       varchar(10) null,
+    refspamwords    @TEXT_SQL_TYPE@
+);
+
+create table roller_properties (
+    name     varchar(255) not null primary key,
+    value    @TEXT_SQL_TYPE@
+);
+
+-- Entry attribute: metadata for weblog entries
+create table entryattribute (
+    id       varchar(48) not null primary key,
+    entryid  varchar(48) not null,
+    name     varchar(255) not null,
+    value    @TEXT_SQL_TYPE@ not null
+);
+create index entryattribute_entryid_index on entryattribute( entryid );
+alter table entryattribute add constraint entryattribute_name_uq unique ( entryid, name@INDEXSIZE@
);
+
+create table rag_group_subscription (
+    id               varchar(48) not null primary key,
+    group_id         varchar(48) not null,
+    subscription_id  varchar(48) not null
+);
+create index rag_group_subscription_gid on rag_group_subscription(group_id@INDEXSIZE@); 
+create index rag_group_subscription_sid on rag_group_subscription(subscription_id@INDEXSIZE@);

+
+create table rag_config (
+    id               varchar(48) not null primary key,
+    default_group_id varchar(48),
+    title            varchar(255) not null,
+    description      varchar(255),
+    site_url         varchar(255),
+    output_dir       varchar(255),
+    cache_dir        varchar(255) not null,
+    template_dir     varchar(255),
+    main_page        varchar(255),
+    admin_name       varchar(255),
+    admin_email      varchar(255) not null,
+    group_page       varchar(255),
+    proxy_host       varchar(255),
+    proxy_port       integer default -1
+);
+
+create table rag_group (
+    id               varchar(48) not null primary key,
+    handle           varchar(255) not null,
+    title            varchar(255) not null,
+    description      varchar(255),
+    cat_restriction  @TEXT_SQL_TYPE@,
+    group_page       varchar(255),
+    max_page_entries integer default 30,
+    max_feed_entries integer default 30
+);
+alter table rag_group add constraint rag_group_handle_uq unique ( handle@INDEXSIZE@ );
+create index rag_group_handle on rag_group(handle@INDEXSIZE@); 
+
+create table rag_subscription (
+    id               varchar(48) not null primary key,
+    title            varchar(255),
+    feed_url         varchar(255) not null,
+    site_url         varchar(255),
+    author           varchar(255),
+    last_updated     timestamp,
+    inbound_links    integer default -1,
+    inbound_blogs    integer default -1
+);
+alter table rag_subscription add constraint rag_feed_url_uq unique ( feed_url@INDEXSIZE_LARGE@
);
+create index rag_subscription_feed_url on rag_subscription(feed_url@INDEXSIZE@); 
+
+create table rag_entry (
+    id               varchar(48) not null primary key,
+    subscription_id  varchar(48) not null,
+    handle           varchar(255),
+    title            varchar(255),
+    guid             varchar(255),
+    permalink        @TEXT_SQL_TYPE@ not null,
+    author           varchar(255),
+    content          @TEXT_SQL_TYPE@,
+    categories       @TEXT_SQL_TYPE@,
+    published        timestamp not null,
+    updated          timestamp    
+);
+create index rag_entry_sid on rag_entry(subscription_id@INDEXSIZE@); 
+
+-- *****************************************************
+-- Now add the foreign key relationships
+
+-- user, role and website
+
+alter table website add constraint website_userid_fk
+    foreign key ( userid ) references rolleruser ( id );
+
+alter table userrole add constraint userrole_userid_fk
+    foreign key ( userid ) references rolleruser( id );
+
+-- page, entry, category, comment
+
+alter table webpage add constraint weblogpage_websiteid_fk
+    foreign key ( websiteid ) references website( id );
+
+alter table weblogentry add constraint weblogentry_websiteid_fk
+    foreign key ( websiteid ) references website( id );
+
+alter table weblogentry add constraint weblogentry_categoryid_fk
+    foreign key ( categoryid ) references weblogcategory( id );
+
+alter table weblogcategory add constraint weblogcategory_websiteid_fk
+    foreign key ( websiteid ) references website( id );
+
+alter table comment add constraint comment_entryid_fk
+    foreign key ( entryid ) references weblogentry( id );
+
+alter table entryattribute add constraint att_entryid_fk
+    foreign key ( entryid ) references weblogentry( id );
+
+-- referer
+
+alter table referer add constraint referer_entryid_fk
+    foreign key ( entryid ) references weblogentry( id );
+
+alter table referer add constraint referer_websiteid_fk
+    foreign key ( websiteid ) references website( id );
+
+-- folder and bookmark
+
+alter table folder add constraint folder_websiteid_fk
+    foreign key ( websiteid ) references website( id );
+
+-- alter table folder add constraint folder_parentid_fk
+--     foreign key ( parentid ) references folder( id );
+
+alter table bookmark add constraint bookmark_folderid_fk
+    foreign key ( folderid ) references folder( id );
+
+-- newsfeed
+
+alter table newsfeed add constraint newsfeed_websiteid_fk
+    foreign key ( websiteid ) references website( id );
+
+-- pingtarget, autoping, pingcategory
+
+alter table pingtarget add constraint pingtarget_websiteid_fk
+    foreign key (websiteid) references website(id);
+
+alter table autoping add constraint autoping_websiteid_fk
+    foreign key (websiteid) references website(id);
+
+alter table autoping add constraint autoping_pingtargetid_fk
+    foreign key (pingtargetid) references pingtarget(id);
+
+alter table pingcategory add constraint pingcategory_autopingid_fk
+    foreign key (autopingid) references autoping(id);
+
+alter table pingcategory add constraint pingcategory_categoryid_fk
+    foreign key (categoryid) references weblogcategory(id);
+
+
+-- THE FOLLOWING CONSTRAINTS CAN NOT BE SUPPORTED FOR IMPORTING new-user.xml
+-- alter table website add constraint website_defaultpageid_fk foreign key ( defaultpageid
) references webpage ( id );
+-- alter table website add constraint website_weblogdayid_fk foreign key ( weblogdayid )
references webpage ( id );
+-- alter table webpage add constraint webpage_websiteid_fk foreign key ( websiteid ) references
website( id );
+
+
+
+
+
+
+
+
+
+
+
+
+
+

Propchange: incubator/roller/trunk/metadata/database/createdb-raw.sql
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/roller/trunk/src/org/roller/pojos/PingTargetData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/pojos/PingTargetData.java?rev=232624&r1=232623&r2=232624&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/pojos/PingTargetData.java (original)
+++ incubator/roller/trunk/src/org/roller/pojos/PingTargetData.java Sun Aug 14 10:40:54 2005
@@ -187,7 +187,7 @@
      * @return one of the condition codes {@link #CONDITION_OK}, {@link #CONDITION_FAILING},
{@link
      *         #CONDITION_DISABLED}.
      * @ejb:persistent-field
-     * @hibernate.property column="condition" not-null="true"
+     * @hibernate.property column="conditioncode" not-null="true"
      */
     public int getConditionCode()
     {

Propchange: incubator/roller/trunk/src/org/roller/pojos/PingTargetData.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message