Merge branch 'worldbank-api-v2' into allow-datetimeoffset-schema

fsprojects · Jul 15, 2020 · 53b7579 · 53b7579
2 parents 166e85f + a12a95d
commit 53b7579
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 405 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,4 +23,5 @@ paket-files
 TestResults
 *.log
 .vscode
-.idea
+.idea
+.ionide
diff --git a/docs/content/library/XmlProvider.fsx b/docs/content/library/XmlProvider.fsx
@@ -403,7 +403,7 @@ When the file includes other schema files, the `ResolutionFolder` parameter can
 The uri may also refer to online resources:
 *)
 
-type RssXsd = XmlProvider<Schema = "http://europa.eu/rapid/conf/RSS20.xsd">
+type RssXsd = XmlProvider<Schema = "https://www.w3schools.com/xml/note.xsd">
 
 (**
 

diff --git a/src/WorldBank/WorldBankProvider.fs b/src/WorldBank/WorldBankProvider.fs
@@ -24,7 +24,7 @@ type public WorldBankProvider(cfg:TypeProviderConfig) as this =
     let asm = System.Reflection.Assembly.GetExecutingAssembly()
     let ns = "FSharp.Data" 
 
-    let defaultServiceUrl = "http://api.worldbank.org"
+    let defaultServiceUrl = "http://api.worldbank.org/v2"
     let cacheDuration = TimeSpan.FromDays 30.0
     let restCache = createInternetFileCache "WorldBankSchema" cacheDuration
 

diff --git a/src/WorldBank/WorldBankRuntime.fs b/src/WorldBank/WorldBankRuntime.fs
@@ -1,4 +1,4 @@
-// --------------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------------
 // WorldBank type provider - runtime components 
 // --------------------------------------------------------------------------------------
 
@@ -184,7 +184,7 @@ module Implementation =
                           countryOrRegionCode
                           "indicators"
                           indicatorCode ]
-                        [ "date", "1900:2050" ]
+                        [ "date", "" ]
                         "date"
                     return 
                       seq { for k, v in data do

diff --git a/tests/FSharp.Data.DesignTime.Tests/SignatureTestCases.config b/tests/FSharp.Data.DesignTime.Tests/SignatureTestCases.config
@@ -33,7 +33,6 @@ Xml,TypeInference.xml,false,false,,false,
 Xml,SampleAzureServiceManagement.xml,false,false,,true,
 Xml,TimeSpans.xml,false,false,,true,
 Xml,,false,false,,false,po.xsd
-Xml,,false,false,,false,http://europa.eu/rapid/conf/RSS20.xsd
 Xml,,false,false,,false,homonim.xsd
 Xml,,false,false,,false,IncludeFromWeb.xsd
 Json,WorldBank.json,false,WorldBank,,true
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,4 +23,5 @@ paket-files @@
     TestResults
     *.log
     .vscode
-    .idea
+    .idea
+    .ionide