typo 4.0.3 → 4.1

data/db/schema.postgresql.sql

@@ -7,182 +7,209 @@
 
 -- tables 
 
-CREATE TABLE articles_categories (
-  "article_id" integer,
-  "category_id" integer,
-  "is_primary" integer
-);
-
 CREATE TABLE articles_tags (
-  "article_id" integer,
-  "tag_id" integer
+  "article_id" integer DEFAULT NULL,
+  "tag_id" integer DEFAULT NULL
 );
 
 CREATE TABLE blacklist_patterns (
   "id" serial primary key,
-  "type" character varying(255),
-  "pattern" character varying(255)
+  "type" character varying(255) DEFAULT NULL,
+  "pattern" character varying(255) DEFAULT NULL
 );
 
 CREATE TABLE blogs (
   "id" serial primary key,
-  "settings" text
+  "settings" text DEFAULT NULL,
+  "base_url" character varying(255) DEFAULT NULL
 );
 
 CREATE TABLE categories (
   "id" serial primary key,
-  "name" character varying(255),
-  "position" integer,
-  "permalink" character varying(255)
+  "name" character varying(255) DEFAULT NULL,
+  "position" integer DEFAULT NULL,
+  "permalink" character varying(255) DEFAULT NULL
+);
+
+CREATE TABLE categorizations (
+  "id" serial primary key,
+  "article_id" integer DEFAULT NULL,
+  "category_id" integer DEFAULT NULL,
+  "is_primary" boolean DEFAULT NULL
 );
 
 CREATE TABLE contents (
   "id" serial primary key,
-  "type" character varying(255),
-  "title" character varying(255),
-  "author" character varying(255),
-  "body" text,
-  "body_html" text,
-  "extended" text,
-  "excerpt" text,
-  "keywords" character varying(255),
-  "created_at" timestamp,
-  "updated_at" timestamp,
-  "extended_html" text,
-  "user_id" integer,
-  "permalink" character varying(255),
-  "guid" character varying(255),
-  "text_filter_id" integer,
-  "whiteboard" text,
-  "article_id" integer,
-  "email" character varying(255),
-  "url" character varying(255),
-  "ip" character varying(40),
-  "blog_name" character varying(255),
-  "name" character varying(255),
+  "type" character varying(255) DEFAULT NULL,
+  "title" character varying(255) DEFAULT NULL,
+  "author" character varying(255) DEFAULT NULL,
+  "body" text DEFAULT NULL,
+  "extended" text DEFAULT NULL,
+  "excerpt" text DEFAULT NULL,
+  "keywords" character varying(255) DEFAULT NULL,
+  "created_at" timestamp DEFAULT NULL,
+  "updated_at" timestamp DEFAULT NULL,
+  "user_id" integer DEFAULT NULL,
+  "permalink" character varying(255) DEFAULT NULL,
+  "guid" character varying(255) DEFAULT NULL,
+  "text_filter_id" integer DEFAULT NULL,
+  "whiteboard" text DEFAULT NULL,
+  "name" character varying(255) DEFAULT NULL,
   "published" boolean DEFAULT 'f',
-  "allow_pings" boolean,
-  "allow_comments" boolean,
+  "allow_pings" boolean DEFAULT NULL,
+  "allow_comments" boolean DEFAULT NULL,
   "blog_id" integer NOT NULL,
-  "published_at" timestamp,
-  "state" text,
-  "status_confirmed" boolean
+  "published_at" timestamp DEFAULT NULL,
+  "state" text DEFAULT NULL
+);
+
+CREATE TABLE feedback (
+  "id" serial primary key,
+  "type" character varying(255) DEFAULT NULL,
+  "title" character varying(255) DEFAULT NULL,
+  "author" character varying(255) DEFAULT NULL,
+  "body" text DEFAULT NULL,
+  "extended" text DEFAULT NULL,
+  "excerpt" text DEFAULT NULL,
+  "keywords" character varying(255) DEFAULT NULL,
+  "created_at" timestamp DEFAULT NULL,
+  "updated_at" timestamp DEFAULT NULL,
+  "user_id" integer DEFAULT NULL,
+  "permalink" character varying(255) DEFAULT NULL,
+  "guid" character varying(255) DEFAULT NULL,
+  "text_filter_id" integer DEFAULT NULL,
+  "whiteboard" text DEFAULT NULL,
+  "article_id" integer DEFAULT NULL,
+  "email" character varying(255) DEFAULT NULL,
+  "url" character varying(255) DEFAULT NULL,
+  "ip" character varying(40) DEFAULT NULL,
+  "blog_name" character varying(255) DEFAULT NULL,
+  "name" character varying(255) DEFAULT NULL,
+  "published" boolean DEFAULT 'f',
+  "allow_pings" boolean DEFAULT NULL,
+  "allow_comments" boolean DEFAULT NULL,
+  "blog_id" integer NOT NULL,
+  "published_at" timestamp DEFAULT NULL,
+  "state" text DEFAULT NULL,
+  "status_confirmed" boolean DEFAULT NULL
 );
 
 CREATE TABLE notifications (
-  "notify_user_id" integer,
-  "notify_content_id" integer,
-  "created_at" timestamp,
-  "updated_at" timestamp
+  "id" serial primary key,
+  "content_id" integer DEFAULT NULL,
+  "user_id" integer DEFAULT NULL,
+  "created_at" timestamp DEFAULT NULL,
+  "updated_at" timestamp DEFAULT NULL
 );
 
 CREATE TABLE page_caches (
   "id" serial primary key,
-  "name" character varying(255)
+  "name" character varying(255) DEFAULT NULL
 );
 
 CREATE TABLE pings (
   "id" serial primary key,
-  "article_id" integer,
-  "url" character varying(255),
-  "created_at" timestamp
+  "article_id" integer DEFAULT NULL,
+  "url" character varying(255) DEFAULT NULL,
+  "created_at" timestamp DEFAULT NULL
 );
 
 CREATE TABLE redirects (
   "id" serial primary key,
-  "from_path" character varying(255),
-  "to_path" character varying(255)
+  "from_path" character varying(255) DEFAULT NULL,
+  "to_path" character varying(255) DEFAULT NULL
 );
 
 CREATE TABLE resources (
   "id" serial primary key,
-  "size" integer,
-  "filename" character varying(255),
-  "mime" character varying(255),
-  "created_at" timestamp,
-  "updated_at" timestamp,
-  "article_id" integer,
-  "itunes_metadata" boolean,
-  "itunes_author" character varying(255),
-  "itunes_subtitle" character varying(255),
-  "itunes_duration" integer,
-  "itunes_summary" text,
-  "itunes_keywords" character varying(255),
-  "itunes_category" character varying(255),
-  "itunes_explicit" boolean
+  "size" integer DEFAULT NULL,
+  "filename" character varying(255) DEFAULT NULL,
+  "mime" character varying(255) DEFAULT NULL,
+  "created_at" timestamp DEFAULT NULL,
+  "updated_at" timestamp DEFAULT NULL,
+  "article_id" integer DEFAULT NULL,
+  "itunes_metadata" boolean DEFAULT NULL,
+  "itunes_author" character varying(255) DEFAULT NULL,
+  "itunes_subtitle" character varying(255) DEFAULT NULL,
+  "itunes_duration" integer DEFAULT NULL,
+  "itunes_summary" text DEFAULT NULL,
+  "itunes_keywords" character varying(255) DEFAULT NULL,
+  "itunes_category" character varying(255) DEFAULT NULL,
+  "itunes_explicit" boolean DEFAULT NULL
 );
 
 CREATE TABLE sessions (
   "id" serial primary key,
-  "sessid" character varying(255),
-  "data" text,
-  "created_at" timestamp,
-  "updated_at" timestamp
+  "sessid" character varying(255) DEFAULT NULL,
+  "data" text DEFAULT NULL,
+  "created_at" timestamp DEFAULT NULL,
+  "updated_at" timestamp DEFAULT NULL
 );
 
 CREATE TABLE sidebars (
   "id" serial primary key,
-  "controller" character varying(255),
-  "active_position" integer,
-  "config" text,
-  "staged_position" integer
+  "active_position" integer DEFAULT NULL,
+  "config" text DEFAULT NULL,
+  "staged_position" integer DEFAULT NULL,
+  "type" character varying(255) DEFAULT NULL,
+  "blog_id" integer DEFAULT NULL
 );
 
 CREATE TABLE tags (
   "id" serial primary key,
-  "name" character varying(255),
-  "created_at" timestamp,
-  "updated_at" timestamp,
-  "display_name" character varying(255)
+  "name" character varying(255) DEFAULT NULL,
+  "created_at" timestamp DEFAULT NULL,
+  "updated_at" timestamp DEFAULT NULL,
+  "display_name" character varying(255) DEFAULT NULL
 );
 
 CREATE TABLE text_filters (
   "id" serial primary key,
-  "name" character varying(255),
-  "description" character varying(255),
-  "markup" character varying(255),
-  "filters" text,
-  "params" text
+  "name" character varying(255) DEFAULT NULL,
+  "description" character varying(255) DEFAULT NULL,
+  "markup" character varying(255) DEFAULT NULL,
+  "filters" text DEFAULT NULL,
+  "params" text DEFAULT NULL
 );
 
 CREATE TABLE triggers (
   "id" serial primary key,
-  "pending_item_id" integer,
-  "pending_item_type" character varying(255),
-  "due_at" timestamp,
-  "trigger_method" character varying(255)
+  "pending_item_id" integer DEFAULT NULL,
+  "pending_item_type" character varying(255) DEFAULT NULL,
+  "due_at" timestamp DEFAULT NULL,
+  "trigger_method" character varying(255) DEFAULT NULL
 );
 
 CREATE TABLE users (
   "id" serial primary key,
-  "login" character varying(255),
-  "password" character varying(255),
-  "email" text,
-  "name" text,
-  "notify_via_email" boolean,
-  "notify_on_new_articles" boolean,
-  "notify_on_comments" boolean,
-  "notify_watch_my_articles" boolean,
-  "notify_via_jabber" boolean,
-  "jabber" character varying(255)
+  "login" character varying(255) DEFAULT NULL,
+  "password" character varying(255) DEFAULT NULL,
+  "email" text DEFAULT NULL,
+  "name" text DEFAULT NULL,
+  "notify_via_email" boolean DEFAULT NULL,
+  "notify_on_new_articles" boolean DEFAULT NULL,
+  "notify_on_comments" boolean DEFAULT NULL,
+  "notify_watch_my_articles" boolean DEFAULT NULL,
+  "notify_via_jabber" boolean DEFAULT NULL,
+  "jabber" character varying(255) DEFAULT NULL
 );
 
 
 -- indexes 
 
-CREATE  INDEX "blacklist_patterns_pattern_index" ON blacklist_patterns ("pattern");
-CREATE  INDEX "categories_permalink_index" ON categories ("permalink");
-CREATE  INDEX "contents_blog_id_index" ON contents ("blog_id");
-CREATE  INDEX "contents_article_id_index" ON contents ("article_id");
-CREATE  INDEX "page_caches_name_index" ON page_caches ("name");
-CREATE  INDEX "pings_article_id_index" ON pings ("article_id");
-CREATE  INDEX "sessions_sessid_index" ON sessions ("sessid");
+CREATE  INDEX "index_blacklist_patterns_on_pattern" ON blacklist_patterns ("pattern");
+CREATE  INDEX "index_categories_on_permalink" ON categories ("permalink");
+CREATE  INDEX "index_contents_on_blog_id" ON contents ("blog_id");
+CREATE  INDEX "index_contents_on_text_filter_id" ON contents ("text_filter_id");
+CREATE  INDEX "index_contents_on_published" ON contents ("published");
+CREATE  INDEX "index_feedback_on_text_filter_id" ON feedback ("text_filter_id");
+CREATE  INDEX "index_feedback_on_article_id" ON feedback ("article_id");
+CREATE  INDEX "index_page_caches_on_name" ON page_caches ("name");
+CREATE  INDEX "index_pings_on_article_id" ON pings ("article_id");
+CREATE  INDEX "index_sessions_on_sessid" ON sessions ("sessid");
 
 -- data 
 
-INSERT INTO sidebars ("config", "staged_position", "active_position", "controller") VALUES(NULL, NULL, 0, 'category');
-INSERT INTO sidebars ("config", "staged_position", "active_position", "controller") VALUES(NULL, NULL, 1, 'static');
-INSERT INTO sidebars ("config", "staged_position", "active_position", "controller") VALUES(NULL, NULL, 2, 'xml');
 INSERT INTO text_filters ("name", "filters", "description", "params", "markup") VALUES('none', '--- []
 
 ', 'None', '--- {}
@@ -209,10 +236,15 @@ INSERT INTO text_filters ("name", "filters", "description", "params", "markup")
 
 ', 'textile');
 
+INSERT INTO sidebars ("id", "active_position", "config", "staged_position", "type", "blog_id") VALUES (1, 0, '--- !map:HashWithIndifferentAccess \nempty: false\ncount: true\n', 0, 'CategorySidebar', 1);
+INSERT INTO sidebars ("id", "active_position", "config", "staged_position", "type", "blog_id") VALUES (2, 2, '--- !map:HashWithIndifferentAccess \nformat: rss20\ntrackbacks: false\ncomments: true\narticles: true\n', 2, 'XmlSidebar', 1);
+INSERT INTO sidebars ("id", "active_position", "config", "staged_position", "type", "blog_id") VALUES (3, 1, '--- !map:HashWithIndifferentAccess \nbody: "<ul>\\n  <li><a href=\\"http://www.typosphere.org\\" title=\\"Typo\\">Typo</a></li>\\n  <li><a href=\\"http://blog.leetsoft.com\\" title=\\"too-biased\\">too-biased</a></li>\\n  <li><a href=\\"http://blog.remor.com/\\" title=\\"seth hall\\">Seth Hall</a></li>\\n  <li><a href=\\"http://scottstuff.net\\" title=\\"Scottstuff\\">scottstuff.net</a></li>\\n  <li><a href=\\"http://www.bofh.org.uk\\" title=\\"Just a Summary\\">Just A Summary</a></li>\\n  <li><a href=\\"http://nubyonrails.com\\" title=\\"Topfunky\\">Topfunky</a></li>\\n  <li><a href=\\"http://planettypo.com\\" title=\\"PlanetTypo\\">PlanetTypo</a></li>\\n  <li><a href=\\"http://typoforums.org\\" title=\\"Typo Forums\\">Typo Forums</a></li>\\n  <li><a href=\\"http://fredericdevillamil.com\\" title=\\"Fr\\xC3\\xA9d\\xC3\\xA9ric de Villamil\\">Fr\\xC3\\xA9d\\xC3\\xA9ric de Villamil</a></li>\\n\\\n  </ul>\\n"\ntitle: Links\n', NULL, 'StaticSidebar', 1);
+
+
 -- schema version meta-info 
 
 CREATE TABLE schema_info (
-  "version" integer
+  "version" integer DEFAULT NULL
 );
 
-insert into schema_info (version) values (50);
+insert into schema_info (version) values (61);

data/db/schema.rb

@@ -2,21 +2,15 @@
 # migrations feature of ActiveRecord to incrementally modify your database, and
 # then regenerate this schema definition.
 
-ActiveRecord::Schema.define(:version => 50) do
-
-  create_table "articles_categories", :id => false, :force => true do |t|
-    t.column "article_id", :integer
-    t.column "category_id", :integer
-    t.column "is_primary", :integer
-  end
+ActiveRecord::Schema.define(:version => 61) do
 
   create_table "articles_tags", :id => false, :force => true do |t|
     t.column "article_id", :integer
-    t.column "tag_id", :integer
+    t.column "tag_id",     :integer
   end
 
   create_table "blacklist_patterns", :force => true do |t|
-    t.column "type", :string
+    t.column "type",    :string
     t.column "pattern", :string
   end
 
@@ -24,54 +18,81 @@ ActiveRecord::Schema.define(:version => 50) do
 
   create_table "blogs", :force => true do |t|
     t.column "settings", :text
+    t.column "base_url", :string
   end
 
   create_table "categories", :force => true do |t|
-    t.column "name", :string
-    t.column "position", :integer
+    t.column "name",      :string
+    t.column "position",  :integer
     t.column "permalink", :string
   end
 
   add_index "categories", ["permalink"], :name => "categories_permalink_index"
 
+  create_table "categorizations", :force => true do |t|
+    t.column "article_id",  :integer
+    t.column "category_id", :integer
+    t.column "is_primary",  :boolean
+  end
+
   create_table "contents", :force => true do |t|
-    t.column "type", :string
-    t.column "title", :string
-    t.column "author", :string
-    t.column "body", :text
-    t.column "body_html", :text
-    t.column "extended", :text
-    t.column "excerpt", :text
-    t.column "keywords", :string
-    t.column "created_at", :datetime
-    t.column "updated_at", :datetime
-    t.column "extended_html", :text
-    t.column "user_id", :integer
-    t.column "permalink", :string
-    t.column "guid", :string
+    t.column "type",           :string
+    t.column "title",          :string
+    t.column "author",         :string
+    t.column "body",           :text
+    t.column "extended",       :text
+    t.column "excerpt",        :text
+    t.column "keywords",       :string
+    t.column "created_at",     :datetime
+    t.column "updated_at",     :datetime
+    t.column "user_id",        :integer
+    t.column "permalink",      :string
+    t.column "guid",           :string
     t.column "text_filter_id", :integer
-    t.column "whiteboard", :text
-    t.column "article_id", :integer
-    t.column "email", :string
-    t.column "url", :string
-    t.column "ip", :string, :limit => 40
-    t.column "blog_name", :string
-    t.column "name", :string
-    t.column "published", :boolean, :default => false
-    t.column "allow_pings", :boolean
+    t.column "whiteboard",     :text
+    t.column "name",           :string
+    t.column "published",      :boolean,  :default => false
+    t.column "allow_pings",    :boolean
     t.column "allow_comments", :boolean
-    t.column "blog_id", :integer, :null => false
-    t.column "published_at", :datetime
-    t.column "state", :text
-    t.column "status_confirmed", :boolean
+    t.column "blog_id",        :integer,                     :null => false
+    t.column "published_at",   :datetime
+    t.column "state",          :text
   end
 
-  add_index "contents", ["article_id"], :name => "contents_article_id_index"
   add_index "contents", ["blog_id"], :name => "contents_blog_id_index"
+  add_index "contents", ["published"], :name => "index_contents_on_published"
+  add_index "contents", ["text_filter_id"], :name => "index_contents_on_text_filter_id"
+
+  create_table "feedback", :force => true do |t|
+    t.column "type",             :string
+    t.column "title",            :string
+    t.column "author",           :string
+    t.column "body",             :text
+    t.column "excerpt",          :text
+    t.column "created_at",       :datetime
+    t.column "updated_at",       :datetime
+    t.column "user_id",          :integer
+    t.column "guid",             :string
+    t.column "text_filter_id",   :integer
+    t.column "whiteboard",       :text
+    t.column "article_id",       :integer
+    t.column "email",            :string
+    t.column "url",              :string
+    t.column "ip",               :string,   :limit => 40
+    t.column "blog_name",        :string
+    t.column "published",        :boolean,                :default => false
+    t.column "blog_id",          :integer,                                   :null => false
+    t.column "published_at",     :datetime
+    t.column "state",            :text
+    t.column "status_confirmed", :boolean
+  end
+
+  add_index "feedback", ["article_id"], :name => "index_feedback_on_article_id"
+  add_index "feedback", ["text_filter_id"], :name => "index_feedback_on_text_filter_id"
 
-  create_table "notifications", :id => false, :force => true do |t|
-    t.column "notify_user_id", :integer
-    t.column "notify_content_id", :integer
+  create_table "notifications", :force => true do |t|
+    t.column "content_id", :integer
+    t.column "user_id",    :integer
     t.column "created_at", :datetime
     t.column "updated_at", :datetime
   end
@@ -84,7 +105,7 @@ ActiveRecord::Schema.define(:version => 50) do
 
   create_table "pings", :force => true do |t|
     t.column "article_id", :integer
-    t.column "url", :string
+    t.column "url",        :string
     t.column "created_at", :datetime
   end
 
@@ -92,29 +113,29 @@ ActiveRecord::Schema.define(:version => 50) do
 
   create_table "redirects", :force => true do |t|
     t.column "from_path", :string
-    t.column "to_path", :string
+    t.column "to_path",   :string
   end
 
   create_table "resources", :force => true do |t|
-    t.column "size", :integer
-    t.column "filename", :string
-    t.column "mime", :string
-    t.column "created_at", :datetime
-    t.column "updated_at", :datetime
-    t.column "article_id", :integer
+    t.column "size",            :integer
+    t.column "filename",        :string
+    t.column "mime",            :string
+    t.column "created_at",      :datetime
+    t.column "updated_at",      :datetime
+    t.column "article_id",      :integer
     t.column "itunes_metadata", :boolean
-    t.column "itunes_author", :string
+    t.column "itunes_author",   :string
     t.column "itunes_subtitle", :string
     t.column "itunes_duration", :integer
-    t.column "itunes_summary", :text
+    t.column "itunes_summary",  :text
     t.column "itunes_keywords", :string
     t.column "itunes_category", :string
     t.column "itunes_explicit", :boolean
   end
 
   create_table "sessions", :force => true do |t|
-    t.column "sessid", :string
-    t.column "data", :text
+    t.column "sessid",     :string
+    t.column "data",       :text
     t.column "created_at", :datetime
     t.column "updated_at", :datetime
   end
@@ -122,45 +143,46 @@ ActiveRecord::Schema.define(:version => 50) do
   add_index "sessions", ["sessid"], :name => "sessions_sessid_index"
 
   create_table "sidebars", :force => true do |t|
-    t.column "controller", :string
     t.column "active_position", :integer
-    t.column "config", :text
+    t.column "config",          :text
     t.column "staged_position", :integer
+    t.column "type",            :string
+    t.column "blog_id",         :integer
   end
 
   create_table "tags", :force => true do |t|
-    t.column "name", :string
-    t.column "created_at", :datetime
-    t.column "updated_at", :datetime
+    t.column "name",         :string
+    t.column "created_at",   :datetime
+    t.column "updated_at",   :datetime
     t.column "display_name", :string
   end
 
   create_table "text_filters", :force => true do |t|
-    t.column "name", :string
+    t.column "name",        :string
     t.column "description", :string
-    t.column "markup", :string
-    t.column "filters", :text
-    t.column "params", :text
+    t.column "markup",      :string
+    t.column "filters",     :text
+    t.column "params",      :text
   end
 
   create_table "triggers", :force => true do |t|
-    t.column "pending_item_id", :integer
+    t.column "pending_item_id",   :integer
     t.column "pending_item_type", :string
-    t.column "due_at", :datetime
-    t.column "trigger_method", :string
+    t.column "due_at",            :datetime
+    t.column "trigger_method",    :string
   end
 
   create_table "users", :force => true do |t|
-    t.column "login", :string
-    t.column "password", :string
-    t.column "email", :text
-    t.column "name", :text
-    t.column "notify_via_email", :boolean
-    t.column "notify_on_new_articles", :boolean
-    t.column "notify_on_comments", :boolean
+    t.column "login",                    :string
+    t.column "password",                 :string
+    t.column "email",                    :text
+    t.column "name",                     :text
+    t.column "notify_via_email",         :boolean
+    t.column "notify_on_new_articles",   :boolean
+    t.column "notify_on_comments",       :boolean
     t.column "notify_watch_my_articles", :boolean
-    t.column "notify_via_jabber", :boolean
-    t.column "jabber", :string
+    t.column "notify_via_jabber",        :boolean
+    t.column "jabber",                   :string
   end
 
 end