timestamp -> timezone

Author: josevalim

integration_test/pg/storage_test.exs

@@ -29,11 +29,14 @@ defmodule Ecto.Integration.StorageTest do
 
   def create_database(owner \\ nil) do
     query = "CREATE DATABASE #{params()[:database]}"
-    query = if owner do
-      query <> " OWNER #{owner};"
-    else
-      query <> ";"
-    end
+
+    query =
+      if owner do
+        query <> " OWNER #{owner};"
+      else
+        query <> ";"
+      end
+
     run_psql(query)
   end
 
@@ -86,8 +89,8 @@ defmodule Ecto.Integration.StorageTest do
     drop_database()
   end
 
-  test "storage up with custom timestamp timezone" do
-    assert Postgres.storage_up([timestamp: "America/New_York"] ++ params()) == :ok
+  test "storage up with custom timezone" do
+    assert Postgres.storage_up([timezone: "America/New_York"] ++ params()) == :ok
     {output, _} = run_psql("SHOW timezone;", [params()[:database]])
     assert output =~ "America/New_York"
   after
@@ -109,10 +112,12 @@ defmodule Ecto.Integration.StorageTest do
   end
 
   test "storage up with unprivileged user with access to the database" do
-    unprivileged_params = Keyword.merge(params(),
-      username: "unprivileged",
-      password: "pass"
-    )
+    unprivileged_params =
+      Keyword.merge(params(),
+        username: "unprivileged",
+        password: "pass"
+      )
+
     run_psql("CREATE USER unprivileged WITH NOCREATEDB PASSWORD 'pass'")
     refute Postgres.storage_up(unprivileged_params) == :ok
     create_database("unprivileged")
@@ -190,7 +195,9 @@ defmodule Ecto.Integration.StorageTest do
     assert contents =~ "CREATE TABLE public.schema_migrations"
     assert contents =~ ~s[INSERT INTO public."schema_migrations" (version) VALUES (#{version})]
     assert contents =~ "CREATE TABLE test_schema.schema_migrations"
-    refute contents =~ ~s[INSERT INTO test_schema."schema_migrations" (version) VALUES (#{version})]
+
+    refute contents =~
+             ~s[INSERT INTO test_schema."schema_migrations" (version) VALUES (#{version})]
   after
     drop_schema_migrations_table(PoolRepo.config()[:database], "test_schema")
     drop_schema(PoolRepo.config()[:database], "test_schema")
@@ -212,7 +219,9 @@ defmodule Ecto.Integration.StorageTest do
     assert contents =~ "CREATE TABLE public.schema_migrations"
     assert contents =~ ~s[INSERT INTO public."schema_migrations" (version) VALUES (#{version})]
     assert contents =~ "CREATE TABLE test_schema.schema_migrations"
-    assert contents =~ ~s[INSERT INTO test_schema."schema_migrations" (version) VALUES (#{version})]
+
+    assert contents =~
+             ~s[INSERT INTO test_schema."schema_migrations" (version) VALUES (#{version})]
   after
     drop_schema_migrations_table(PoolRepo.config()[:database], "test_schema")
     drop_schema(PoolRepo.config()[:database], "test_schema")
@@ -234,13 +243,14 @@ defmodule Ecto.Integration.StorageTest do
     refute contents =~ "CREATE TABLE public.schema_migrations"
     refute contents =~ ~s[INSERT INTO public."schema_migrations" (version) VALUES (#{version})]
     assert contents =~ "CREATE TABLE test_schema.schema_migrations"
-    assert contents =~ ~s[INSERT INTO test_schema."schema_migrations" (version) VALUES (#{version})]
+
+    assert contents =~
+             ~s[INSERT INTO test_schema."schema_migrations" (version) VALUES (#{version})]
   after
     drop_schema_migrations_table(PoolRepo.config()[:database], "test_schema")
     drop_schema(PoolRepo.config()[:database], "test_schema")
   end
 
-
   test "storage status is up when database is created" do
     create_database()
     assert :up == Postgres.storage_status(params())

lib/ecto/adapters/postgres.ex

@@ -228,7 +228,7 @@ defmodule Ecto.Adapters.Postgres do
 
         case run_query(create_command, opts) do
           {:ok, _} ->
-            storage_up_timestamp(database, opts)
+            storage_up_timezone(database, opts)
 
           {:error, %{postgres: %{code: :duplicate_database}}} ->
             {:error, :already_up}
@@ -239,11 +239,11 @@ defmodule Ecto.Adapters.Postgres do
     end
   end
 
-  defp storage_up_timestamp(database, opts) do
-    timestamp = Keyword.get(opts, :timestamp, "Etc/UTC")
+  defp storage_up_timezone(database, opts) do
+    timezone = Keyword.get(opts, :timezone, "Etc/UTC")
 
-    if timestamp do
-      alter_command = ~s(ALTER DATABASE "#{database}" SET timezone TO '#{timestamp}')
+    if timezone do
+      alter_command = ~s(ALTER DATABASE "#{database}" SET timezone TO '#{timezone}')
 
       case run_query(alter_command, opts) do
         {:ok, _} -> :ok