diff --git a/db/development_structure.sql b/db/development_structure.sql index 3317975ee..8309e1645 100644 --- a/db/development_structure.sql +++ b/db/development_structure.sql @@ -463,6 +463,37 @@ CREATE SEQUENCE advertisements_id_seq ALTER SEQUENCE advertisements_id_seq OWNED BY advertisements.id; +-- +-- Name: amazon_backups; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- + +CREATE TABLE amazon_backups ( + id integer NOT NULL, + last_id integer, + created_at timestamp without time zone, + updated_at timestamp without time zone +); + + +-- +-- Name: amazon_backups_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- + +CREATE SEQUENCE amazon_backups_id_seq + START WITH 1 + INCREMENT BY 1 + NO MAXVALUE + NO MINVALUE + CACHE 1; + + +-- +-- Name: amazon_backups_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - +-- + +ALTER SEQUENCE amazon_backups_id_seq OWNED BY amazon_backups.id; + + -- -- Name: artist_urls; Type: TABLE; Schema: public; Owner: -; Tablespace: -- @@ -2252,7 +2283,7 @@ CREATE TABLE tag_aliases ( creator_id integer NOT NULL, creator_ip_addr inet NOT NULL, forum_topic_id integer, - status character varying(255) DEFAULT 'pending'::character varying NOT NULL, + status text DEFAULT 'pending'::text NOT NULL, created_at timestamp without time zone, updated_at timestamp without time zone ); @@ -2289,7 +2320,7 @@ CREATE TABLE tag_implications ( creator_id integer NOT NULL, creator_ip_addr inet NOT NULL, forum_topic_id integer, - status character varying(255) DEFAULT 'pending'::character varying NOT NULL, + status text DEFAULT 'pending'::text NOT NULL, created_at timestamp without time zone, updated_at timestamp without time zone ); @@ -2623,6 +2654,13 @@ ALTER TABLE advertisement_hits ALTER COLUMN id SET DEFAULT nextval('advertisemen ALTER TABLE advertisements ALTER COLUMN id SET DEFAULT nextval('advertisements_id_seq'::regclass); +-- +-- Name: id; Type: DEFAULT; Schema: public; Owner: - +-- + +ALTER TABLE amazon_backups ALTER COLUMN id SET DEFAULT nextval('amazon_backups_id_seq'::regclass); + + -- -- Name: id; Type: DEFAULT; Schema: public; Owner: - -- @@ -2877,6 +2915,14 @@ ALTER TABLE ONLY advertisements ADD CONSTRAINT advertisements_pkey PRIMARY KEY (id); +-- +-- Name: amazon_backups_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- + +ALTER TABLE ONLY amazon_backups + ADD CONSTRAINT amazon_backups_pkey PRIMARY KEY (id); + + -- -- Name: artist_urls_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: -- @@ -5224,4 +5270,6 @@ INSERT INTO schema_migrations (version) VALUES ('20110607194023'); INSERT INTO schema_migrations (version) VALUES ('20110717010705'); -INSERT INTO schema_migrations (version) VALUES ('20110722211855'); \ No newline at end of file +INSERT INTO schema_migrations (version) VALUES ('20110722211855'); + +INSERT INTO schema_migrations (version) VALUES ('20110815233456'); \ No newline at end of file diff --git a/test/unit/upload_test.rb b/test/unit/upload_test.rb index 68a3bfe3b..554b9024d 100644 --- a/test/unit/upload_test.rb +++ b/test/unit/upload_test.rb @@ -111,11 +111,11 @@ class UploadTest < ActiveSupport::TestCase @upload.calculate_dimensions(@upload.file_path) assert_nothing_raised {@upload.generate_resizes(@upload.file_path)} assert(File.exists?(@upload.resized_file_path_for(Danbooru.config.small_image_width))) - assert_equal(6556, File.size(@upload.resized_file_path_for(Danbooru.config.small_image_width))) + assert_equal(7265, File.size(@upload.resized_file_path_for(Danbooru.config.small_image_width))) assert(File.exists?(@upload.resized_file_path_for(Danbooru.config.medium_image_width))) - assert_equal(39411, File.size(@upload.resized_file_path_for(Danbooru.config.medium_image_width))) + assert_equal(43474, File.size(@upload.resized_file_path_for(Danbooru.config.medium_image_width))) assert(File.exists?(@upload.resized_file_path_for(Danbooru.config.large_image_width))) - assert_equal(179324, File.size(@upload.resized_file_path_for(Danbooru.config.large_image_width))) + assert_equal(198583, File.size(@upload.resized_file_path_for(Danbooru.config.large_image_width))) end end