From f799a4b0c0118b5930e61c3b698a9cdd749c14d4 Mon Sep 17 00:00:00 2001
From: hisaichi5518 <hisada.kazuki@gmail.com>
Date: Tue, 18 Jun 2013 13:41:12 +0900
Subject: [PATCH 1/2] added timezone warnings

---
 lib/DBIx/Class/InflateColumn/DateTime.pm | 5 +++++
 t/inflate/datetime_mysql.t               | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/lib/DBIx/Class/InflateColumn/DateTime.pm b/lib/DBIx/Class/InflateColumn/DateTime.pm
index 3162223fb..007e7c075 100644
--- a/lib/DBIx/Class/InflateColumn/DateTime.pm
+++ b/lib/DBIx/Class/InflateColumn/DateTime.pm
@@ -160,6 +160,11 @@ sub register_column {
     }
   }
 
+  if ($info->{time_zone}) {
+    carp "Putting 'time_zone', ".
+         "please put 'timezone' Instead of 'time_zone' into the '$column' column definition.";
+  }
+
   # shallow copy to avoid unfounded(?) Devel::Cycle complaints
   my $infcopy = {%$info};
 
diff --git a/t/inflate/datetime_mysql.t b/t/inflate/datetime_mysql.t
index a8108102e..86cca75a7 100644
--- a/t/inflate/datetime_mysql.t
+++ b/t/inflate/datetime_mysql.t
@@ -18,6 +18,13 @@ plan skip_all => 'Inflation tests need ' . DBIx::Class::Optional::Dependencies->
   DBICTest::Schema->load_classes('EventTZDeprecated');
 }
 
+{
+  local $SIG{__WARN__} = sub {
+    like shift, qr/Putting 'time_zone', please put 'timezone' Instead of 'time_zone' into the 'starts_at' column definition\./;
+  };
+  DBICTest::Schema->load_classes('EventTZWarning');
+}
+
 my $schema = DBICTest->init_schema();
 
 # Test "timezone" parameter

From 13d62aacb09da7b2acbd79a1a66b3e96ef245447 Mon Sep 17 00:00:00 2001
From: hisaichi5518 <hisada.kazuki@gmail.com>
Date: Tue, 18 Jun 2013 14:49:48 +0900
Subject: [PATCH 2/2] added t/lib/DBICTest/Schema/EventTZWarning.pm

---
 t/lib/DBICTest/Schema/EventTZWarning.pm | 29 +++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 t/lib/DBICTest/Schema/EventTZWarning.pm

diff --git a/t/lib/DBICTest/Schema/EventTZWarning.pm b/t/lib/DBICTest/Schema/EventTZWarning.pm
new file mode 100644
index 000000000..2a0ab57cc
--- /dev/null
+++ b/t/lib/DBICTest/Schema/EventTZWarning.pm
@@ -0,0 +1,29 @@
+package DBICTest::Schema::EventTZWarning;
+
+use strict;
+use warnings;
+
+use base qw/DBICTest::BaseResult/;
+
+__PACKAGE__->load_components(qw/InflateColumn::DateTime/);
+
+__PACKAGE__->table('event_tz_warning');
+
+__PACKAGE__->add_columns(
+  id => { data_type => 'integer', is_auto_increment => 1 },
+  starts_at => {
+    data_type => 'datetime',
+    time_zone => "America/Chicago",
+    locale    => 'de_DE',
+  },
+);
+
+__PACKAGE__->set_primary_key('id');
+
+sub _datetime_parser {
+  require DateTime::Format::MySQL;
+  DateTime::Format::MySQL->new();
+}
+
+
+1;