Skip to content

fix typo giving incorrect lint #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joprice wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix typo giving incorrect lint #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions src/NpgsqlFSharpAnalyzer.Core/SqlAnalysis.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module SqlAnalysis =
type ComparisonParameter = {
parameterName : string
column : string
table : string option
table : string option
}

let rec trimParams = function
Expand Down Expand Up @@ -40,7 +40,7 @@ module SqlAnalysis =
Returning = List.map trimParams query.Returning
ConflictResolution =
query.ConflictResolution
|> List.map (fun (column, expr) -> column, trimParams expr)
|> List.map (fun (column, expr) -> column, trimParams expr)
}

| Expr.DeleteQuery query ->
Expand Down Expand Up @@ -349,7 +349,7 @@ module SqlAnalysis =
// user_id int not null -> inferred non-nullable
// user_id::text -> inferred nullable
//
// This function resolves the correct nullability and infers non-nullable columns to be returned as such
// This function resolves the correct nullability and infers non-nullable columns to be returned as such
let resolveColumnNullability (commandText: string) (schema: DbSchemaLookups) (columns: Column list) =
match Parser.parse commandText with
| Result.Ok (Expr.SelectQuery selectQuery) ->
Expand Down Expand Up @@ -386,7 +386,7 @@ module SqlAnalysis =
| Expr.As(Expr.StringLiteral _, Expr.Ident alias) ->
Some (alias, alias, true)
| _ ->
None
None
)

match originalColumnNameAndAlias with
Expand Down Expand Up @@ -575,18 +575,18 @@ module SqlAnalysis =
if providedParam.paramFunc = "Sql.parameter" then
// do not do anything when the input is a generic param
()
else if not requiredParam.DataType.IsArray then
else if not requiredParam.DataType.IsArray then
match requiredParam.DataType.Name with
| "bit" ->
if requiredParam.IsNullable then
if requiredParam.IsNullable then
if providedParam.paramFunc <> "Sql.bit" && providedParam.paramFunc <> "Sql.bitOrNone" && providedParam.paramFunc <> "Sql.dbnull"
then yield typeMismatch [ "Sql.bit"; "Sql.bitOrNone";"Sql.dbnull"]
else
if providedParam.paramFunc <> "Sql.bit"
then yield typeMismatch [ "Sql.bit" ]

| ("bool" | "boolean") ->
if requiredParam.IsNullable then
if requiredParam.IsNullable then
if providedParam.paramFunc <> "Sql.bool" && providedParam.paramFunc <> "Sql.boolOrNone" && providedParam.paramFunc <> "Sql.dbnull"
then yield typeMismatch [ "Sql.bool"; "Sql.boolOrNone"; "Sql.dbnull" ]
else
Expand All @@ -610,13 +610,13 @@ module SqlAnalysis =
then yield typeMismatch [ "Sql.int16" ]

| ("int64" | "bigint" |"bigserial") ->
if requiredParam.IsNullable then
if requiredParam.IsNullable then
if providedParam.paramFunc <> "Sql.int64" && providedParam.paramFunc <> "Sql.int" && providedParam.paramFunc <> "Sql.int64OrNone" && providedParam.paramFunc <> "Sql.dbnull"
then yield typeMismatch [ "Sql.int64"; "Sql.int"; "Sql.int64OrNone"; "Sql.dbnull" ]
else
if providedParam.paramFunc <> "Sql.int64" && providedParam.paramFunc <> "Sql.int"
then yield typeMismatch [ "Sql.int64"; "Sql.int" ]

| ("numeric" | "decimal" | "money") ->
if requiredParam.IsNullable then
if providedParam.paramFunc <> "Sql.decimal" && providedParam.paramFunc <> "Sql.decimalOrNone" && providedParam.paramFunc <> "Sql.dbnull"
Expand All @@ -642,7 +642,7 @@ module SqlAnalysis =
then yield typeMismatch [ "Sql.bytea" ]

| "uuid" ->
if requiredParam.IsNullable then
if requiredParam.IsNullable then
if providedParam.paramFunc <> "Sql.uuid" && providedParam.paramFunc <> "Sql.uuidOrNone" && providedParam.paramFunc <> "Sql.dbnull"
then yield typeMismatch [ "Sql.uuid"; "Sql.uuidOrNone"; "Sql.dbnull" ]
else
Expand Down Expand Up @@ -682,7 +682,7 @@ module SqlAnalysis =
then yield typeMismatch [ "Sql.jsonb" ]

| ("text"|"json"|"xml") ->
if requiredParam.IsNullable then
if requiredParam.IsNullable then
if providedParam.paramFunc <> "Sql.text" && providedParam.paramFunc <> "Sql.textOrNone" && providedParam.paramFunc <> "Sql.string" && providedParam.paramFunc <> "Sql.textOrNone" && providedParam.paramFunc <> "Sql.dbnull"
then yield typeMismatch [ "Sql.text"; "Sql.string"; "Sql.textOrNone"; "Sql.stringOrNone"; "Sql.dbnull" ]
else
Expand Down Expand Up @@ -710,7 +710,7 @@ module SqlAnalysis =
then yield typeMismatch [ "Sql.uuidArray" ]

| ("text"|"json"|"xml") ->
if requiredParam.IsNullable then
if requiredParam.IsNullable then
if providedParam.paramFunc <> "Sql.stringArray" && providedParam.paramFunc <> "Sql.stringArrayOrNone" && providedParam.paramFunc <> "Sql.dbnull"
then yield typeMismatch [ "Sql.stringArray"; "Sql.stringArrayOrNone"; "Sql.dbnull" ]
else
Expand All @@ -727,7 +727,7 @@ module SqlAnalysis =
let formatColumns (availableColumns: InformationSchema.Column list) =
availableColumns
|> List.map (fun column ->
if column.DataType.IsArray
if column.DataType.IsArray
then sprintf "| -- %s of type %s[]" column.Name column.DataType.Name
else sprintf "| -- %s of type %s" column.Name column.DataType.Name
)
Expand Down Expand Up @@ -841,7 +841,7 @@ module SqlAnalysis =
let using (name: string) = attempt.funcName.EndsWith (sprintf ".%s" name)
let notUsing = using >> not

if not column.DataType.IsArray then
if not column.DataType.IsArray then
match column.DataType.Name with
("bit"|"bool"|"boolean") ->
if column.Nullable && notUsing "boolOrNone"
Expand Down Expand Up @@ -916,7 +916,7 @@ module SqlAnalysis =
else if notUsing "textOrNone" && notUsing "text" && notUsing "string" && notUsing "stringOrNone"
then
if column.Nullable
then yield typeMismatch [ replace "textOrNone"; replace "stringOrText" ]
then yield typeMismatch [ replace "textOrNone"; replace "stringOrNone" ]
else yield typeMismatch [ replace "text"; replace "string" ]
else ()

Expand Down Expand Up @@ -1042,7 +1042,7 @@ module SqlAnalysis =
|> sprintf "Missing parameters [%s] for this parameter set"

errors.Add(createWarning missingParameters parameterSet.range)
else
else
for error in analyzeParameters transactionParams parameterSet.range parameters do
errors.Add(error)

Expand Down