Fix frame data records being created for non-ugoira posts.
* Prevent non-ugoira posts from getting dummy frame data records with all the columns set to null. * Make `data` and `content_type` columns NOT NULL, since they should always be present. * Remove the timestamps while we're at it, since they don't seem necessary for anything.
This commit is contained in:
@@ -112,7 +112,7 @@ class Upload < ActiveRecord::Base
|
|||||||
post.distribute_files
|
post.distribute_files
|
||||||
if post.save
|
if post.save
|
||||||
CurrentUser.increment!(:post_upload_count)
|
CurrentUser.increment!(:post_upload_count)
|
||||||
ugoira_service.process(post)
|
ugoira_service.process(post) if is_ugoira?
|
||||||
update_attributes(:status => "completed", :post_id => post.id)
|
update_attributes(:status => "completed", :post_id => post.id)
|
||||||
else
|
else
|
||||||
update_attribute(:status, "error: " + post.errors.full_messages.join(", "))
|
update_attribute(:status, "error: " + post.errors.full_messages.join(", "))
|
||||||
|
|||||||
9
db/migrate/20141017231608_fix_pixiv_ugoira_frame_data.rb
Normal file
9
db/migrate/20141017231608_fix_pixiv_ugoira_frame_data.rb
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
class FixPixivUgoiraFrameData < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
change_table :pixiv_ugoira_frame_data do |t|
|
||||||
|
t.change :data, :text, :null => false
|
||||||
|
t.change :content_type, :string, :null => false
|
||||||
|
t.remove_timestamps
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -2367,10 +2367,8 @@ ALTER SEQUENCE notes_id_seq OWNED BY notes.id;
|
|||||||
CREATE TABLE pixiv_ugoira_frame_data (
|
CREATE TABLE pixiv_ugoira_frame_data (
|
||||||
id integer NOT NULL,
|
id integer NOT NULL,
|
||||||
post_id integer,
|
post_id integer,
|
||||||
data text,
|
data text NOT NULL,
|
||||||
content_type character varying(255),
|
content_type character varying(255) NOT NULL
|
||||||
created_at timestamp without time zone,
|
|
||||||
updated_at timestamp without time zone
|
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
@@ -7119,3 +7117,5 @@ INSERT INTO schema_migrations (version) VALUES ('20140725003232');
|
|||||||
|
|
||||||
INSERT INTO schema_migrations (version) VALUES ('20141009231234');
|
INSERT INTO schema_migrations (version) VALUES ('20141009231234');
|
||||||
|
|
||||||
|
INSERT INTO schema_migrations (version) VALUES ('20141017231608');
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user