From d2a57728529b95fa1c2e3da677e64c848e7d065b Mon Sep 17 00:00:00 2001 From: Charles McGarvey Date: Mon, 17 Oct 2011 20:25:15 -0600 Subject: [PATCH] fixed sqlite schema timestamp identifier --- db/schema.sql | 6 +++--- lib/Chatty/Schema/Result/Account.pm | 4 ++-- lib/Chatty/Schema/Result/Message.pm | 12 ++++++++---- lib/Chatty/Schema/Result/Room.pm | 13 +++++++++---- 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/db/schema.sql b/db/schema.sql index 70a5a24..fee4063 100644 --- a/db/schema.sql +++ b/db/schema.sql @@ -3,8 +3,8 @@ PRAGMA foreign_keys = ON; CREATE TABLE room ( id INTEGER PRIMARY KEY, - name TEXT, - created TIMESTAMP DEFAULT NOW + name TEXT UNIQUE, + created TIMESTAMP DEFAULT CURRENT_TIMESTAMP ); CREATE TABLE account ( @@ -18,7 +18,7 @@ CREATE TABLE account ( CREATE TABLE message ( id INTEGER PRIMARY KEY, - posted TIMESTAMP DEFAULT NOW, + posted TIMESTAMP DEFAULT CURRENT_TIMESTAMP, author INTEGER REFERENCES account(id), room INTEGER REFERENCES room(id), content TEXT diff --git a/lib/Chatty/Schema/Result/Account.pm b/lib/Chatty/Schema/Result/Account.pm index 1432ed5..60b33b1 100644 --- a/lib/Chatty/Schema/Result/Account.pm +++ b/lib/Chatty/Schema/Result/Account.pm @@ -113,8 +113,8 @@ __PACKAGE__->has_many( ); -# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-10-13 18:47:53 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:l1E3sAYHA5mK6RiNszOTzA +# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-10-17 20:21:50 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:jbeLiaDPsjHNHj5O11tPFA # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/lib/Chatty/Schema/Result/Message.pm b/lib/Chatty/Schema/Result/Message.pm index 792713d..78a7441 100644 --- a/lib/Chatty/Schema/Result/Message.pm +++ b/lib/Chatty/Schema/Result/Message.pm @@ -32,7 +32,7 @@ __PACKAGE__->table("message"); =head2 posted data_type: 'timestamp' - default_value: NOW + default_value: current_timestamp is_nullable: 1 =head2 author @@ -58,7 +58,11 @@ __PACKAGE__->add_columns( "id", { data_type => "integer", is_auto_increment => 1, is_nullable => 0 }, "posted", - { data_type => "timestamp", default_value => \"NOW", is_nullable => 1 }, + { + data_type => "timestamp", + default_value => \"current_timestamp", + is_nullable => 1, + }, "author", { data_type => "integer", is_foreign_key => 1, is_nullable => 1 }, "room", @@ -111,8 +115,8 @@ __PACKAGE__->belongs_to( ); -# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-10-13 18:47:53 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:q1cq2bWftQPoo8huOftzMQ +# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-10-17 20:21:50 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:R28y3tHGM5FZTILUAO/0XA # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/lib/Chatty/Schema/Result/Room.pm b/lib/Chatty/Schema/Result/Room.pm index 7ae5643..53516f3 100644 --- a/lib/Chatty/Schema/Result/Room.pm +++ b/lib/Chatty/Schema/Result/Room.pm @@ -37,7 +37,7 @@ __PACKAGE__->table("room"); =head2 created data_type: 'timestamp' - default_value: NOW + default_value: current_timestamp is_nullable: 1 =cut @@ -48,9 +48,14 @@ __PACKAGE__->add_columns( "name", { data_type => "text", is_nullable => 1 }, "created", - { data_type => "timestamp", default_value => \"NOW", is_nullable => 1 }, + { + data_type => "timestamp", + default_value => \"current_timestamp", + is_nullable => 1, + }, ); __PACKAGE__->set_primary_key("id"); +__PACKAGE__->add_unique_constraint("name_unique", ["name"]); =head1 RELATIONS @@ -85,8 +90,8 @@ __PACKAGE__->has_many( ); -# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-10-13 18:47:53 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:2QSf3vZfv8xVbUKtsKsvDg +# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-10-17 20:21:50 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:U0zHyxd2zFVEnATmgpd+Ag # You can replace this text with custom code or comments, and it will be preserved on regeneration -- 2.45.2