Merge pull request #211 from fsprojects/Issue201

Units of measure in SqlEnum

Author: ntr

src/SqlClient.Tests/SqlEnumTests.fs

@@ -3,7 +3,7 @@
 open System
 open Xunit
 
-type EnumMapping = SqlEnumProvider<"SELECT * FROM (VALUES(('One'), 1), ('Two', 2)) AS T(Tag, Value)", ConnectionStrings.LocalHost, CLIEnum = true>
+type EnumMapping = SqlEnumProvider<"SELECT * FROM (VALUES(('One'), 1), ('Two', 2)) AS T(Tag, Value)", ConnectionStrings.LocalHost, Kind = SqlEnumKind.CLI>
 
 [<Literal>]
 let connectionString = ConnectionStrings.LocalHost
@@ -88,3 +88,62 @@ let MoreThan2ColumnReturnsCorrectTuples() =
       |], 
       actual = Array.ofSeq MoreThan2Columns.Items
     )
+
+type CurrencyCode = 
+    SqlEnumProvider<"
+        SELECT CurrencyCode
+        FROM Sales.Currency 
+        WHERE CurrencyCode IN ('USD', 'EUR', 'GBP')
+    ", ConnectionStrings.AdventureWorksLiteral, Kind = SqlEnumKind.UnitsOfMeasure>
+
+[<Fact>]
+let ConvertUsdToGbp() =
+    let getLatestRate = new SqlCommandProvider<"
+        SELECT TOP 1 *
+        FROM Sales.CurrencyRate
+        WHERE FromCurrencyCode = @fromCurrency
+	        AND ToCurrencyCode = @toCurrency 
+        ORDER BY CurrencyRateDate DESC
+        ", ConnectionStrings.AdventureWorksNamed, SingleRow = true>()
+    let rate = 
+        getLatestRate.Execute(fromCurrency = "USD", toCurrency = "GBP")
+        |> Option.map(fun x -> x.AverageRate * 1M<CurrencyCode.GBP/CurrencyCode.USD>)
+        |> Option.get
+
+    let actual = 42M<CurrencyCode.USD> * rate
+    let expected = 26.5986M<CurrencyCode.GBP>
+    Assert.Equal( expected, actual)
+
+type ProductsUnitsOfMeasure = SqlEnumProvider<"SELECT UnitMeasureCode FROM Production.UnitMeasure", ConnectionStrings.AdventureWorksLiteral, Kind = SqlEnumKind.UnitsOfMeasure>
+type ProductCategory = SqlEnumProvider<"SELECT Name FROM Production.ProductCategory", ConnectionStrings.AdventureWorksLiteral>
+
+type Bikes = {
+    Id: int
+    Name: string
+    Weight: decimal<ProductsUnitsOfMeasure.``LB ``> option
+    Size: float<ProductsUnitsOfMeasure.``CM ``> option
+}
+
+[<Fact>]
+let ProductWeightAndSizeUnitsOfMeasure() =
+    let allBikes = [
+        use cmd = 
+            new SqlCommandProvider<"
+                SELECT ProductID, Product.Name, Size, SizeUnitMeasureCode, Weight, WeightUnitMeasureCode
+                FROM Production.Product 
+	                JOIN Production.ProductCategory ON ProductSubcategoryID = ProductCategoryID  
+                WHERE ProductCategory.Name = @category
+            ", ConnectionStrings.AdventureWorksNamed>()
+                
+        for x in cmd.Execute(ProductCategory.Bikes) do
+            yield {
+                Id = x.ProductID
+                Name = x.Name
+                Weight = x.Weight |> Option.map(fun weight -> weight * 1M<_>)
+                Size = x.Size |> Option.map(fun size -> size |> float |> LanguagePrimitives.FloatWithMeasure )
+            }
+    ]
+
+    let bigBikes = allBikes |> List.choose ( fun x -> if x.Size = Some 52.<ProductsUnitsOfMeasure.``CM ``> then Some x.Name else None)
+
+    Assert.Equal<_ list>( ["Mountain-500 Silver, 52"; "Mountain-500 Black, 52"], bigBikes)

src/SqlClient/SqlEnumProvider.fs

@@ -17,6 +17,11 @@ open ProviderImplementation.ProvidedTypes
 
 open FSharp.Data.SqlClient
 
+type SqlEnumKind = 
+    | Default = 0
+    | CLI = 1
+    | UnitsOfMeasure = 2
+
 [<TypeProvider>]
 type public SqlEnumProvider(config : TypeProviderConfig) as this = 
     inherit TypeProviderForNamespaces()
@@ -49,7 +54,7 @@ type public SqlEnumProvider(config : TypeProviderConfig) as this =
                 ProvidedStaticParameter("ConnectionStringOrName", typeof<string>) 
                 ProvidedStaticParameter("Provider", typeof<string>, "System.Data.SqlClient") 
                 ProvidedStaticParameter("ConfigFile", typeof<string>, "") 
-                ProvidedStaticParameter("CLIEnum", typeof<bool>, false) 
+                ProvidedStaticParameter("Kind", typeof<SqlEnumKind>, SqlEnumKind.Default) 
             ],             
             instantiationFunction = (fun typeName args ->   
                 cache.GetOrAdd(typeName, lazy this.CreateRootType(typeName, unbox args.[0], unbox args.[1], unbox args.[2], unbox args.[3], unbox args.[4]))
@@ -62,12 +67,12 @@ type public SqlEnumProvider(config : TypeProviderConfig) as this =
 <param name='ConnectionString'>String used to open a data connection.</param>
 <param name='Provider'>Invariant name of a ADO.NET provider. Default is "System.Data.SqlClient".</param>
 <param name='ConfigFile'>The name of the configuration file that’s used for connection strings at DESIGN-TIME. The default value is app.config or web.config.</param>
-<param name='CLIEnum'>Generate standard CLI Enum. Default is false.</param>
+<param name='Kind'></param>
 """
 
         this.AddNamespace( nameSpace, [ providerType ])
 
-    member internal this.CreateRootType( typeName, query, connectionStringOrName, provider, configFile, cliEnum) = 
+    member internal this.CreateRootType( typeName, query, connectionStringOrName, provider, configFile, kind: SqlEnumKind) = 
         let tempAssembly = ProvidedAssembly( Path.ChangeExtension(Path.GetTempFileName(), ".dll"))
 
         let providedEnumType = ProvidedTypeDefinition(assembly, nameSpace, typeName, baseType = Some typeof<obj>, HideObjectMethods = true, IsErased = false)
@@ -147,8 +152,8 @@ type public SqlEnumProvider(config : TypeProviderConfig) as this =
         |> Seq.groupBy id 
         |> Seq.iter (fun (key, xs) -> if Seq.length xs > 1 then failwithf "Non-unique label %s." key)
 
-        if cliEnum
-        then 
+        match kind with 
+        | SqlEnumKind.CLI ->
 
             if not( allowedTypesForEnum.Contains( valueType))
             then failwithf "Enumerated types can only have one of the following underlying types: %A." [| for t in allowedTypesForEnum -> t.Name |]
@@ -160,7 +165,19 @@ type public SqlEnumProvider(config : TypeProviderConfig) as this =
             ||> List.map2 (fun name value -> ProvidedLiteralField(name, providedEnumType, fst value))
             |> providedEnumType.AddMembers
 
-        else
+        | SqlEnumKind.UnitsOfMeasure ->
+
+            for name in names do
+                let units = ProvidedTypeDefinition( name, None, IsErased = false)
+                units.AddCustomAttribute { 
+                    new CustomAttributeData() with
+                        member __.Constructor = typeof<MeasureAttribute>.GetConstructor [||]
+                        member __.ConstructorArguments = upcast Array.empty
+                        member __.NamedArguments = upcast Array.empty
+                }
+                providedEnumType.AddMember units
+
+        | _ -> 
             let valueFields, setFieldValues = 
                 (names, values) ||> List.map2 (fun name value -> 
                     if allowedTypesForLiteral.Contains valueType