Revert "add: config db-timezone-enabled for optional querying of timezones"

This reverts commit d6c338d588.

test/spec/Feature/Query/Preferences/TimezoneSpec.hs

@@ -5,13 +5,12 @@ import Test.Hspec
 import Test.Hspec.Wai
 import Test.Hspec.Wai.JSON
 
-import PostgREST.Config (AppConfig (..))
-
 import Protolude  hiding (get)
 import SpecHelper
 
-enabledSpec :: SpecWithConfig
-enabledSpec withConfig = withConfig baseCfg $ describe "test Prefer: timezone with db-timezone-enabled is true" $ do
+spec :: SpecWithConfig
+spec withConfig = withConfig baseCfg $
+  describe "test Prefer: timezone with db-timezone-enabled is true" $ do
     context "test Prefer: timezone=America/Los_Angeles" $ do
       it "should change timezone with handling=strict" $
         request methodGet "/timestamps"
@@ -59,34 +58,3 @@ enabledSpec withConfig = withConfig baseCfg $ describe "test Prefer: timezone wi
           { matchStatus = 200
           , matchHeaders = [matchContentTypeJson
                            , "Preference-Applied" <:> "handling=lenient"]}
-
-
-disabledSpec :: SpecWithConfig
-disabledSpec withConfig = withConfig (baseCfg { configDbTimezoneEnabled = False }) $
-  describe "test Prefer: timezone with db-timezone-enabled is false" $ do
-    context "test Prefer: timezone=America/Los_Angeles when timezone is disabled" $ do
-      it "should throw error with handling=strict" $
-        request methodGet "/timestamps"
-          [("Prefer", "handling=strict, timezone=America/Los_Angeles")]
-          ""
-          `shouldRespondWith`
-          [json|{"code":"PGRST122","details":"Invalid preferences: timezone=America/Los_Angeles","hint":null,"message":"Invalid preferences given with handling=strict"}|]
-          { matchStatus = 400 }
-
-      it "should return with default timezone without handling or with handling=lenient" $ do
-        request methodGet "/timestamps"
-          [("Prefer", "timezone=America/Los_Angeles")]
-          ""
-          `shouldRespondWith`
-          [json|[{"t":"2023-10-18T12:37:59.611+00:00"}, {"t":"2023-10-18T14:37:59.611+00:00"}, {"t":"2023-10-18T16:37:59.611+00:00"}]|]
-          { matchStatus = 200
-          , matchHeaders = [matchContentTypeJson]}
-
-        request methodGet "/timestamps"
-          [("Prefer", "handling=lenient, timezone=America/Los_Angeles")]
-          ""
-          `shouldRespondWith`
-          [json|[{"t":"2023-10-18T12:37:59.611+00:00"}, {"t":"2023-10-18T14:37:59.611+00:00"}, {"t":"2023-10-18T16:37:59.611+00:00"}]|]
-          { matchStatus = 200
-          , matchHeaders = [matchContentTypeJson
-                           , "Preference-Applied" <:> "handling=lenient"]}

test/spec/Main.hs

@@ -149,7 +149,7 @@ main = do
         , ("Feature.Query.PlanSpec.spec"                       , Feature.Query.PlanSpec.spec)
         , ("Feature.Query.Preferences.HandlingSpec"            , Feature.Query.Preferences.HandlingSpec.spec)
         , ("Feature.Query.Preferences.MaxAffectedSpec"         , Feature.Query.Preferences.MaxAffectedSpec.spec)
-        , ("Feature.Query.Preferences.TimezoneSpec.enabledSpec", Feature.Query.Preferences.TimezoneSpec.enabledSpec)
+        , ("Feature.Query.Preferences.TimezoneSpec"            , Feature.Query.Preferences.TimezoneSpec.spec)
         , ("Feature.Query.PreparedStatementsSpec.spec"         , Feature.Query.PreparedStatementsSpec.spec)
         , ("Feature.Query.QueryLimitedSpec"                    , Feature.Query.QueryLimitedSpec.spec)
         , ("Feature.Query.QuerySpec"                           , Feature.Query.QuerySpec.spec actualPgVersion)
@@ -174,7 +174,6 @@ main = do
     parallel $ describe "Feature.ExtraSearchPathSpec" $ Feature.ExtraSearchPathSpec.spec withConfigDbs
     parallel $ describe "Feature.Query.PostGISSpec" $ Feature.Query.PostGISSpec.spec withConfigDbs
     parallel $ describe "Feature.Query.MultipleSchemaSpec" $ Feature.Query.MultipleSchemaSpec.spec withConfigDbs
-    parallel $ describe "Feature.Query.Preferences.TimezoneSpec.disabledSpec" $ Feature.Query.Preferences.TimezoneSpec.disabledSpec withConfigDbs
 
     -- Note: the rollback tests can not run in parallel, because they test persistence and
     -- this results in race conditions

test/spec/SpecHelper.hs

@@ -152,7 +152,6 @@ baseCfg = let secret = encodeUtf8 "reallyreallyreallyreallyverysafe" in
   , configDbSchemas                 = fromList ["test"]
   , configDbConfig                  = False
   , configDbPreConfig               = Nothing
-  , configDbTimezoneEnabled         = True
   , configDbUri                     = "postgresql://"
   , configFilePath                  = Nothing
   , configJWKS                      = rightToMaybe $ parseSecret secret