Merge branch 'feature/options-not-found-error'

CHANGELOG.md

@@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 - Reject non-POSTs to rpc endpoints - @begriffs
+- Throw an error for OPTIONS on nonexistent tables - @calebmer
 
 ## [0.3.0.3] - 2016-01-08
 

src/PostgREST/App.hs

@@ -11,7 +11,7 @@ import           Control.Arrow             ((***))
 import           Control.Monad             (join)
 import           Data.Bifunctor            (first)
 import           Data.List                 (find, sortBy, delete)
-import           Data.Maybe                (fromMaybe, fromJust, mapMaybe)
+import           Data.Maybe                (isJust, fromMaybe, fromJust, mapMaybe)
 import           Data.Ord                  (comparing)
 import           Data.Ranged.Ranges        (emptyRange)
 import           Data.String.Conversions   (cs)
@@ -146,14 +146,17 @@ app dbStructure conf reqBody req =
             then notFound
             else responseLBS status204 [("Content-Range", "*/"<> cs (show queryTotal))] ""
 
-    (ActionInfo, TargetIdent (QualifiedIdentifier tSchema tTable), Nothing) -> do
+    (ActionInfo, TargetIdent (QualifiedIdentifier tSchema tTable), Nothing) ->
-      let cols = filter (filterCol tSchema tTable) $ dbColumns dbStructure
+      if isJust $ find (\t -> tableName t == tTable && tableSchema t == tSchema) (dbTables dbStructure)
-          pkeys = map pkName $ filter (filterPk tSchema tTable) allPrKeys
+        then let cols = filter (filterCol tSchema tTable) $ dbColumns dbStructure
-          body = encode (TableOptions cols pkeys)
+                 pkeys = map pkName $ filter (filterPk tSchema tTable) allPrKeys
-          filterCol :: Schema -> TableName -> Column -> Bool
+                 body = encode (TableOptions cols pkeys)
-          filterCol sc tb Column{colTable=Table{tableSchema=s, tableName=t}} = s==sc && t==tb
+                 filterCol :: Schema -> TableName -> Column -> Bool
-          filterCol _ _ _ =  False
+                 filterCol sc tb Column{colTable=Table{tableSchema=s, tableName=t}} = s==sc && t==tb
-      return $ responseLBS status200 [jsonH, allOrigins] $ cs body
+                 filterCol _ _ _ =  False in
+          return $ responseLBS status200 [jsonH, allOrigins] $ cs body
+        else
+          return notFound
 
     (ActionInvoke, TargetProc qi,
      Just (PayloadJSON (UniformObjects payload))) -> do

test/Feature/StructureSpec.hs

@@ -320,3 +320,6 @@ spec struct c = around (withApp cfgDefault struct c) $ do
             ]
           }
         |]
+
+    it "errors for non existant tables" $
+      request methodOptions "/dne" [] "" `shouldRespondWith` 404