fsharp-refactor fixes

Author: Thorium

src/SQLProvider.Fable.Core/Query.fs

@@ -347,6 +347,7 @@ module Expr =
     /// backslash as an escape *inside string literals* too, so `ESCAPE '\'`
     /// would escape its own closing quote there. `!` is ordinary in all three
     /// engines' string literals.
+    [<Literal>]
     let likeEscapeChar = '!'
 
     let escapeLikeValue (value: string) =

src/SQLProvider.Fable.Core/SqlGen.fs

@@ -83,7 +83,7 @@ module SqlGen =
         | Abs, _ -> ValueSome "ABS"
 
         | Length, Sqlite -> ValueSome "LENGTH"
-        | Length, Postgres -> ValueSome "CHAR_LENGTH"
+        | Length, Postgres
         | Length, MySql -> ValueSome "CHAR_LENGTH"
         | Length, Generic -> ValueSome "LENGTH"
 
@@ -93,7 +93,7 @@ module SqlGen =
 
         | IndexOf, Postgres -> ValueSome "STRPOS"
         | IndexOf, MySql -> ValueSome "LOCATE"
-        | IndexOf, Sqlite -> ValueSome "INSTR"
+        | IndexOf, Sqlite
         | IndexOf, Generic -> ValueSome "INSTR"
 
         // Every engine's plain-rounding function has the same name.
@@ -117,6 +117,22 @@ module SqlGen =
         | Second -> ValueSome("SECOND", "%S")
         | _ -> ValueNone
 
+    /// The one argument of a single-argument function.
+    let private oneArg (fn: SqlFn) (args: SqlExpr list) : SqlExpr =
+        match args with
+        | [ single ] -> single
+        | _ -> failwith ("SqlGen: " + string fn + " takes exactly one argument")
+
+    let private twoArgs (fn: SqlFn) (args: SqlExpr list) : SqlExpr * SqlExpr =
+        match args with
+        | [ first; second ] -> first, second
+        | _ -> failwith ("SqlGen: " + string fn + " takes exactly two arguments")
+
+    /// `.Date`. SQLite and MySQL have DATE(); PostgreSQL's DATE() is not the
+    /// same thing, so it uses the truncation SQLProvider uses too.
+
+    /// The two arguments of a two-argument function.
+
     let rec private renderExpr (b: Builder) (e: SqlExpr) =
         let append (s: string) = write b s
 
@@ -269,20 +285,6 @@ module SqlGen =
     // tree loses its bindings (the G25 family) -- and small single-scrutinee
     // matches are what it compiles correctly.
 
-    /// The one argument of a single-argument function.
-    and private oneArg (fn: SqlFn) (args: SqlExpr list) : SqlExpr =
-        match args with
-        | [ single ] -> single
-        | _ -> failwith ("SqlGen: " + string fn + " takes exactly one argument")
-
-    /// The two arguments of a two-argument function.
-    and private twoArgs (fn: SqlFn) (args: SqlExpr list) : SqlExpr * SqlExpr =
-        match args with
-        | [ first; second ] -> first, second
-        | _ -> failwith ("SqlGen: " + string fn + " takes exactly two arguments")
-
-    /// `.Date`. SQLite and MySQL have DATE(); PostgreSQL's DATE() is not the
-    /// same thing, so it uses the truncation SQLProvider uses too.
     and private renderDateOnly (b: Builder) (arg: SqlExpr) =
         let append (s: string) = write b s
 

src/SQLProvider.Fable.Design/SchemaReader.fs

@@ -16,6 +16,7 @@ module SchemaReader =
 
     // --- SQLite ------------------------------------------------------------
 
+    [<Literal>]
     let private sqliteTables =
         "SELECT name, type FROM sqlite_master
          WHERE type IN ('table', 'view') AND name NOT LIKE 'sqlite_%'
@@ -119,6 +120,7 @@ module SchemaReader =
 
     /// One row per column, ordered within its constraint, so a composite key
     /// reassembles by grouping on constraint_name.
+    [<Literal>]
     let private infoSchemaForeignKeys =
         "SELECT k.constraint_name, k.column_name, k.referenced_table_name, k.referenced_column_name
          FROM information_schema.key_column_usage k
@@ -133,6 +135,7 @@ module SchemaReader =
     /// joining it against a composite key cross-multiplies the pairs.
     /// `position_in_unique_constraint` is what lines each column up with the
     /// one it references.
+    [<Literal>]
     let private postgresForeignKeys =
         "SELECT kcu.constraint_name,
                 kcu.column_name,
@@ -168,7 +171,7 @@ module SchemaReader =
                     |> ResultSet.map (fun r ->
                         { Name = text r "column_name"
                           Kind = kindOfDbType (text r "data_type")
-                          IsNullable = (text r "is_nullable").ToUpperInvariant() = "YES"
+                          IsNullable = System.String.Equals((text r "is_nullable"), "YES", System.StringComparison.OrdinalIgnoreCase)
                           // COUNT-style flags come back as an integer on
                           // PostgreSQL and can arrive as a decimal on MySQL.
                           IsPrimaryKey =

tests/SQLProvider.Fable.SmokeTests/GeneratedSchema.fs

@@ -76,6 +76,7 @@ module Orders =
     let Freight = Col.decimal table "Freight"
 
     /// One row, as a record.
+    [<Struct>]
     type Row =
         { OrderId: int64
           CustomerId: int64

tests/SQLProvider.Fable.SmokeTests/Smoke.fs

@@ -44,6 +44,7 @@ type Fixture =
 
 module Fixture =
 
+    [<Literal>]
     let private invoiceAsText =
         "CREATE TABLE Invoice (Id TEXT NOT NULL, Total TEXT NOT NULL, Issued TEXT NOT NULL, Rebate TEXT NULL)"
 

tests/SQLProvider.Fable.Tests.Readme/ReadmeSamples.fs

@@ -46,6 +46,7 @@ module Order =
     let OrderId = Col.int64 table "OrderId"
     let CustomerId = Col.int64 table "CustomerId"
 
+    [<Struct>]
     type Row = { OrderId: int64 }
 
     let qualified = [| "Orders_OrderId", OrderId.E |]