typo 4.0.3 → 4.1

data/db/schema.sqlite.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" INTEGER PRIMARY KEY NOT NULL,
-  "type" varchar(255),
-  "pattern" varchar(255)
+  "type" varchar(255) DEFAULT NULL,
+  "pattern" varchar(255) DEFAULT NULL
 );
 
 CREATE TABLE blogs (
   "id" INTEGER PRIMARY KEY NOT NULL,
-  "settings" text
+  "settings" text DEFAULT NULL,
+  "base_url" varchar(255) DEFAULT NULL
 );
 
 CREATE TABLE categories (
   "id" INTEGER PRIMARY KEY NOT NULL,
-  "name" varchar(255),
-  "position" integer,
-  "permalink" varchar(255)
+  "name" varchar(255) DEFAULT NULL,
+  "position" integer DEFAULT NULL,
+  "permalink" varchar(255) DEFAULT NULL
+);
+
+CREATE TABLE categorizations (
+  "id" INTEGER PRIMARY KEY NOT NULL,
+  "article_id" integer DEFAULT NULL,
+  "category_id" integer DEFAULT NULL,
+  "is_primary" boolean DEFAULT NULL
 );
 
 CREATE TABLE contents (
   "id" INTEGER PRIMARY KEY NOT NULL,
-  "type" varchar(255),
-  "title" varchar(255),
-  "author" varchar(255),
-  "body" text,
-  "body_html" text,
-  "extended" text,
-  "excerpt" text,
-  "keywords" varchar(255),
-  "created_at" datetime,
-  "updated_at" datetime,
-  "extended_html" text,
-  "user_id" integer,
-  "permalink" varchar(255),
-  "guid" varchar(255),
-  "text_filter_id" integer,
-  "whiteboard" text,
-  "article_id" integer,
-  "email" varchar(255),
-  "url" varchar(255),
-  "ip" varchar(40),
-  "blog_name" varchar(255),
-  "name" varchar(255),
+  "type" varchar(255) DEFAULT NULL,
+  "title" varchar(255) DEFAULT NULL,
+  "author" varchar(255) DEFAULT NULL,
+  "body" text DEFAULT NULL,
+  "extended" text DEFAULT NULL,
+  "excerpt" text DEFAULT NULL,
+  "keywords" varchar(255) DEFAULT NULL,
+  "created_at" datetime DEFAULT NULL,
+  "updated_at" datetime DEFAULT NULL,
+  "user_id" integer DEFAULT NULL,
+  "permalink" varchar(255) DEFAULT NULL,
+  "guid" varchar(255) DEFAULT NULL,
+  "text_filter_id" integer DEFAULT NULL,
+  "whiteboard" text DEFAULT NULL,
+  "name" varchar(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" datetime,
-  "state" text,
-  "status_confirmed" boolean
+  "published_at" datetime DEFAULT NULL,
+  "state" text DEFAULT NULL
+);
+
+CREATE TABLE feedback (
+  "id" INTEGER PRIMARY KEY NOT NULL,
+  "type" varchar(255) DEFAULT NULL,
+  "title" varchar(255) DEFAULT NULL,
+  "author" varchar(255) DEFAULT NULL,
+  "body" text DEFAULT NULL,
+  "extended" text DEFAULT NULL,
+  "excerpt" text DEFAULT NULL,
+  "keywords" varchar(255) DEFAULT NULL,
+  "created_at" datetime DEFAULT NULL,
+  "updated_at" datetime DEFAULT NULL,
+  "user_id" integer DEFAULT NULL,
+  "permalink" varchar(255) DEFAULT NULL,
+  "guid" varchar(255) DEFAULT NULL,
+  "text_filter_id" integer DEFAULT NULL,
+  "whiteboard" text DEFAULT NULL,
+  "article_id" integer DEFAULT NULL,
+  "email" varchar(255) DEFAULT NULL,
+  "url" varchar(255) DEFAULT NULL,
+  "ip" varchar(40) DEFAULT NULL,
+  "blog_name" varchar(255) DEFAULT NULL,
+  "name" varchar(255) DEFAULT NULL,
+  "published" boolean DEFAULT 'f',
+  "allow_pings" boolean DEFAULT NULL,
+  "allow_comments" boolean DEFAULT NULL,
+  "blog_id" integer NOT NULL,
+  "published_at" datetime DEFAULT NULL,
+  "state" text DEFAULT NULL,
+  "status_confirmed" boolean DEFAULT NULL
 );
 
 CREATE TABLE notifications (
-  "notify_user_id" integer,
-  "notify_content_id" integer,
-  "created_at" datetime,
-  "updated_at" datetime
+  "id" INTEGER PRIMARY KEY NOT NULL,
+  "content_id" integer DEFAULT NULL,
+  "user_id" integer DEFAULT NULL,
+  "created_at" datetime DEFAULT NULL,
+  "updated_at" datetime DEFAULT NULL
 );
 
 CREATE TABLE page_caches (
   "id" INTEGER PRIMARY KEY NOT NULL,
-  "name" varchar(255)
+  "name" varchar(255) DEFAULT NULL
 );
 
 CREATE TABLE pings (
   "id" INTEGER PRIMARY KEY NOT NULL,
-  "article_id" integer,
-  "url" varchar(255),
-  "created_at" datetime
+  "article_id" integer DEFAULT NULL,
+  "url" varchar(255) DEFAULT NULL,
+  "created_at" datetime DEFAULT NULL
 );
 
 CREATE TABLE redirects (
   "id" INTEGER PRIMARY KEY NOT NULL,
-  "from_path" varchar(255),
-  "to_path" varchar(255)
+  "from_path" varchar(255) DEFAULT NULL,
+  "to_path" varchar(255) DEFAULT NULL
 );
 
 CREATE TABLE resources (
   "id" INTEGER PRIMARY KEY NOT NULL,
-  "size" integer,
-  "filename" varchar(255),
-  "mime" varchar(255),
-  "created_at" datetime,
-  "updated_at" datetime,
-  "article_id" integer,
-  "itunes_metadata" boolean,
-  "itunes_author" varchar(255),
-  "itunes_subtitle" varchar(255),
-  "itunes_duration" integer,
-  "itunes_summary" text,
-  "itunes_keywords" varchar(255),
-  "itunes_category" varchar(255),
-  "itunes_explicit" boolean
+  "size" integer DEFAULT NULL,
+  "filename" varchar(255) DEFAULT NULL,
+  "mime" varchar(255) DEFAULT NULL,
+  "created_at" datetime DEFAULT NULL,
+  "updated_at" datetime DEFAULT NULL,
+  "article_id" integer DEFAULT NULL,
+  "itunes_metadata" boolean DEFAULT NULL,
+  "itunes_author" varchar(255) DEFAULT NULL,
+  "itunes_subtitle" varchar(255) DEFAULT NULL,
+  "itunes_duration" integer DEFAULT NULL,
+  "itunes_summary" text DEFAULT NULL,
+  "itunes_keywords" varchar(255) DEFAULT NULL,
+  "itunes_category" varchar(255) DEFAULT NULL,
+  "itunes_explicit" boolean DEFAULT NULL
 );
 
 CREATE TABLE sessions (
   "id" INTEGER PRIMARY KEY NOT NULL,
-  "sessid" varchar(255),
-  "data" text,
-  "created_at" datetime,
-  "updated_at" datetime
+  "sessid" varchar(255) DEFAULT NULL,
+  "data" text DEFAULT NULL,
+  "created_at" datetime DEFAULT NULL,
+  "updated_at" datetime DEFAULT NULL
 );
 
 CREATE TABLE sidebars (
   "id" INTEGER PRIMARY KEY NOT NULL,
-  "controller" varchar(255),
-  "active_position" integer,
-  "config" text,
-  "staged_position" integer
+  "active_position" integer DEFAULT NULL,
+  "config" text DEFAULT NULL,
+  "staged_position" integer DEFAULT NULL,
+  "type" varchar(255) DEFAULT NULL,
+  "blog_id" integer DEFAULT NULL
 );
 
 CREATE TABLE tags (
   "id" INTEGER PRIMARY KEY NOT NULL,
-  "name" varchar(255),
-  "created_at" datetime,
-  "updated_at" datetime,
-  "display_name" varchar(255)
+  "name" varchar(255) DEFAULT NULL,
+  "created_at" datetime DEFAULT NULL,
+  "updated_at" datetime DEFAULT NULL,
+  "display_name" varchar(255) DEFAULT NULL
 );
 
 CREATE TABLE text_filters (
   "id" INTEGER PRIMARY KEY NOT NULL,
-  "name" varchar(255),
-  "description" varchar(255),
-  "markup" varchar(255),
-  "filters" text,
-  "params" text
+  "name" varchar(255) DEFAULT NULL,
+  "description" varchar(255) DEFAULT NULL,
+  "markup" varchar(255) DEFAULT NULL,
+  "filters" text DEFAULT NULL,
+  "params" text DEFAULT NULL
 );
 
 CREATE TABLE triggers (
   "id" INTEGER PRIMARY KEY NOT NULL,
-  "pending_item_id" integer,
-  "pending_item_type" varchar(255),
-  "due_at" datetime,
-  "trigger_method" varchar(255)
+  "pending_item_id" integer DEFAULT NULL,
+  "pending_item_type" varchar(255) DEFAULT NULL,
+  "due_at" datetime DEFAULT NULL,
+  "trigger_method" varchar(255) DEFAULT NULL
 );
 
 CREATE TABLE users (
   "id" INTEGER PRIMARY KEY NOT NULL,
-  "login" varchar(255),
-  "password" varchar(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" varchar(255)
+  "login" varchar(255) DEFAULT NULL,
+  "password" varchar(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" varchar(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.sqlserver.sql

@@ -7,196 +7,226 @@
 
 -- tables 
 
-CREATE TABLE articles_categories (
-  [article_id] int,
-  [category_id] int,
-  [is_primary] int
-);
-
 CREATE TABLE articles_tags (
-  [article_id] int,
-  [tag_id] int
+  [article_id] integer DEFAULT NULL,
+  [tag_id] integer DEFAULT NULL
 );
 
 CREATE TABLE blacklist_patterns (
   [id] int NOT NULL IDENTITY(1,
   1) PRIMARY KEY,
-  [type] varchar(255),
-  [pattern] varchar(255)
+  [type] varchar(255) DEFAULT NULL,
+  [pattern] varchar(255) DEFAULT NULL
 );
 
 CREATE TABLE blogs (
   [id] int NOT NULL IDENTITY(1,
   1) PRIMARY KEY,
-  [settings] text
+  [settings] text DEFAULT NULL,
+  [base_url] varchar(255) DEFAULT NULL
 );
 
 CREATE TABLE categories (
   [id] int NOT NULL IDENTITY(1,
   1) PRIMARY KEY,
-  [name] varchar(255),
-  [position] int,
-  [permalink] varchar(255)
+  [name] varchar(255) DEFAULT NULL,
+  [position] integer DEFAULT NULL,
+  [permalink] varchar(255) DEFAULT NULL
+);
+
+CREATE TABLE categorizations (
+  [id] int NOT NULL IDENTITY(1,
+  1) PRIMARY KEY,
+  [article_id] integer DEFAULT NULL,
+  [category_id] integer DEFAULT NULL,
+  [is_primary] bit DEFAULT NULL
 );
 
 CREATE TABLE contents (
   [id] int NOT NULL IDENTITY(1,
   1) PRIMARY KEY,
-  [type] varchar(255),
-  [title] varchar(255),
-  [author] varchar(255),
-  [body] text,
-  [body_html] text,
-  [extended] text,
-  [excerpt] text,
-  [keywords] varchar(255),
-  [created_at] datetime,
-  [updated_at] datetime,
-  [extended_html] text,
-  [user_id] int,
-  [permalink] varchar(255),
-  [guid] varchar(255),
-  [text_filter_id] int,
-  [whiteboard] text,
-  [article_id] int,
-  [email] varchar(255),
-  [url] varchar(255),
-  [ip] varchar(40),
-  [blog_name] varchar(255),
-  [name] varchar(255),
+  [type] varchar(255) DEFAULT NULL,
+  [title] varchar(255) DEFAULT NULL,
+  [author] varchar(255) DEFAULT NULL,
+  [body] text DEFAULT NULL,
+  [extended] text DEFAULT NULL,
+  [excerpt] text DEFAULT NULL,
+  [keywords] varchar(255) DEFAULT NULL,
+  [created_at] datetime DEFAULT NULL,
+  [updated_at] datetime DEFAULT NULL,
+  [user_id] integer DEFAULT NULL,
+  [permalink] varchar(255) DEFAULT NULL,
+  [guid] varchar(255) DEFAULT NULL,
+  [text_filter_id] integer DEFAULT NULL,
+  [whiteboard] text DEFAULT NULL,
+  [name] varchar(255) DEFAULT NULL,
   [published] bit DEFAULT 0,
-  [allow_pings] bit,
-  [allow_comments] bit,
-  [blog_id] int NOT NULL,
-  [published_at] datetime,
-  [state] text,
-  [status_confirmed] bit
+  [allow_pings] bit DEFAULT NULL,
+  [allow_comments] bit DEFAULT NULL,
+  [blog_id] integer NOT NULL,
+  [published_at] datetime DEFAULT NULL,
+  [state] text DEFAULT NULL
+);
+
+CREATE TABLE feedback (
+  [id] int NOT NULL IDENTITY(1,
+  1) PRIMARY KEY,
+  [type] varchar(255) DEFAULT NULL,
+  [title] varchar(255) DEFAULT NULL,
+  [author] varchar(255) DEFAULT NULL,
+  [body] text DEFAULT NULL,
+  [extended] text DEFAULT NULL,
+  [excerpt] text DEFAULT NULL,
+  [keywords] varchar(255) DEFAULT NULL,
+  [created_at] datetime DEFAULT NULL,
+  [updated_at] datetime DEFAULT NULL,
+  [user_id] integer DEFAULT NULL,
+  [permalink] varchar(255) DEFAULT NULL,
+  [guid] varchar(255) DEFAULT NULL,
+  [text_filter_id] integer DEFAULT NULL,
+  [whiteboard] text DEFAULT NULL,
+  [article_id] integer DEFAULT NULL,
+  [email] varchar(255) DEFAULT NULL,
+  [url] varchar(255) DEFAULT NULL,
+  [ip] varchar(40) DEFAULT NULL,
+  [blog_name] varchar(255) DEFAULT NULL,
+  [name] varchar(255) DEFAULT NULL,
+  [published] bit DEFAULT 0,
+  [allow_pings] bit DEFAULT NULL,
+  [allow_comments] bit DEFAULT NULL,
+  [blog_id] integer NOT NULL,
+  [published_at] datetime DEFAULT NULL,
+  [state] text DEFAULT NULL,
+  [status_confirmed] bit DEFAULT NULL
 );
 
 CREATE TABLE notifications (
-  [notify_user_id] int,
-  [notify_content_id] int,
-  [created_at] datetime,
-  [updated_at] datetime
+  [id] int NOT NULL IDENTITY(1,
+  1) PRIMARY KEY,
+  [content_id] integer DEFAULT NULL,
+  [user_id] integer DEFAULT NULL,
+  [created_at] datetime DEFAULT NULL,
+  [updated_at] datetime DEFAULT NULL
 );
 
 CREATE TABLE page_caches (
   [id] int NOT NULL IDENTITY(1,
   1) PRIMARY KEY,
-  [name] varchar(255)
+  [name] varchar(255) DEFAULT NULL
 );
 
 CREATE TABLE pings (
   [id] int NOT NULL IDENTITY(1,
   1) PRIMARY KEY,
-  [article_id] int,
-  [url] varchar(255),
-  [created_at] datetime
+  [article_id] integer DEFAULT NULL,
+  [url] varchar(255) DEFAULT NULL,
+  [created_at] datetime DEFAULT NULL
 );
 
 CREATE TABLE redirects (
   [id] int NOT NULL IDENTITY(1,
   1) PRIMARY KEY,
-  [from_path] varchar(255),
-  [to_path] varchar(255)
+  [from_path] varchar(255) DEFAULT NULL,
+  [to_path] varchar(255) DEFAULT NULL
 );
 
 CREATE TABLE resources (
   [id] int NOT NULL IDENTITY(1,
   1) PRIMARY KEY,
-  [size] int,
-  [filename] varchar(255),
-  [mime] varchar(255),
-  [created_at] datetime,
-  [updated_at] datetime,
-  [article_id] int,
-  [itunes_metadata] bit,
-  [itunes_author] varchar(255),
-  [itunes_subtitle] varchar(255),
-  [itunes_duration] int,
-  [itunes_summary] text,
-  [itunes_keywords] varchar(255),
-  [itunes_category] varchar(255),
-  [itunes_explicit] bit
+  [size] integer DEFAULT NULL,
+  [filename] varchar(255) DEFAULT NULL,
+  [mime] varchar(255) DEFAULT NULL,
+  [created_at] datetime DEFAULT NULL,
+  [updated_at] datetime DEFAULT NULL,
+  [article_id] integer DEFAULT NULL,
+  [itunes_metadata] bit DEFAULT NULL,
+  [itunes_author] varchar(255) DEFAULT NULL,
+  [itunes_subtitle] varchar(255) DEFAULT NULL,
+  [itunes_duration] integer DEFAULT NULL,
+  [itunes_summary] text DEFAULT NULL,
+  [itunes_keywords] varchar(255) DEFAULT NULL,
+  [itunes_category] varchar(255) DEFAULT NULL,
+  [itunes_explicit] bit DEFAULT NULL
 );
 
 CREATE TABLE sessions (
   [id] int NOT NULL IDENTITY(1,
   1) PRIMARY KEY,
-  [sessid] varchar(255),
-  [data] text,
-  [created_at] datetime,
-  [updated_at] datetime
+  [sessid] varchar(255) DEFAULT NULL,
+  [data] text DEFAULT NULL,
+  [created_at] datetime DEFAULT NULL,
+  [updated_at] datetime DEFAULT NULL
 );
 
 CREATE TABLE sidebars (
   [id] int NOT NULL IDENTITY(1,
   1) PRIMARY KEY,
-  [controller] varchar(255),
-  [active_position] int,
-  [config] text,
-  [staged_position] int
+  [active_position] integer DEFAULT NULL,
+  [config] text DEFAULT NULL,
+  [staged_position] integer DEFAULT NULL,
+  [type] varchar(255) DEFAULT NULL,
+  [blog_id] integer DEFAULT NULL
 );
 
 CREATE TABLE tags (
   [id] int NOT NULL IDENTITY(1,
   1) PRIMARY KEY,
-  [name] varchar(255),
-  [created_at] datetime,
-  [updated_at] datetime,
-  [display_name] varchar(255)
+  [name] varchar(255) DEFAULT NULL,
+  [created_at] datetime DEFAULT NULL,
+  [updated_at] datetime DEFAULT NULL,
+  [display_name] varchar(255) DEFAULT NULL
 );
 
 CREATE TABLE text_filters (
   [id] int NOT NULL IDENTITY(1,
   1) PRIMARY KEY,
-  [name] varchar(255),
-  [description] varchar(255),
-  [markup] varchar(255),
-  [filters] text,
-  [params] text
+  [name] varchar(255) DEFAULT NULL,
+  [description] varchar(255) DEFAULT NULL,
+  [markup] varchar(255) DEFAULT NULL,
+  [filters] text DEFAULT NULL,
+  [params] text DEFAULT NULL
 );
 
 CREATE TABLE triggers (
   [id] int NOT NULL IDENTITY(1,
   1) PRIMARY KEY,
-  [pending_item_id] int,
-  [pending_item_type] varchar(255),
-  [due_at] datetime,
-  [trigger_method] varchar(255)
+  [pending_item_id] integer DEFAULT NULL,
+  [pending_item_type] varchar(255) DEFAULT NULL,
+  [due_at] datetime DEFAULT NULL,
+  [trigger_method] varchar(255) DEFAULT NULL
 );
 
 CREATE TABLE users (
   [id] int NOT NULL IDENTITY(1,
   1) PRIMARY KEY,
-  [login] varchar(255),
-  [password] varchar(255),
-  [email] text,
-  [name] text,
-  [notify_via_email] bit,
-  [notify_on_new_articles] bit,
-  [notify_on_comments] bit,
-  [notify_watch_my_articles] bit,
-  [notify_via_jabber] bit,
-  [jabber] varchar(255)
+  [login] varchar(255) DEFAULT NULL,
+  [password] varchar(255) DEFAULT NULL,
+  [email] text DEFAULT NULL,
+  [name] text DEFAULT NULL,
+  [notify_via_email] bit DEFAULT NULL,
+  [notify_on_new_articles] bit DEFAULT NULL,
+  [notify_on_comments] bit DEFAULT NULL,
+  [notify_watch_my_articles] bit DEFAULT NULL,
+  [notify_via_jabber] bit DEFAULT NULL,
+  [jabber] varchar(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', '--- {}
@@ -223,10 +253,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] int
+  [version] integer DEFAULT NULL
 );
 
-insert into schema_info (version) values (50);
+insert into schema_info (version) values (61);