From 81a80803ffa2119e16b3bf4eef1db94e99679c4b Mon Sep 17 00:00:00 2001 From: Sudqi Jawabreh Date: Sat, 3 Apr 2021 21:42:22 +0300 Subject: [PATCH 01/18] Port Information Schema to Sql Server --- .../InformationSchema.fs | 605 ++++++++++-------- .../NpgsqlFSharpAnalyzer.Core.fsproj | 2 + 2 files changed, 329 insertions(+), 278 deletions(-) diff --git a/src/NpgsqlFSharpAnalyzer.Core/InformationSchema.fs b/src/NpgsqlFSharpAnalyzer.Core/InformationSchema.fs index 62285ea..815baea 100644 --- a/src/NpgsqlFSharpAnalyzer.Core/InformationSchema.fs +++ b/src/NpgsqlFSharpAnalyzer.Core/InformationSchema.fs @@ -1,132 +1,144 @@ namespace Npgsql.FSharp.Analyzers.Core open System -open System.Data -open System.Data.Common open System.Collections.Generic -open FSharp.Quotations +open System.Data + +open System.Data.SqlClient -open Npgsql -open Npgsql.PostgresTypes -open NpgsqlTypes open System.Collections open System.Net -module InformationSchema = - type internal NpgsqlDataReader with +module RewriteSqlUsingParser = + + type internal SqlDataReader with member cursor.GetValueOrDefault(name: string, defaultValue) = let i = cursor.GetOrdinal(name) - if cursor.IsDBNull( i) then defaultValue else cursor.GetFieldValue( i) + if cursor.IsDBNull(i) then defaultValue else cursor.GetFieldValue(i) + + let ParseParameterInfo(cmd: SqlCommand) = + seq { + let cursor = cmd.ExecuteReader() + while cursor.Read() do + yield (string cursor.["name"], + unbox cursor.["suggested_system_type_id"], + unbox (cursor.GetValueOrDefault( "suggested_user_type_id",0)), + unbox cursor.["suggested_is_output"], + unbox cursor.["suggested_is_input"], + cursor.["suggested_max_length"] |> unbox |> int, + unbox cursor.["suggested_precision"] |> unbox, + unbox cursor.["suggested_scale"] |> unbox) + } + + let getVariables tsql = + let parser = Microsoft.SqlServer.TransactSql.ScriptDom.TSql140Parser( true) + let tsqlReader = new System.IO.StringReader(tsql) + let errors = ref Unchecked.defaultof<_> + let fragment = parser.Parse(tsqlReader, errors) + + let allVars = ResizeArray() + let declaredVars = ResizeArray() + + fragment.Accept { + new Microsoft.SqlServer.TransactSql.ScriptDom.TSqlFragmentVisitor() with + member __.Visit(node : Microsoft.SqlServer.TransactSql.ScriptDom.VariableReference) = + base.Visit node + allVars.Add(node.Name, node.StartOffset, node.FragmentLength) + member __.Visit(node : Microsoft.SqlServer.TransactSql.ScriptDom.DeclareVariableElement) = + base.Visit node + declaredVars.Add(node.VariableName.Value) + } + let unboundVars = + allVars + |> Seq.groupBy (fun (name, _, _) -> name) + |> Seq.choose (fun (name, xs) -> + if declaredVars.Contains name + then None + else Some(name, xs |> Seq.mapi (fun i (_, start, length) -> sprintf "%s%i" name i, start, length)) + ) + |> dict + + unboundVars, !errors + + let ReWriteSqlStatementToEnableMoreThanOneParameterDeclaration (query:string) (unboundVars:Generic.IDictionary>) = + let mutable tsql = query + let mutable startAdjustment = 0 + for xs in unboundVars.Values do + for newName, start, len in xs do + let before = tsql + let start = start + startAdjustment + let after = before.Remove(start, len).Insert(start, newName) + tsql <- after + startAdjustment <- startAdjustment + (after.Length - before.Length) + tsql + + + let ExtractParamtersFromQuery (query: string) connection = + use cmd = new SqlCommand("sys.sp_describe_undeclared_parameters", connection, CommandType = CommandType.StoredProcedure) + cmd.Parameters.AddWithValue("@tsql", query) |> ignore + let tsql = cmd.Parameters.["@tsql"].Value.ToString() + let unboundVars, parseErrors = getVariables tsql + if parseErrors.Count = 0 + then + printf "no error found parsing" + let newTsql = (ReWriteSqlStatementToEnableMoreThanOneParameterDeclaration tsql unboundVars) + cmd.Parameters.["@tsql"].Value <- newTsql + let altered = ParseParameterInfo cmd + let mapBack = unboundVars |> Seq.collect(fun (KeyValue(name, xs)) -> [ for newName, _, _ in xs -> newName, name ]) |> dict + let tryUnify = + altered + |> Seq.map (fun (name, sqlEngineTypeId, userTypeId, suggested_is_output, suggested_is_input, max_length, precision, scale) -> + let oldName = + match mapBack.TryGetValue name with + | true, original -> original + | false, _ -> name + oldName, (sqlEngineTypeId, userTypeId, suggested_is_output, suggested_is_input, max_length, precision, scale) + ) + |> Seq.groupBy fst + + |> Seq.map( fun (name, xs) -> name, xs |> Seq.map snd |> Seq.distinct |> Seq.toArray) + |> Seq.toArray + + // if same parameter found with different values all parameters will be dicarded + // here you can add some error messages + if tryUnify |> Array.exists( fun (_, xs) -> xs.Length > 1) + then + None + else + tryUnify + |> Array.map (fun (name, xs) -> + // userTypeId is returnd null + let sqlEngineTypeId, userTypeId, suggested_is_output, suggested_is_input, max_length, precision, scale = xs.[0] //|> Seq.exactlyOne + name, sqlEngineTypeId, userTypeId, suggested_is_output, suggested_is_input, max_length, precision, scale + ) + |> Some + else + None - type internal Type with - member this.PartiallyQualifiedName = - sprintf "%s, %s" this.FullName (this.Assembly.GetName().Name) - //https://www.postgresql.org/docs/current/static/datatype.html#DATATYPE-TABLE - let private builtins = [ - "boolean", typeof; "bool", typeof - - "smallint", typeof; "int2", typeof - "integer", typeof; "int", typeof; "int4", typeof - "bigint", typeof; "int8", typeof - - "real", typeof; "float4", typeof - "double precision", typeof; "float8", typeof - - "numeric", typeof; "decimal", typeof - "money", typeof - "text", typeof - - "character varying", typeof; "varchar", typeof - "character", typeof; "char", typeof - - "citext", typeof - "jsonb", typeof - "json", typeof - "xml", typeof - "point", typeof - "lseg", typeof - "path", typeof - "polygon", typeof - "line", typeof - "circle", typeof - "box", typeof - - "bit", typeof; "bit(n)", typeof; "bit varying", typeof; "varbit", typeof - - "hstore", typeof - "uuid", typeof - "cidr", typeof> - "inet", typeof - "macaddr", typeof - "tsquery", typeof - "tsvector", typeof - - "date", typeof - "interval", typeof - "timestamp without time zone", typeof; "timestamp", typeof - "timestamp with time zone", typeof; "timestamptz", typeof - "time without time zone", typeof; "time", typeof - "time with time zone", typeof; "timetz", typeof - - "bytea", typeof - "oid", typeof - "xid", typeof - "cid", typeof - "oidvector", typeof - "name", typeof - "char", typeof - //"range", typeof, NpgsqlDbType.Range) - ] +module InformationSchema = - let getTypeMapping = - let allMappings = dict builtins - fun datatype -> - let exists, value = allMappings.TryGetValue(datatype) - if exists then value else failwithf "Unsupported datatype %s." datatype + type internal SqlDataReader with - type PostgresType with - member this.ToClrType() = - match this with - | :? PostgresBaseType as x -> - getTypeMapping x.Name - | :? PostgresEnumType -> - typeof - | :? PostgresDomainType as x -> - x.BaseType.ToClrType() - | :? PostgresTypes.PostgresArrayType as arr -> - arr.Element.ToClrType().MakeArrayType() - | _ -> - typeof + member cursor.GetValueOrDefault(name: string, defaultValue) = + let i = cursor.GetOrdinal(name) + if cursor.IsDBNull(i) then defaultValue else cursor.GetFieldValue(i) + + let inline openConnection connectionString = + let conn = new SqlConnection(connectionString) + conn.Open() + conn + type DataType = { Name: string Schema: string IsArray : bool - ClrType: Type - } with - member this.FullName = sprintf "%s.%s" this.Schema this.Name - member this.IsUserDefinedType = this.Schema <> "pg_catalog" - member this.IsFixedLength = this.ClrType.IsValueType - member this.UdtTypeName = - if this.ClrType.IsArray - then - let withoutTrailingBrackets = this.Name.Substring(0, this.Name.Length - 2) // my_enum[] -> my_enum - sprintf "%s.%s" this.Schema withoutTrailingBrackets - else this.FullName - - static member Create(x: PostgresTypes.PostgresType) = - let clrType = x.ToClrType() - { - Name = x.Name - Schema = x.Namespace - ClrType = clrType - IsArray = clrType.IsArray - } - + ClrType: System.Type + } type Schema = { OID : string Name : string } @@ -146,7 +158,7 @@ module InformationSchema = AutoIncrement: bool DefaultConstraint: string Description: string - UDT: Type option Lazy // must be lazt due to late binding of columns with user defined types. + UDT: System.Type option Lazy // must be lazt due to late binding of columns with user defined types. PartOfPrimaryKey: bool BaseSchemaName: string BaseTableName: string } @@ -171,7 +183,7 @@ module InformationSchema = Tables : Dictionary> Enums : Map } - type ColumnLookupKey = { TableOID : string; ColumnAttributeNumber : int16 } + type ColumnLookupKey = { SchemaName :string; TableName : string; ColumnName: string } type DbSchemaLookups = { Schemas : Dictionary @@ -180,7 +192,6 @@ module InformationSchema = type Parameter = { Name: string - NpgsqlDbType: NpgsqlTypes.NpgsqlDbType Direction: ParameterDirection MaxLength: int Precision: byte @@ -192,159 +203,205 @@ module InformationSchema = member this.Size = this.MaxLength - let inline openConnection connectionString = - let conn = new NpgsqlConnection(connectionString) - conn.Open() - conn + // check types in FSqlClient if thye match + //https://github.com/fsprojects/FSharp.Data.SqlClient/blob/c96a2e2445debd078aa7dea2779333f3e149ff84/src/SqlClient.DesignTime/SqlClientExtensions.fs + let private builtins = [ + "bit", typeof; - let extractParametersAndOutputColumns(connectionString, commandText, allParametersOptional, dbSchemaLookups : DbSchemaLookups) = - use conn = openConnection(connectionString) + "tinyint", typeof; + "smallint", typeof; + "int", typeof; + "bigint", typeof; - use cmd = new NpgsqlCommand(commandText, conn) - NpgsqlCommandBuilder.DeriveParameters(cmd) - for p in cmd.Parameters do p.Value <- DBNull.Value - let cols = - use cursor = cmd.ExecuteReader(CommandBehavior.SchemaOnly) - if cursor.FieldCount = 0 then [] else [ for c in cursor.GetColumnSchema() -> c ] - let outputColumns = - [ for column in cols -> - let columnAttributeNumber = column.ColumnAttributeNumber.GetValueOrDefault(-1s) + "real", typeof; "float", typeof + "double precision", typeof; "float8", typeof - if column.TableOID <> 0u then - let lookupKey = { TableOID = string column.TableOID - ColumnAttributeNumber = columnAttributeNumber } - { dbSchemaLookups.Columns.[lookupKey] with Name = column.ColumnName } - else - let dataType = DataType.Create(column.PostgresType) + "smallmoney" , typeof; "money" , typeof; + "numeric", typeof; "decimal", typeof; + + + "varchar", typeof; "nvarchar", typeof; + "nchar", typeof; "char", typeof + + "text", typeof; "ntext", typeof + "xml", typeof + "hierarchyid", typeof + + "binary", typeof; + "varbinary", typeof; + "image", typeof; + "timestamp", typeof + "rowversion", typeof + "uniqueidentifier", typeof + + "smalldatetime", typeof + "datetime", typeof + "datetime2", typeof + "date", typeof + "datetimeoffset", typeof + "time", typeof + ] + + let getTypeMapping = + let allMappings = dict builtins + fun datatype -> + let exists, value = allMappings.TryGetValue(datatype) + if exists then value else failwithf "Unsupported datatype %s." datatype + + let getTypeNameWithIds conn = + let sqlEngineTypes = + use cmd = new SqlCommand(""" + SELECT + T.NAME, T.SYSTEM_TYPE_ID, T.USER_TYPE_ID, T.IS_TABLE_TYPE, S.NAME AS SCHEMA_NAME, T.IS_USER_DEFINED, T.[PRECISION], T.SCALE + FROM + SYS.TYPES AS T + JOIN SYS.SCHEMAS AS S ON T.SCHEMA_ID = S.SCHEMA_ID + """ + ,conn) + use reader = cmd.ExecuteReader() + [| while reader.Read() do + let system_type_id = reader.["system_type_id"] |> unbox |> int + let user_type_id = unbox reader.["user_type_id"] + let name = string reader.["name"] + yield + (system_type_id,user_type_id),name + |] |> dict + sqlEngineTypes + + + let GetFullQualityColumnInfo connectionString commandText (dbSchemaLookups: DbSchemaLookups)= + + // rewrite query to fix paramters that are used more than once + let unboundvars, erros = RewriteSqlUsingParser.getVariables commandText + let alterdQuery = RewriteSqlUsingParser.ReWriteSqlStatementToEnableMoreThanOneParameterDeclaration commandText unboundvars + + use connection = openConnection connectionString + + let typeIdName = getTypeNameWithIds connection + + use cmd = new SqlCommand("sys.sp_describe_first_result_set", connection, CommandType = CommandType.StoredProcedure) + cmd.Parameters.AddWithValue("@tsql", alterdQuery) |> ignore + cmd.Parameters.AddWithValue("@params", null) |> ignore + cmd.Parameters.AddWithValue("@include_browse_information", true) |> ignore + use row = cmd.ExecuteReader() + + seq { + while row.Read() do + let table = string row.["source_table"] + let schema = string row.["source_schema"] + let sourceColumn = string row.["source_column"] + let resultColumn = string row.["name"] + let typeid = unbox row.["system_type_id"] + let userTypeId = row.GetValueOrDefault("user_type_id",0) + let found, typeName = typeIdName.TryGetValue((typeid,userTypeId)) + if table <> "" && schema <> "" && sourceColumn <> "" then + let lookup = {SchemaName = schema; TableName = table; ColumnName = sourceColumn} + yield { dbSchemaLookups.Columns.[lookup] with Name = resultColumn } + else + yield { + ColumnAttributeNumber = row.["column_ordinal"] |> unbox |> int16 + Name = string row.["name"] + DataType = { + Name = typeName + Schema = null + IsArray = false + ClrType = getTypeMapping typeName} + Nullable = row.GetValueOrDefault("is_nullable", true) + MaxLength = row.GetValueOrDefault("max_length", -1s) |> int + ReadOnly = row.GetValueOrDefault("is_updateable", true) + AutoIncrement = row.GetValueOrDefault("is_identity_column", false) + DefaultConstraint = "" + Description = "" + UDT = lazy None + PartOfPrimaryKey = row.GetValueOrDefault("is_part_of_unique_key", false) + BaseSchemaName = string row.["source_schema"] + BaseTableName = string row.["source_table"] + } + } |> Seq.toList + + + let extractParametersAndOutputColumns(connectionString, query,allParametersOptional, dbSchemaLookups: DbSchemaLookups) = + let columns = GetFullQualityColumnInfo connectionString query dbSchemaLookups + + use cn =openConnection connectionString + let typeIdName = getTypeNameWithIds cn + let paramtersValuse = RewriteSqlUsingParser.ExtractParamtersFromQuery query cn + + let getDirection isOutput isInput = + match (isOutput, isInput) with + | (true, true) -> ParameterDirection.InputOutput + | (true, false) -> ParameterDirection.Output + | (false, true) -> ParameterDirection.Input + + let paramters = + match paramtersValuse with + | None -> [||] + |Some p -> + p + |> Array.map (fun (name, sqlEngineTypeId, userTypeId, suggested_is_output, suggested_is_input, max_length, precision, scale) -> + + // some times user type Id is returned as null + let found,typeName1 = typeIdName.TryGetValue ((sqlEngineTypeId,userTypeId)) + let _,typeName2 = typeIdName.TryGetValue ((sqlEngineTypeId,sqlEngineTypeId)) + let typeName = if found then typeName1 else typeName2 + { - ColumnAttributeNumber = columnAttributeNumber - Name = column.ColumnName - DataType = dataType - Nullable = column.AllowDBNull.GetValueOrDefault(true) - MaxLength = column.ColumnSize.GetValueOrDefault(-1) - ReadOnly = true - AutoIncrement = column.IsIdentity.GetValueOrDefault(false) - DefaultConstraint = column.DefaultValue - Description = "" - UDT = lazy None - PartOfPrimaryKey = column.IsKey.GetValueOrDefault(false) - BaseSchemaName = column.BaseSchemaName - BaseTableName = column.BaseTableName - } ] - - - let parameters = - [ for p in cmd.Parameters -> - assert (p.Direction = ParameterDirection.Input) - { Name = p.ParameterName - NpgsqlDbType = - match p.PostgresType with - | :? PostgresArrayType as x when (x.Element :? PostgresEnumType) -> - //probably array of custom type (enum or composite) - NpgsqlDbType.Array ||| NpgsqlDbType.Text - | _ -> p.NpgsqlDbType - Direction = p.Direction - MaxLength = p.Size - Precision = p.Precision - Scale = p.Scale - Optional = allParametersOptional - DataType = DataType.Create(p.PostgresType) - IsNullable = true } ] - - let enums = - outputColumns - |> Seq.choose (fun c -> - if c.DataType.IsUserDefinedType && dbSchemaLookups.Enums.ContainsKey(c.DataType.UdtTypeName) then - Some (c.DataType.UdtTypeName, dbSchemaLookups.Enums.[c.DataType.UdtTypeName]) - else - None) - |> Seq.append [ - for p in parameters do - if p.DataType.IsUserDefinedType && dbSchemaLookups.Enums.ContainsKey(p.DataType.UdtTypeName) - then - yield p.DataType.UdtTypeName, dbSchemaLookups.Enums.[p.DataType.UdtTypeName] - ] - |> Seq.distinct - |> Map.ofSeq - - parameters, outputColumns, enums + Name = name + Direction = getDirection suggested_is_output suggested_is_input + MaxLength = max_length + Precision = precision + Scale = scale + Optional = allParametersOptional + DataType = { + Name = typeName + Schema = "" + IsArray = false + ClrType = getTypeMapping(typeName) + } + IsNullable = false + }) + + paramters |> Array.toList , columns,Map [] - let getDbSchemaLookups(connectionString) = - use conn = openConnection(connectionString) - - use cmd = conn.CreateCommand() - cmd.CommandText <- """ - SELECT - n.nspname AS schema, - t.typname AS name, - array_agg(e.enumlabel) AS values - FROM pg_type t - JOIN pg_enum e ON t.oid = e.enumtypid - JOIN pg_catalog.pg_namespace n ON n.oid = t.typnamespace - GROUP BY - schema, name - """ - - let enumsLookup = - [ - use cursor = cmd.ExecuteReader() - while cursor.Read() do - let schema = cursor.GetString(0) - let name = cursor.GetString(1) - let values: string[] = cursor.GetValue(2) :?> _ - let t = { Name = name; Values = List.ofArray values } - yield schema, name, t - ] - |> Seq.groupBy (fun (schema, _, _) -> schema) - |> Seq.map (fun (schema, types) -> - schema, types |> Seq.map (fun (_, name, t) -> name, t) |> Map.ofSeq - ) - |> Map.ofSeq - - //https://stackoverflow.com/questions/12445608/psql-list-all-tables#12455382 - use cmd = conn.CreateCommand() - cmd.CommandText <- """ - SELECT - ns.OID AS schema_oid, - ns.nspname AS schema_name, - attr.attrelid AS table_oid, - cls.relname AS table_name, - pg_catalog.obj_description(attr.attrelid) AS table_description, - attr.attnum AS col_number, - attr.attname AS col_name, - col.udt_name AS col_udt_name, - col.data_type AS col_data_type, - attr.attnotnull AS col_not_null, - col.character_maximum_length AS col_max_length, - CASE WHEN col.is_updatable = 'YES' THEN true ELSE false END AS col_is_updatable, - CASE WHEN col.is_identity = 'YES' THEN true else false END AS col_is_identity, - CASE WHEN attr.atthasdef THEN (SELECT pg_get_expr(adbin, cls.oid) FROM pg_attrdef WHERE adrelid = cls.oid AND adnum = attr.attnum) ELSE NULL END AS col_default, - pg_catalog.col_description(attr.attrelid, attr.attnum) AS col_description, - typ.oid AS col_typoid, - EXISTS ( - SELECT * FROM pg_index - WHERE pg_index.indrelid = cls.oid AND - pg_index.indisprimary AND - attnum = ANY (indkey) - ) AS col_part_of_primary_key - - FROM pg_class AS cls - INNER JOIN pg_namespace AS ns ON ns.oid = cls.relnamespace - - LEFT JOIN pg_attribute AS attr ON attr.attrelid = cls.oid AND attr.atttypid <> 0 AND attr.attnum > 0 AND NOT attr.attisdropped - LEFT JOIN pg_type AS typ ON typ.oid = attr.atttypid - LEFT JOIN information_schema.columns AS col ON col.table_schema = ns.nspname AND - col.table_name = relname AND - col.column_name = attname - WHERE - cls.relkind IN ('r', 'v', 'm') AND - ns.nspname !~ '^pg_' AND - ns.nspname <> 'information_schema' - ORDER BY nspname, relname; - """ + let getDbSchemaLookups(connectionString) = + use connection = openConnection connectionString + + let cmd = new SqlCommand( + """ + SELECT + SCHEMA_ID(col.TABLE_SCHEMA) as schema_oid + ,col.TABLE_SCHEMA as schema_name + ,object_id(col.TABLE_SCHEMA + '.' + col.TABLE_NAME) as table_oid + ,col.TABLE_NAME as table_name + ,'' as table_description + ,col.ORDINAL_POSITION as col_number + ,col.DATA_TYPE as col_data_type + ,col.COLUMN_NAME as col_name + ,col.DATA_TYPE col_udt_name + ,CASE WHEN col.IS_NULLABLE = 'YES' THEN CAST(1 AS BIT) else CAST(0 AS BIT) end as col_null + ,col.CHARACTER_MAXIMUM_LENGTH as col_max_length + , CAST(1 AS BIT) as col_is_updatable + ,CAST (columnproperty(object_id(col.TABLE_SCHEMA + '.' + col.TABLE_NAME),col.COLUMN_NAME,'IsIdentity') AS BIT) as col_is_identity + ,col.COLUMN_DEFAULT as col_default + ,'' as col_description + ,Type_ID(col.DATA_TYPE) as col_typeoid + ,CASE WHEN (K.CONSTRAINT_NAME) IS NULL THEN CAST(0 AS BIT) ELSE CAST(1 AS BIT) END as col_part_of_primary_key + FROM INFORMATION_SCHEMA.COLUMNS col + LEFT JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE AS K ON k.COLUMN_NAME = col.COLUMN_NAME and k.TABLE_NAME = col.TABLE_NAME and k.TABLE_SCHEMA = col.TABLE_SCHEMA + LEFT JOIN INFORMATION_SCHEMA.TABLE_CONSTRAINTS AS C ON C.TABLE_NAME = K.TABLE_NAME + AND C.CONSTRAINT_CATALOG = K.CONSTRAINT_CATALOG + AND C.CONSTRAINT_SCHEMA = K.CONSTRAINT_SCHEMA + AND C.CONSTRAINT_NAME = K.CONSTRAINT_NAME + AND C.CONSTRAINT_TYPE = 'PRIMARY KEY' + JOIN sys.schemas s ON s.name = col.TABLE_SCHEMA + JOIN sys.sysusers u on u.uid = s.principal_id + where u.issqlrole = 0 + and u.name not in ('sys', 'guest', 'INFORMATION_SCHEMA') + """ + ,connection) let schemas = Dictionary() let columns = Dictionary() @@ -358,7 +415,7 @@ module InformationSchema = schemas.Add(schema.Name, { Schema = schema Tables = Dictionary(); - Enums = enumsLookup.TryFind schema.Name |> Option.defaultValue Map.empty }) + Enums = Map.empty }) match row.["table_oid"] |> Option.ofObj with | None -> () @@ -371,8 +428,8 @@ module InformationSchema = if not <| schemas.[schema.Name].Tables.ContainsKey(table) then schemas.[schema.Name].Tables.Add(table, HashSet()) - match row.GetValueOrDefault("col_number", -1s) with - | -1s -> () + match row.GetValueOrDefault("col_number", -1) with + | -1 -> () | attnum -> let udtName = string row.["col_udt_name"] let isArray = string row.["col_data_type"] = "ARRAY" @@ -385,26 +442,24 @@ module InformationSchema = let clrType = match string row.["col_data_type"] with | "ARRAY" -> - if not isUdt then - let elemType = getTypeMapping(dataType) - elemType.MakeArrayType() - else typeof.MakeArrayType() + let elemType = getTypeMapping(udtName.TrimStart('_') ) + elemType.MakeArrayType() | "USER-DEFINED" -> if isUdt then typeof else typeof | dataType -> getTypeMapping(dataType) let column = - { ColumnAttributeNumber = attnum + { ColumnAttributeNumber = attnum |> int16 Name = string row.["col_name"] DataType = { Name = dataType Schema = schema.Name - IsArray = isArray + IsArray = false // always false since sql server doesn't have arrays ClrType = clrType } - Nullable = row.["col_not_null"] |> unbox |> not - MaxLength = row.GetValueOrDefault("col_max_length", -1) - ReadOnly = row.["col_is_updatable"] |> unbox |> not - AutoIncrement = unbox row.["col_is_identity"] + Nullable = row.["col_null"] |> unbox + MaxLength = row.GetValueOrDefault("col_max_length", -1) + ReadOnly = false + AutoIncrement = unbox row.["col_is_identity"] DefaultConstraint = row.GetValueOrDefault("col_default", "") Description = row.GetValueOrDefault("col_description", "") UDT = lazy None @@ -415,18 +470,12 @@ module InformationSchema = if not <| schemas.[schema.Name].Tables.[table].Contains(column) then schemas.[schema.Name].Tables.[table].Add(column) |> ignore - let lookupKey = { TableOID = table.OID - ColumnAttributeNumber = column.ColumnAttributeNumber } + let lookupKey = { SchemaName = schema.Name + TableName = table.Name + ColumnName = column.Name} if not <| columns.ContainsKey(lookupKey) then columns.Add(lookupKey, column) { Schemas = schemas Columns = columns - Enums = enumsLookup - |> Seq.map (fun s -> - let schemaName = s.Key - s.Value |> Seq.map (fun x -> - let enumName = x.Key - sprintf "%s.%s" schemaName enumName, x.Value)) - |> Seq.concat - |> Map.ofSeq } + Enums = Map []} diff --git a/src/NpgsqlFSharpAnalyzer.Core/NpgsqlFSharpAnalyzer.Core.fsproj b/src/NpgsqlFSharpAnalyzer.Core/NpgsqlFSharpAnalyzer.Core.fsproj index 676e2e6..bbf3aab 100644 --- a/src/NpgsqlFSharpAnalyzer.Core/NpgsqlFSharpAnalyzer.Core.fsproj +++ b/src/NpgsqlFSharpAnalyzer.Core/NpgsqlFSharpAnalyzer.Core.fsproj @@ -15,7 +15,9 @@ + + From aeeb39169cbcca3055115e82323adcdcb32866b5 Mon Sep 17 00:00:00 2001 From: Sudqi Jawabreh Date: Fri, 9 Apr 2021 21:55:40 +0300 Subject: [PATCH 02/18] Use DustyTables and Throwaway instead of postgres packages --- paket.dependencies | 8 ++ paket.lock | 62 +++++++----- .../NpgsqlFSharpAnalyzer.Tests.fsproj | 2 + tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs | 99 +++++++++++++------ 4 files changed, 118 insertions(+), 53 deletions(-) diff --git a/paket.dependencies b/paket.dependencies index 43f3183..90376ae 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -12,7 +12,15 @@ nuget altcover ~> 6 nuget FSharp.Analyzers.SDK 0.8.0 nuget Npgsql nuget ThrowawayDb.Postgres +<<<<<<< HEAD nuget Npgsql.FSharp ~> 4.0 +||||||| parent of 645c934 (Use DustyTables and Throwaway instead of postgres packages) +nuget Npgsql.FSharp +======= +nuget Npgsql.FSharp +nuget ThrowawayDb +nuget DustyTables +>>>>>>> 645c934 (Use DustyTables and Throwaway instead of postgres packages) nuget F23.StringSimilarity // [ FAKE GROUP ] diff --git a/paket.lock b/paket.lock index c2407c3..5af2e60 100644 --- a/paket.lock +++ b/paket.lock @@ -19,6 +19,10 @@ NUGET Microsoft.NETCore.App (>= 2.0) - restriction: >= netcoreapp2.0 System.Runtime.Loader (>= 4.3) - restriction: && (>= netcoreapp1.0) (< netcoreapp2.0) System.ValueTuple (>= 4.4) - restriction: && (>= netcoreapp1.0) (< netcoreapp2.0) + DustyTables (0.1) + FSharp.Core (>= 4.3.4) - restriction: || (>= net461) (>= netstandard2.0) + System.Data.SqlClient (>= 4.6) - restriction: || (>= net461) (>= netstandard2.0) + TaskBuilder.fs (>= 2.1) - restriction: || (>= net461) (>= netstandard2.0) Expecto (8.13.1) FSharp.Core (>= 4.3.4) - restriction: || (>= net461) (>= netstandard2.0) Mono.Cecil (>= 0.11) - restriction: || (>= net461) (>= netstandard2.0) @@ -117,7 +121,7 @@ NUGET Microsoft.NETCore.DotNetHostResolver (>= 3.1.1) Microsoft.NETCore.DotNetHostResolver (3.1.1) - restriction: >= netcoreapp2.2 Microsoft.NETCore.DotNetAppHost (>= 3.1.1) - Microsoft.NETCore.Platforms (3.1) - restriction: || (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.4) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (>= net50) (< netstandard1.2)) (&& (< monoandroid) (>= net50) (< netstandard1.3)) (&& (< monoandroid) (>= net50) (< netstandard1.5)) (&& (< monoandroid) (>= netcoreapp2.1) (< netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.2) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.4) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (>= net45) (< netstandard1.3)) (&& (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< net45) (>= netstandard2.0)) (&& (>= net46) (< netstandard1.4)) (>= net461) (&& (>= net50) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (>= netcoreapp2.0) (&& (>= netcoreapp2.1) (< netcoreapp3.0)) (&& (>= netcoreapp3.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (< netstandard1.1) (>= uap10.0) (< win8)) (&& (< netstandard1.2) (>= uap10.0) (< win8)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (< netstandard1.3) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.3) (< win8) (>= wpa81)) (&& (< netstandard1.5) (>= uap10.0)) (>= uap10.1) (>= wp8) + Microsoft.NETCore.Platforms (3.1) - restriction: || (&& (>= monoandroid) (>= netcoreapp3.1)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.4) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (>= net50) (< netstandard1.2)) (&& (< monoandroid) (>= net50) (< netstandard1.3)) (&& (< monoandroid) (>= net50) (< netstandard1.5)) (&& (< monoandroid) (>= netcoreapp2.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.2) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.4) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (>= monotouch) (>= netcoreapp2.1)) (&& (>= monotouch) (>= netcoreapp3.1)) (&& (>= net45) (< netstandard1.3)) (&& (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< net45) (>= netstandard2.0)) (&& (>= net46) (< netstandard1.4)) (>= net461) (&& (>= net50) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (>= netcoreapp2.0) (&& (>= netcoreapp3.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (< netstandard1.1) (>= uap10.0) (< win8)) (&& (< netstandard1.2) (>= uap10.0) (< win8)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (< netstandard1.3) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.3) (< win8) (>= wpa81)) (&& (< netstandard1.5) (>= uap10.0)) (>= uap10.1) (>= wp8) Microsoft.NETCore.Targets (3.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.4) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (>= net50) (< netstandard1.2)) (&& (< monoandroid) (>= net50) (< netstandard1.3)) (&& (< monoandroid) (>= net50) (< netstandard1.5)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.2) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.4) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (>= net50) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (>= netcoreapp2.2) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81) (< wp8)) (&& (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (< netstandard1.1) (>= uap10.0) (< win8)) (&& (< netstandard1.2) (>= uap10.0) (< win8)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (< netstandard1.3) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< win81) (< wpa81)) Microsoft.NETFramework.ReferenceAssemblies (1.0) - copy_local: true Microsoft.NETFramework.ReferenceAssemblies.net20 (>= 1.0) - restriction: && (>= net20) (< net40) @@ -157,14 +161,15 @@ NUGET Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - Microsoft.Win32.Registry (4.7) - restriction: || (&& (< monoandroid) (>= net50) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= netcoreapp1.0) (>= netstandard2.0)) (>= netcoreapp2.1) + Microsoft.Win32.Registry (4.7) - restriction: || (&& (< monoandroid) (< net451) (< netcoreapp2.0) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= net50) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0)) (&& (>= net461) (>= netcoreapp3.1)) (&& (>= netcoreapp1.0) (>= netstandard2.0)) (>= netcoreapp2.1) (&& (>= netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) System.Buffers (>= 4.5) - restriction: || (&& (>= monoandroid) (< netcoreapp2.0)) (&& (< monoandroid) (< net46) (< netcoreapp2.0) (>= netstandard2.0)) (>= monotouch) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos) + System.Memory (>= 4.5.3) - restriction: || (&& (< monoandroid) (< net46) (< netcoreapp2.0) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.0) (< netcoreapp2.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (>= uap10.1) System.Security.AccessControl (>= 4.7) - restriction: || (&& (>= monoandroid) (< netcoreapp2.0)) (&& (< monoandroid) (< net46) (< netcoreapp2.0) (>= netstandard2.0)) (&& (< monoandroid) (>= netcoreapp2.0)) (>= monotouch) (>= net461) (>= netcoreapp2.1) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos) System.Security.Principal.Windows (>= 4.7) - restriction: || (&& (>= monoandroid) (< netcoreapp2.0)) (&& (< monoandroid) (< net46) (< netcoreapp2.0) (>= netstandard2.0)) (&& (< monoandroid) (>= netcoreapp2.0)) (>= monotouch) (>= net461) (>= netcoreapp2.1) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos) Microsoft.Win32.SystemEvents (4.7) - restriction: && (>= netcoreapp3.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) Microsoft.NETCore.Platforms (>= 3.1) - restriction: >= netcoreapp2.0 Mono.Cecil (0.11.1) - restriction: || (>= net461) (>= netstandard2.0) - NETStandard.Library (2.0.3) - restriction: || (>= netstandard1.0) (&& (< netstandard1.3) (>= uap10.0)) (&& (< netstandard2.0) (>= uap10.0)) + NETStandard.Library (2.0.3) - restriction: || (&& (< net45) (>= net461) (>= netstandard1.6)) (&& (< net45) (>= netstandard2.0)) (>= netstandard1.0) (&& (< netstandard1.3) (>= uap10.0)) (&& (< netstandard2.0) (>= uap10.0)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (>= net45) (< netstandard1.3)) (&& (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< net45) (>= netstandard2.0)) (&& (>= net46) (< netstandard1.4)) (>= net461) (>= netcoreapp2.0) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.0) (>= portable-net45+win8) (< win8)) (&& (< netstandard1.0) (< portable-net45+win8) (>= portable-net45+win8+wpa81)) (&& (< netstandard1.0) (>= portable-net45+win8+wp8+wpa81) (< portable-net45+win8+wpa81)) (&& (< netstandard1.0) (>= win8)) (&& (< netstandard1.3) (< win8) (>= wpa81)) (&& (< netstandard1.5) (>= uap10.0)) (>= uap10.1) (>= wp8) Microsoft.Win32.Primitives (>= 4.3) - restriction: || (&& (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (>= net46) (< netstandard1.4)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) System.AppContext (>= 4.3) - restriction: || (&& (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (>= net46) (< netstandard1.4)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) @@ -241,6 +246,10 @@ NUGET runtime.native.System (4.3.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (>= net50) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) Microsoft.NETCore.Platforms (>= 1.1.1) Microsoft.NETCore.Targets (>= 1.1.3) + runtime.native.System.Data.SqlClient.sni (4.7) - restriction: || (&& (< monoandroid) (< net451) (< netcoreapp2.0) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.0) (< netcoreapp2.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.1) (< netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (< net451) (>= net461) (< netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0)) (&& (>= net461) (>= netcoreapp2.1)) (&& (>= net461) (>= netcoreapp3.1)) (&& (>= netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) + runtime.win-arm64.runtime.native.System.Data.SqlClient.sni (>= 4.4) + runtime.win-x64.runtime.native.System.Data.SqlClient.sni (>= 4.4) + runtime.win-x86.runtime.native.System.Data.SqlClient.sni (>= 4.4) runtime.native.System.IO.Compression (4.3.2) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) Microsoft.NETCore.Platforms (>= 1.1.1) Microsoft.NETCore.Targets (>= 1.1.3) @@ -278,15 +287,18 @@ NUGET runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) runtime.ubuntu.18.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) + runtime.win-arm64.runtime.native.System.Data.SqlClient.sni (4.4) - restriction: || (&& (< monoandroid) (< net451) (< netcoreapp2.0) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.0) (< netcoreapp2.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.1) (< netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (< net451) (>= net461) (< netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0)) (&& (>= net461) (>= netcoreapp2.1)) (&& (>= net461) (>= netcoreapp3.1)) (&& (>= netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) + runtime.win-x64.runtime.native.System.Data.SqlClient.sni (4.4) - restriction: || (&& (< monoandroid) (< net451) (< netcoreapp2.0) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.0) (< netcoreapp2.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.1) (< netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (< net451) (>= net461) (< netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0)) (&& (>= net461) (>= netcoreapp2.1)) (&& (>= net461) (>= netcoreapp3.1)) (&& (>= netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) + runtime.win-x86.runtime.native.System.Data.SqlClient.sni (4.4) - restriction: || (&& (< monoandroid) (< net451) (< netcoreapp2.0) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.0) (< netcoreapp2.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.1) (< netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (< net451) (>= net461) (< netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0)) (&& (>= net461) (>= netcoreapp2.1)) (&& (>= net461) (>= netcoreapp3.1)) (&& (>= netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) System.AppContext (4.3) - restriction: || (&& (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (>= net46) (< netstandard1.4)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.6) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net46) (>= netstandard1.3) (< netstandard1.6)) - System.Buffers (4.5.1) - restriction: || (&& (>= monoandroid) (< netcoreapp2.0) (>= netcoreapp2.1)) (&& (>= monoandroid) (< netcoreapp2.0) (>= netstandard2.0) (< netstandard2.1)) (&& (>= monoandroid) (< netcoreapp2.0) (>= netstandard2.1)) (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< netcoreapp2.0) (>= netcoreapp2.1)) (&& (< monoandroid) (< netcoreapp2.0) (>= netstandard2.0) (< netstandard2.1)) (&& (< monoandroid) (< netcoreapp2.0) (>= netstandard2.1)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard2.0) (< win8)) (&& (>= monotouch) (>= netcoreapp2.1)) (&& (>= monotouch) (>= netstandard2.0)) (&& (>= monotouch) (>= netstandard2.1)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= netstandard2.1)) (>= net50) (&& (>= netcoreapp2.1) (>= xamarinios)) (&& (>= netcoreapp2.1) (>= xamarinmac)) (&& (>= netcoreapp2.1) (>= xamarintvos)) (&& (>= netcoreapp2.1) (>= xamarinwatchos)) (&& (< netcoreapp3.1) (>= netstandard2.1) (>= xamarinios)) (&& (< netcoreapp3.1) (>= netstandard2.1) (>= xamarinmac)) (&& (< netcoreapp3.1) (>= netstandard2.1) (>= xamarintvos)) (&& (< netcoreapp3.1) (>= netstandard2.1) (>= xamarinwatchos)) (&& (< netstandard1.1) (>= netstandard2.0) (>= win8)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard2.0) (< netstandard2.1) (>= xamarintvos)) (&& (>= netstandard2.0) (< netstandard2.1) (>= xamarinwatchos)) (&& (< netstandard2.1) (>= xamarinios)) (&& (< netstandard2.1) (>= xamarinmac)) + System.Buffers (4.5.1) - restriction: || (&& (>= monoandroid) (< netcoreapp2.0) (>= netstandard2.0) (< netstandard2.1)) (&& (>= monoandroid) (< netcoreapp2.0) (>= netstandard2.1)) (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net451) (< netcoreapp2.0) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netcoreapp2.0) (>= netstandard2.0) (< netstandard2.1)) (&& (< monoandroid) (< netcoreapp2.0) (>= netstandard2.1)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard2.0) (< win8)) (&& (>= monotouch) (>= netstandard2.0)) (&& (>= monotouch) (>= netstandard2.1)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= netstandard2.1)) (>= net50) (&& (< netcoreapp3.1) (>= netstandard2.1) (>= xamarinios)) (&& (< netcoreapp3.1) (>= netstandard2.1) (>= xamarinmac)) (&& (< netcoreapp3.1) (>= netstandard2.1) (>= xamarintvos)) (&& (< netcoreapp3.1) (>= netstandard2.1) (>= xamarinwatchos)) (&& (< netstandard1.1) (>= netstandard2.0) (>= win8)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard2.0) (< netstandard2.1) (>= xamarintvos)) (&& (>= netstandard2.0) (< netstandard2.1) (>= xamarinwatchos)) (&& (< netstandard2.1) (>= xamarinios)) (&& (< netstandard2.1) (>= xamarinmac)) System.CodeDom (5.0) - restriction: >= net50 System.Collections (4.3) - restriction: || (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (>= net50) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81) (< wp8)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (< netstandard2.0) (>= uap10.0)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) - System.Collections.Concurrent (4.3) - restriction: || (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (>= net50) (< netstandard1.6)) (&& (< monoandroid) (>= net50) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (>= net46) (< netstandard1.3)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.3) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) + System.Collections.Concurrent (4.3) - restriction: || (&& (< monoandroid) (>= net50) (< netstandard1.6)) (&& (< monoandroid) (>= net50) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) System.Collections (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Diagnostics.Debug (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Diagnostics.Tracing (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) @@ -311,22 +323,20 @@ NUGET System.IO (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Text.Encoding (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) + System.Data.SqlClient (4.8.2) - restriction: || (>= net461) (>= netstandard2.0) + Microsoft.Win32.Registry (>= 4.7) - restriction: || (&& (< monoandroid) (< net451) (< netcoreapp2.0) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.0) (< netcoreapp2.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.1) (< netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) + runtime.native.System.Data.SqlClient.sni (>= 4.7) - restriction: || (&& (< monoandroid) (< monotouch) (< net451) (>= netstandard1.3) (< netstandard2.0) (< win81) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net451) (< netcoreapp2.0) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.0) (< netcoreapp2.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.1) (< netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) + System.Buffers (>= 4.5.1) - restriction: && (< monoandroid) (< net451) (< netcoreapp2.0) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) + System.Diagnostics.DiagnosticSource (>= 4.7) - restriction: || (&& (< monoandroid) (< monotouch) (< net451) (>= netstandard1.3) (< netstandard2.0) (< win81) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net451) (< netcoreapp2.0) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.0) (< netcoreapp2.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.1) (< netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (>= uap10.1) + System.Memory (>= 4.5.4) - restriction: || (&& (< monoandroid) (< net451) (< netcoreapp2.0) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.0) (< netcoreapp2.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (>= uap10.1) + System.Security.Principal.Windows (>= 4.7) - restriction: || (&& (< monoandroid) (< monotouch) (< net451) (>= netstandard1.3) (< netstandard2.0) (< win81) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net451) (< netcoreapp2.0) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.0) (< netcoreapp2.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.1) (< netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) + System.Text.Encoding.CodePages (>= 4.7) - restriction: || (&& (< monoandroid) (< monotouch) (< net451) (>= netstandard1.3) (< netstandard2.0) (< win81) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net451) (< netcoreapp2.0) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.0) (< netcoreapp2.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.1) (< netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (>= uap10.1) System.Diagnostics.Debug (4.3) - restriction: || (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (>= net50) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81) (< wp8)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (< netstandard2.0) (>= uap10.0)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) - System.Diagnostics.DiagnosticSource (4.7) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) - System.Collections (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81)) - System.Collections.Concurrent (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81)) - System.Diagnostics.Debug (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos) - System.Diagnostics.Tracing (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81)) + System.Diagnostics.DiagnosticSource (4.7) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net451) (< netcoreapp2.0) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.0) (< netcoreapp2.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.1) (< netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (< net451) (>= net461) (< netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0)) (&& (>= net461) (>= netcoreapp2.1)) (&& (>= net461) (>= uap10.1)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard2.0) (>= uap10.1)) System.Memory (>= 4.5.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (< netcoreapp2.1) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= net45) (< netstandard1.3)) (>= net46) (>= uap10.1) - System.Reflection (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81)) - System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81)) - System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81)) - System.Runtime.Extensions (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos) - System.Runtime.InteropServices (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81)) - System.Threading (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.3) (< win8) (< wpa81)) System.Diagnostics.Process (4.3) - restriction: >= net50 Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.4) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) Microsoft.Win32.Primitives (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.4) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) @@ -464,7 +474,7 @@ NUGET System.Reflection.Extensions (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Resources.ResourceManager (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) - System.Memory (4.5.4) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard2.0) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.6) (>= netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (>= netcoreapp1.0) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.0) (< netstandard2.0) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.0) (< netstandard2.1)) (&& (< monoandroid) (>= netcoreapp2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netcoreapp2.0) (>= netstandard2.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp3.0) (< netstandard2.1)) (&& (>= monotouch) (>= netstandard2.0)) (&& (>= monotouch) (>= netstandard2.1)) (&& (>= net45) (< netstandard1.3) (>= uap10.0)) (&& (< net45) (>= net46) (< netstandard1.2)) (&& (< net45) (>= net46) (< netstandard1.3)) (&& (< net45) (>= net46) (>= netstandard1.4) (< netstandard1.5)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= net46) (>= netstandard1.5) (< netstandard1.6)) (&& (< net45) (>= net46) (< netstandard1.5) (>= netstandard1.6)) (&& (< net45) (>= net46) (>= netstandard1.6) (< netstandard2.0)) (&& (>= net46) (>= netcoreapp2.0) (< netstandard2.0)) (&& (>= net46) (< netstandard1.4) (>= uap10.1)) (&& (>= net46) (< netstandard1.5) (>= uap10.0)) (>= net461) (&& (>= net472) (>= netcoreapp1.0)) (&& (>= netcoreapp2.0) (>= uap10.1)) (>= netcoreapp2.1) (&& (>= netcoreapp3.0) (>= uap10.1)) (&& (< netstandard1.2) (>= uap10.1) (< win8)) (&& (< netstandard1.5) (>= netstandard2.0) (>= uap10.0)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (>= uap10.1)) (&& (>= netstandard2.0) (< netstandard2.1)) (&& (>= netstandard2.0) (>= uap10.1)) (&& (>= netstandard2.1) (>= uap10.1)) (&& (< netstandard2.1) (>= xamarinios)) (&& (< netstandard2.1) (>= xamarinmac)) (&& (>= uap10.1) (< win8) (< wpa81)) (&& (>= uap10.1) (>= xamarinios)) (&& (>= uap10.1) (>= xamarinmac)) + System.Memory (4.5.4) - restriction: || (&& (< monoandroid) (< net451) (< netcoreapp2.0) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp1.0) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.0) (< netstandard2.0) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.0) (< netstandard2.1)) (&& (< monoandroid) (>= netcoreapp2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netcoreapp2.0) (>= netstandard2.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp3.0) (< netstandard2.1)) (&& (>= monotouch) (>= netstandard2.0)) (&& (>= monotouch) (>= netstandard2.1)) (&& (>= net46) (>= netcoreapp2.0) (< netstandard2.0)) (>= net461) (&& (>= net472) (>= netcoreapp1.0)) (&& (>= netcoreapp2.0) (>= uap10.1)) (>= netcoreapp2.1) (&& (>= netcoreapp3.0) (>= uap10.1)) (&& (>= netstandard2.0) (< netstandard2.1)) (&& (>= netstandard2.0) (>= uap10.1)) (&& (>= netstandard2.1) (>= uap10.1)) (&& (< netstandard2.1) (>= xamarinios)) (&& (< netstandard2.1) (>= xamarinmac)) (&& (>= uap10.1) (>= xamarinios)) (&& (>= uap10.1) (>= xamarinmac)) System.Buffers (>= 4.5.1) - restriction: || (&& (>= monoandroid) (< netcoreapp2.0)) (&& (< monoandroid) (< net45) (< netcoreapp2.0) (>= netstandard2.0)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (< netstandard1.1) (>= portable-net45+win8+wpa81) (< win8)) (>= monotouch) (&& (>= net45) (< netstandard2.0)) (>= net461) (&& (< netstandard1.1) (>= win8)) (&& (< netstandard2.0) (< uap10.1) (>= wpa81)) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos) System.Numerics.Vectors (>= 4.4) - restriction: && (< monoandroid) (< net45) (< netcoreapp2.0) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Numerics.Vectors (>= 4.5) - restriction: >= net461 @@ -595,7 +605,7 @@ NUGET System.Runtime (4.3.1) - restriction: || (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (>= netcoreapp1.0) (< netcoreapp2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.2) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.4) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (< net45) (>= net46) (< netstandard1.3)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (>= net50) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81) (< wp8)) (&& (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (< netstandard1.1) (>= uap10.0) (< win8)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (< netstandard1.3) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.4) (>= uap10.0)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< win81) (< wpa81)) (&& (< netstandard2.0) (>= uap10.0)) Microsoft.NETCore.Platforms (>= 1.1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.2) (< win8) (< wp8)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) Microsoft.NETCore.Targets (>= 1.1.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.2) (< win8) (< wp8)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) - System.Runtime.CompilerServices.Unsafe (4.7) - restriction: || (&& (>= monoandroid) (< netcoreapp2.0) (>= netstandard2.1)) (&& (< monoandroid) (>= netcoreapp2.0) (< netcoreapp2.1) (>= netstandard2.1)) (&& (< monoandroid) (>= netcoreapp2.0) (< netcoreapp2.1) (< netstandard2.1)) (&& (< monoandroid) (< netcoreapp2.0) (>= netcoreapp2.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netcoreapp2.0) (>= netstandard2.1)) (&& (< monoandroid) (>= netcoreapp2.1) (< netcoreapp3.0) (>= netstandard2.1)) (&& (< monoandroid) (>= netcoreapp2.1) (< netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.1) (< netstandard2.1)) (&& (< monoandroid) (>= netcoreapp3.0) (< netcoreapp3.1)) (&& (< monoandroid) (>= netcoreapp3.0) (< netstandard2.1)) (&& (>= monotouch) (>= netstandard2.1)) (&& (>= net461) (>= netcoreapp2.1)) (&& (>= net461) (>= netstandard2.1)) (&& (< netcoreapp3.1) (>= netstandard2.1) (>= xamarinios)) (&& (< netcoreapp3.1) (>= netstandard2.1) (>= xamarinmac)) (&& (< netcoreapp3.1) (>= netstandard2.1) (>= xamarintvos)) (&& (< netcoreapp3.1) (>= netstandard2.1) (>= xamarinwatchos)) (>= netstandard2.0) (&& (>= netstandard2.1) (>= uap10.1)) (&& (< netstandard2.1) (>= xamarinios)) (&& (< netstandard2.1) (>= xamarinmac)) + System.Runtime.CompilerServices.Unsafe (4.7) - restriction: || (&& (>= monoandroid) (< netcoreapp2.0) (>= netstandard2.1)) (&& (< monoandroid) (>= netcoreapp2.0) (< netcoreapp2.1) (>= netstandard2.1)) (&& (< monoandroid) (>= netcoreapp2.0) (< netcoreapp2.1) (< netstandard2.1)) (&& (< monoandroid) (>= netcoreapp2.0) (< netcoreapp2.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netcoreapp2.0) (>= netcoreapp2.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netcoreapp2.0) (>= netstandard2.1)) (&& (< monoandroid) (>= netcoreapp2.1) (< netcoreapp3.0) (>= netstandard2.1)) (&& (< monoandroid) (>= netcoreapp2.1) (< netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.1) (< netstandard2.1)) (&& (< monoandroid) (>= netcoreapp3.0) (< netcoreapp3.1)) (&& (< monoandroid) (>= netcoreapp3.0) (< netstandard2.1)) (&& (>= monotouch) (>= netstandard2.1)) (&& (< net451) (>= net461)) (&& (>= net461) (>= netcoreapp2.0)) (&& (>= net461) (>= netcoreapp2.1)) (&& (>= net461) (>= netstandard2.1)) (&& (>= net461) (>= uap10.1)) (&& (>= netcoreapp2.0) (>= uap10.1)) (&& (< netcoreapp3.1) (>= netstandard2.1) (>= xamarinios)) (&& (< netcoreapp3.1) (>= netstandard2.1) (>= xamarinmac)) (&& (< netcoreapp3.1) (>= netstandard2.1) (>= xamarintvos)) (&& (< netcoreapp3.1) (>= netstandard2.1) (>= xamarinwatchos)) (>= netstandard2.0) (&& (>= netstandard2.1) (>= uap10.1)) (&& (< netstandard2.1) (>= xamarinios)) (&& (< netstandard2.1) (>= xamarinmac)) System.Runtime.Extensions (4.3.1) - restriction: || (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (>= net50) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81) (< wp8)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (< netstandard2.0) (>= uap10.0)) Microsoft.NETCore.Platforms (>= 1.1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) Microsoft.NETCore.Targets (>= 1.1.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) @@ -628,7 +638,7 @@ NUGET System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.4) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net46) (>= netstandard1.3) (< netstandard1.4)) System.Runtime.Serialization.Primitives (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (>= netstandard1.4) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netstandard1.3) (< netstandard1.4)) (>= net46) System.Runtime.Serialization.Primitives (4.3) - restriction: || (&& (< netstandard1.3) (>= uap10.0)) (&& (< netstandard2.0) (>= uap10.0)) - System.Security.AccessControl (4.7) - restriction: || (&& (>= netcoreapp1.0) (>= netstandard2.0)) (>= netcoreapp2.1) + System.Security.AccessControl (4.7) - restriction: || (&& (>= monoandroid) (>= net461) (>= netstandard2.0)) (&& (>= monoandroid) (< netcoreapp2.0) (>= netcoreapp3.1)) (&& (< monoandroid) (< net451) (< netcoreapp2.0) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.0) (< netcoreapp2.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netcoreapp2.0) (>= netcoreapp2.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.1) (< netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= monotouch) (>= netcoreapp2.0)) (&& (>= monotouch) (>= netcoreapp2.1)) (&& (>= monotouch) (>= netcoreapp3.1)) (&& (>= monotouch) (>= netstandard2.0)) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0)) (&& (>= net461) (>= netcoreapp2.1)) (&& (>= net461) (>= netcoreapp3.1)) (&& (>= net461) (>= netstandard2.0) (>= xamarintvos)) (&& (>= net461) (>= netstandard2.0) (>= xamarinwatchos)) (&& (>= net461) (>= xamarinios)) (&& (>= net461) (>= xamarinmac)) (&& (>= netcoreapp1.0) (>= netstandard2.0)) (&& (>= netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) Microsoft.NETCore.Platforms (>= 3.1) - restriction: >= netcoreapp2.0 System.Security.Principal.Windows (>= 4.7) - restriction: || (&& (>= net46) (< netstandard2.0)) (&& (< net46) (>= netstandard1.3) (< netstandard2.0) (< uap10.1)) (&& (< net46) (>= netstandard2.0)) (>= net461) (>= netcoreapp2.0) System.Security.Claims (4.3) - restriction: >= net50 @@ -752,13 +762,13 @@ NUGET System.Windows.Extensions (>= 4.7) - restriction: >= netcoreapp3.0 System.Security.Principal (4.3) - restriction: >= net50 System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.Security.Principal.Windows (4.7) - restriction: >= netcoreapp2.1 + System.Security.Principal.Windows (4.7) - restriction: || (&& (< monoandroid) (< net451) (< netcoreapp2.0) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (< net451) (>= net461) (< netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0)) (&& (>= net461) (>= netcoreapp3.1)) (>= netcoreapp2.1) (&& (>= netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) Microsoft.NETCore.Platforms (>= 3.1) - restriction: || (&& (>= netcoreapp2.0) (< netcoreapp2.1)) (&& (>= netcoreapp2.1) (< netcoreapp3.0)) System.Text.Encoding (4.3) - restriction: || (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (>= net50) (< netstandard1.4)) (&& (< monoandroid) (>= net50) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (>= net46) (< netstandard1.3)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81) (< wp8)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (< netstandard1.3) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard2.0) (>= uap10.0)) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) System.Runtime (>= 4.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.3) (< win8) (< wp8) (< wpa81)) - System.Text.Encoding.CodePages (4.7) - restriction: || (&& (>= netcoreapp1.0) (>= netstandard2.0)) (>= netcoreapp2.1) + System.Text.Encoding.CodePages (4.7) - restriction: || (&& (< monoandroid) (< net451) (< netcoreapp2.0) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (< net451) (>= net461) (< netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0)) (&& (>= net461) (>= uap10.1)) (&& (>= netcoreapp1.0) (>= netstandard2.0)) (>= netcoreapp2.1) (&& (>= netstandard2.0) (>= uap10.1)) Microsoft.NETCore.Platforms (>= 3.1) - restriction: || (&& (< monoandroid) (>= netcoreapp2.0) (< netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) System.Runtime.CompilerServices.Unsafe (>= 4.7) - restriction: || (&& (< monoandroid) (< net46) (< netcoreapp2.0) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.0) (< netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (>= net461) System.Text.Encoding.Extensions (4.3) - restriction: || (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (>= net50) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81) (< wp8)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) @@ -814,7 +824,7 @@ NUGET Microsoft.NETCore.Platforms (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net451) (>= netstandard1.2) (< win81) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) Microsoft.NETCore.Targets (>= 1.1) - restriction: && (< monoandroid) (< monotouch) (< net451) (>= netstandard1.2) (< win81) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net451) (>= netstandard1.2) (< win81) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - System.ValueTuple (4.5) - restriction: || (>= net461) (&& (>= netcoreapp1.0) (< netcoreapp2.0)) (&& (>= netstandard2.0) (< netstandard2.1)) + System.ValueTuple (4.5) - restriction: || (&& (>= net45) (< net46) (< netstandard1.6) (>= netstandard2.0)) (&& (< net45) (>= netstandard2.0)) (&& (>= net46) (< netstandard1.6) (>= netstandard2.0)) (>= net461) (&& (>= netcoreapp1.0) (< netcoreapp2.0)) (&& (>= netstandard2.0) (< netstandard2.1)) System.Windows.Extensions (4.7) - restriction: >= netcoreapp3.0 System.Drawing.Common (>= 4.7) - restriction: >= netcoreapp3.0 System.Xml.ReaderWriter (4.3.1) - restriction: || (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (>= net46) (< netstandard1.4)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81) (< wp8)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (< netstandard1.3) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard2.0) (>= uap10.0)) @@ -857,8 +867,12 @@ NUGET System.Text.Encoding (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Threading (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) System.Xml.ReaderWriter (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos) - ThrowawayDb.Postgres (1.0) - Npgsql (>= 4.0.6) - restriction: >= netstandard2.0 + TaskBuilder.fs (2.1) - restriction: || (>= net461) (>= netstandard2.0) + FSharp.Core (>= 4.1.17) - restriction: || (&& (>= net45) (< net46) (< netstandard1.6)) (&& (< net45) (>= netstandard1.6)) (&& (>= net46) (< netstandard1.6)) (>= net47) + NETStandard.Library (>= 1.6.1) - restriction: && (< net45) (>= netstandard1.6) + System.ValueTuple (>= 4.4) - restriction: || (&& (>= net45) (< net46) (< netstandard1.6)) (&& (< net45) (>= netstandard1.6)) (&& (>= net46) (< netstandard1.6)) (>= net47) + ThrowawayDb (1.0) + System.Data.SqlClient (>= 4.6) - restriction: >= netstandard2.0 YoloDev.Expecto.TestSdk (0.8) Expecto (>= 8.10 < 9.0) - restriction: || (>= net461) (>= netcoreapp2.0) FSharp.Core (>= 4.3.4) - restriction: || (>= net461) (>= netcoreapp2.0) diff --git a/tests/NpgsqlFSharpAnalyzer.Tests/NpgsqlFSharpAnalyzer.Tests.fsproj b/tests/NpgsqlFSharpAnalyzer.Tests/NpgsqlFSharpAnalyzer.Tests.fsproj index 0ddbaa7..96662ba 100644 --- a/tests/NpgsqlFSharpAnalyzer.Tests/NpgsqlFSharpAnalyzer.Tests.fsproj +++ b/tests/NpgsqlFSharpAnalyzer.Tests/NpgsqlFSharpAnalyzer.Tests.fsproj @@ -23,9 +23,11 @@ + + diff --git a/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs b/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs index 46277c3..4796c34 100644 --- a/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs +++ b/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs @@ -4,8 +4,14 @@ open System open Expecto open Npgsql.FSharp.Analyzers open Npgsql.FSharp.Analyzers.Core -open Npgsql.FSharp -open ThrowawayDb.Postgres +//open Npgsql.FSharp +open DustyTables +open ThrowawayDb +open Microsoft.FSharp.Control + +[] +let connectionString = + @"Data Source=localhost ;Initial Catalog=sqlanalyzer;Integrated Security=True" let analyzers = [ SqlAnalyzer.queryAnalyzer @@ -23,12 +29,7 @@ let inline context file = |> Option.map SqlAnalyzer.sqlAnalyzerContext let createTestDatabase() = - Sql.host "localhost" - |> Sql.port 5432 - |> Sql.username "postgres" - |> Sql.password "postgres" - |> Sql.formatConnectionString - |> ThrowawayDatabase.Create + connectionString |> ThrowawayDatabase.Create [] let tests = @@ -270,7 +271,9 @@ let tests = Sql.connect db.ConnectionString |> Sql.query "CREATE TABLE users (user_id bigserial primary key, username text not null)" - |> Sql.executeNonQuery + |> Sql.executeNonQueryAsync + |> Async.AwaitTask + |> Async.RunSynchronously |> raiseWhenFailed match context (find "../examples/hashing/usingLiteralQueriesWithTransactions.fs") with @@ -359,8 +362,10 @@ let tests = Sql.connect db.ConnectionString |> Sql.query "CREATE TABLE users (user_id bigserial primary key, username text not null)" - |> Sql.executeNonQuery - |> raiseWhenFailed + |> Sql.executeNonQueryAsync + |> Async.AwaitTask + |> Async.RunSynchronously + |> raiseWhenFailed match context (find "../examples/hashing/errorsInTransactions.fs") with | None -> failwith "Could not crack project" @@ -379,7 +384,9 @@ let tests = Sql.connect db.ConnectionString |> Sql.query "CREATE TABLE users (user_id bigserial primary key, username text not null, active bit not null)" - |> Sql.executeNonQuery + |> Sql.executeNonQueryAsync + |> Async.AwaitTask + |> Async.RunSynchronously |> raiseWhenFailed match context (find "../examples/hashing/detectingEmptyParameterSet.fs") with @@ -472,7 +479,9 @@ let tests = Sql.connect db.ConnectionString |> Sql.query "CREATE TABLE users (user_id bigserial primary key, roles text[] not null)" - |> Sql.executeNonQuery + |> Sql.executeNonQueryAsync + |> Async.AwaitTask + |> Async.RunSynchronously |> raiseWhenFailed let databaseMetadata = InformationSchema.getDbSchemaLookups db.ConnectionString @@ -526,7 +535,9 @@ let tests = Sql.connect db.ConnectionString |> Sql.query "CREATE TABLE users (user_id bigserial primary key, username text not null, active bit not null)" - |> Sql.executeNonQuery + |> Sql.executeNonQueryAsync + |> Async.AwaitTask + |> Async.RunSynchronously |> raiseWhenFailed let databaseMetadata = InformationSchema.getDbSchemaLookups db.ConnectionString @@ -542,7 +553,9 @@ let tests = Sql.connect db.ConnectionString |> Sql.query "CREATE TABLE users (user_id bigserial primary key, username text not null, active bit not null)" - |> Sql.executeNonQuery + |> Sql.executeNonQueryAsync + |> Async.AwaitTask + |> Async.RunSynchronously |> raiseWhenFailed let databaseMetadata = InformationSchema.getDbSchemaLookups db.ConnectionString @@ -569,7 +582,9 @@ let tests = Sql.connect db.ConnectionString |> Sql.query createFuncQuery - |> Sql.executeNonQuery + |> Sql.executeNonQueryAsync + |> Async.AwaitTask + |> Async.RunSynchronously |> raiseWhenFailed let databaseMetadata = InformationSchema.getDbSchemaLookups db.ConnectionString @@ -590,7 +605,9 @@ let tests = Sql.connect db.ConnectionString |> Sql.query "CREATE TABLE users (user_id bigserial primary key, username text not null, active bit not null)" - |> Sql.executeNonQuery + |> Sql.executeNonQueryAsync + |> Async.AwaitTask + |> Async.RunSynchronously |> raiseWhenFailed match context (find "../examples/hashing/semanticAnalysis-missingColumn.fs") with @@ -615,7 +632,9 @@ let tests = Sql.connect db.ConnectionString |> Sql.query "CREATE TABLE users (user_id bigserial primary key, username text not null, active bit not null)" - |> Sql.executeNonQuery + |> Sql.executeNonQueryAsync + |> Async.AwaitTask + |> Async.RunSynchronously |> raiseWhenFailed match context (find "../examples/hashing/semanticAnalysis-missingParameter.fs") with @@ -640,7 +659,9 @@ let tests = Sql.connect db.ConnectionString |> Sql.query "CREATE TABLE users (user_id bigserial primary key, username text not null, active bit not null)" - |> Sql.executeNonQuery + |> Sql.executeNonQueryAsync + |> Async.AwaitTask + |> Async.RunSynchronously |> raiseWhenFailed match context (find "../examples/hashing/syntaxAnalysisReferencingQueryDoesNotGiveError.fs") with @@ -660,7 +681,9 @@ let tests = Sql.connect db.ConnectionString |> Sql.query "CREATE TABLE users (user_id bigserial primary key, username text not null, active bit not null)" - |> Sql.executeNonQuery + |> Sql.executeNonQueryAsync + |> Async.AwaitTask + |> Async.RunSynchronously |> raiseWhenFailed match context (find "../examples/hashing/semanticAnalysis-typeMismatch.fs") with @@ -684,7 +707,9 @@ let tests = Sql.connect db.ConnectionString |> Sql.query "CREATE TABLE users (user_id bigserial primary key, roles text[] not null)" - |> Sql.executeNonQuery + |> Sql.executeNonQueryAsync + |> Async.AwaitTask + |> Async.RunSynchronously |> raiseWhenFailed match context (find "../examples/hashing/readingTextArray.fs") with @@ -708,7 +733,9 @@ let tests = Sql.connect db.ConnectionString |> Sql.query "CREATE TABLE users (user_id bigserial primary key, codes uuid[] not null)" - |> Sql.executeNonQuery + |> Sql.executeNonQueryAsync + |> Async.AwaitTask + |> Async.RunSynchronously |> raiseWhenFailed match context (find "../examples/hashing/readingUuidArray.fs") with @@ -732,7 +759,9 @@ let tests = Sql.connect db.ConnectionString |> Sql.query "CREATE TABLE users (user_id bigserial primary key, username text)" - |> Sql.executeNonQuery + |> Sql.executeNonQueryAsync + |> Async.AwaitTask + |> Async.RunSynchronously |> raiseWhenFailed match context (find "../examples/hashing/usingIntArrayParameter.fs") with @@ -804,7 +833,9 @@ let tests = Sql.connect db.ConnectionString |> Sql.query "CREATE TABLE users (user_id serial primary key, username text not null, active bit not null)" - |> Sql.executeNonQuery + |> Sql.executeNonQueryAsync + |> Async.AwaitTask + |> Async.RunSynchronously |> raiseWhenFailed match context (find "../examples/hashing/readAttemptIntegerTypeMismatch.fs") with @@ -828,7 +859,9 @@ let tests = Sql.connect db.ConnectionString |> Sql.query "CREATE TABLE users (user_id serial primary key, username text not null)" - |> Sql.executeNonQuery + |> Sql.executeNonQueryAsync + |> Async.AwaitTask + |> Async.RunSynchronously |> raiseWhenFailed match context (find "../examples/hashing/selectWithNonNullableColumnComparison.fs") with @@ -853,12 +886,16 @@ let tests = Sql.connect db.ConnectionString |> Sql.query "CREATE TABLE users (user_id serial primary key, username text not null)" - |> Sql.executeNonQuery + |> Sql.executeNonQueryAsync + |> Async.AwaitTask + |> Async.RunSynchronously |> raiseWhenFailed Sql.connect db.ConnectionString |> Sql.query "CREATE TABLE user_roles (user_role_id serial primary key, role_description text not null, user_id int not null references users(user_id))" - |> Sql.executeNonQuery + |> Sql.executeNonQueryAsync + |> Async.AwaitTask + |> Async.RunSynchronously |> raiseWhenFailed match context (find "../examples/hashing/selectWithInnerJoins.fs") with @@ -883,7 +920,9 @@ let tests = Sql.connect db.ConnectionString |> Sql.query "CREATE TABLE users (user_id serial primary key, username text not null, last_login timestamptz)" - |> Sql.executeNonQuery + |> Sql.executeNonQueryAsync + |> Async.AwaitTask + |> Async.RunSynchronously |> raiseWhenFailed match context (find "../examples/hashing/updateQueryWithParametersInAssignments.fs") with @@ -908,7 +947,9 @@ let tests = Sql.connect db.ConnectionString |> Sql.query "CREATE TABLE users (user_id bigserial primary key, username text not null, active bit not null)" - |> Sql.executeNonQuery + |> Sql.executeNonQueryAsync + |> Async.AwaitTask + |> Async.RunSynchronously |> raiseWhenFailed match context (find "../examples/hashing/semanticAnalysis-redundantParameters.fs") with From 165f1a15da8b033e87a27c014e375601f184e61c Mon Sep 17 00:00:00 2001 From: Sudqi Jawabreh Date: Sat, 10 Apr 2021 17:28:17 +0300 Subject: [PATCH 03/18] Replace bigserial and serial with int and bigint using identity keyword --- tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs | 48 +++++++++++------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs b/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs index 4796c34..b09085c 100644 --- a/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs +++ b/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs @@ -270,7 +270,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigserial primary key, username text not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -361,7 +361,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigserial primary key, username text not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -383,7 +383,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigserial primary key, username text not null, active bit not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text not null, active bit not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -409,7 +409,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigserial primary key, username text not null, active bit not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text not null, active bit not null)" |> Sql.executeNonQuery |> ignore @@ -455,7 +455,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigserial primary key, username text not null, active bit not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text not null, active bit not null)" |> Sql.executeNonQuery |> ignore @@ -478,7 +478,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigserial primary key, roles text[] not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, roles text[] not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -534,7 +534,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigserial primary key, username text not null, active bit not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text not null, active bit not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -552,7 +552,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigserial primary key, username text not null, active bit not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text not null, active bit not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -604,7 +604,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigserial primary key, username text not null, active bit not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text not null, active bit not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -631,7 +631,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigserial primary key, username text not null, active bit not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text not null, active bit not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -658,7 +658,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigserial primary key, username text not null, active bit not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text not null, active bit not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -680,7 +680,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigserial primary key, username text not null, active bit not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text not null, active bit not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -706,7 +706,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigserial primary key, roles text[] not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, roles text[] not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -732,7 +732,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigserial primary key, codes uuid[] not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, codes uuid[] not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -758,7 +758,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigserial primary key, username text)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -784,7 +784,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigserial primary key, username text, roles text[] not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text, roles text[] not null)" |> Sql.executeNonQuery |> ignore @@ -808,7 +808,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigserial primary key, username text not null, active boolean not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text not null, active boolean not null)" |> Sql.executeNonQuery |> ignore @@ -828,11 +828,11 @@ let tests = failwith "Expected only one error message" } - test "SQL query semantic analysis: type mismatch with integer/serial" { + test "SQL query semantic analysis: type mismatch with integer/identity" { use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id serial primary key, username text not null, active bit not null)" + |> Sql.query "CREATE TABLE users (user_id int identity(1,1) primary key, username text not null, active bit not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -858,7 +858,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id serial primary key, username text not null)" + |> Sql.query "CREATE TABLE users (user_id int identity(1,1) primary key, username text not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -885,14 +885,14 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id serial primary key, username text not null)" + |> Sql.query "CREATE TABLE users (user_id int identity(1,1) primary key, username text not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously |> raiseWhenFailed Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE user_roles (user_role_id serial primary key, role_description text not null, user_id int not null references users(user_id))" + |> Sql.query "CREATE TABLE user_roles (user_role_id int identity(1,1) primary key, role_description text not null, user_id int not null references users(user_id))" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -919,7 +919,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id serial primary key, username text not null, last_login timestamptz)" + |> Sql.query "CREATE TABLE users (user_id int identity(1,1) primary key, username text not null, last_login timestamptz)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -946,7 +946,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigserial primary key, username text not null, active bit not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text not null, active bit not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously From cb75307dfed0cf818dab2096bec33bcefa1d486d Mon Sep 17 00:00:00 2001 From: Sudqi Jawabreh Date: Sat, 10 Apr 2021 17:51:04 +0300 Subject: [PATCH 04/18] Use nvarchar instead of text and text[] --- tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs | 44 +++++++++++------------ 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs b/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs index b09085c..6cd1883 100644 --- a/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs +++ b/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs @@ -270,7 +270,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username nvarchar(max) not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -361,7 +361,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username nvarchar(max) not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -383,7 +383,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text not null, active bit not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username nvarchar(max) not null, active bit not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -409,7 +409,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text not null, active bit not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username nvarchar(max) not null, active bit not null)" |> Sql.executeNonQuery |> ignore @@ -455,7 +455,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text not null, active bit not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username nvarchar(max) not null, active bit not null)" |> Sql.executeNonQuery |> ignore @@ -478,7 +478,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, roles text[] not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, roles nvarchar(max) not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -534,7 +534,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text not null, active bit not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username nvarchar(max) not null, active bit not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -552,7 +552,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text not null, active bit not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username nvarchar(max) not null, active bit not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -604,7 +604,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text not null, active bit not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username nvarchar(max) not null, active bit not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -631,7 +631,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text not null, active bit not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username nvarchar(max) not null, active bit not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -658,7 +658,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text not null, active bit not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username nvarchar(max) not null, active bit not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -680,7 +680,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text not null, active bit not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username nvarchar(max) not null, active bit not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -706,7 +706,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, roles text[] not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, roles nvarchar(max) not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -758,7 +758,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username nvarchar(max))" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -784,7 +784,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text, roles text[] not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username nvarchar(max), roles nvarchar(max) not null)" |> Sql.executeNonQuery |> ignore @@ -808,7 +808,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text not null, active boolean not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username nvarchar(max) not null, active boolean not null)" |> Sql.executeNonQuery |> ignore @@ -832,7 +832,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id int identity(1,1) primary key, username text not null, active bit not null)" + |> Sql.query "CREATE TABLE users (user_id int identity(1,1) primary key, username nvarchar(max) not null, active bit not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -858,7 +858,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id int identity(1,1) primary key, username text not null)" + |> Sql.query "CREATE TABLE users (user_id int identity(1,1) primary key, username nvarchar(max) not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -885,14 +885,14 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id int identity(1,1) primary key, username text not null)" + |> Sql.query "CREATE TABLE users (user_id int identity(1,1) primary key, username nvarchar(max not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously |> raiseWhenFailed Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE user_roles (user_role_id int identity(1,1) primary key, role_description text not null, user_id int not null references users(user_id))" + |> Sql.query "CREATE TABLE user_roles (user_role_id int identity(1,1) primary key, role_description nvarchar(max) not null, user_id int not null references users(user_id))" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -919,7 +919,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id int identity(1,1) primary key, username text not null, last_login timestamptz)" + |> Sql.query "CREATE TABLE users (user_id int identity(1,1) primary key, username nvarchar(max) not null, last_login timestamptz)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -946,7 +946,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username text not null, active bit not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username nvarchar(max) not null, active bit not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously From dfe6220d52770fa5ad1567a43d45578bb3a3ee43 Mon Sep 17 00:00:00 2001 From: Sudqi Jawabreh Date: Sat, 10 Apr 2021 18:08:17 +0300 Subject: [PATCH 05/18] Remove sql client error in Test file --- tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs | 25 ++++++++++++----------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs b/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs index 6cd1883..e3fdd79 100644 --- a/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs +++ b/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs @@ -462,7 +462,7 @@ let tests = let databaseMetadata = InformationSchema.getDbSchemaLookups db.ConnectionString let userColumns = - databaseMetadata.Schemas.["public"].Tables + databaseMetadata.Schemas.["dbo"].Tables |> Seq.tryFind (fun pair -> pair.Key.Name = "users") |> Option.map (fun pair -> pair.Value) |> Option.map List.ofSeq @@ -487,7 +487,7 @@ let tests = let databaseMetadata = InformationSchema.getDbSchemaLookups db.ConnectionString let userColumns = - databaseMetadata.Schemas.["public"].Tables + databaseMetadata.Schemas.["dbo"].Tables |> Seq.tryFind (fun pair -> pair.Key.Name = "users") |> Option.map (fun pair -> pair.Value) |> Option.map List.ofSeq @@ -573,11 +573,12 @@ let tests = use db = createTestDatabase() let createFuncQuery = """ - CREATE FUNCTION Increment(val integer) RETURNS integer AS $$ + CREATE FUNCTION Increment (@val int) + RETURNS int + AS BEGIN - RETURN val + 1; - END; $$ - LANGUAGE PLPGSQL; + RETURN @val +1; + END; """ Sql.connect db.ConnectionString @@ -588,7 +589,7 @@ let tests = |> raiseWhenFailed let databaseMetadata = InformationSchema.getDbSchemaLookups db.ConnectionString - let query = "SELECT Increment(@Input)" + let query = "SELECT dbo.Increment(@Input)" let resultSetMetadata = SqlAnalysis.extractParametersAndOutputColumns(db.ConnectionString, query, databaseMetadata) match resultSetMetadata with | Result.Error errorMsg -> @@ -728,11 +729,11 @@ let tests = failwith "Expected only one error message" } - test "SQL query semantic analysis: type mismatch when using uuid[]" { + test "SQL query semantic analysis: type mismatch when using uniqueidentitfier"{ use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, codes uuid[] not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, codes uniqueidentifier not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -808,7 +809,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username nvarchar(max) not null, active boolean not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username nvarchar(max) not null, active bit not null)" |> Sql.executeNonQuery |> ignore @@ -885,7 +886,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id int identity(1,1) primary key, username nvarchar(max not null)" + |> Sql.query "CREATE TABLE users (user_id int identity(1,1) primary key, username nvarchar(max) not null)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously @@ -919,7 +920,7 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id int identity(1,1) primary key, username nvarchar(max) not null, last_login timestamptz)" + |> Sql.query "CREATE TABLE users (user_id int identity(1,1) primary key, username nvarchar(max) not null, last_login timestamp)" |> Sql.executeNonQueryAsync |> Async.AwaitTask |> Async.RunSynchronously From 53ae2b0809000186dec745946a1b4869323025b0 Mon Sep 17 00:00:00 2001 From: Sudqi Jawabreh Date: Sat, 10 Apr 2021 18:14:55 +0300 Subject: [PATCH 06/18] Fixing some unit tests --- paket.dependencies | 7 ------- .../InformationSchema.fs | 1 - src/NpgsqlFSharpAnalyzer.Core/SqlAnalysis.fs | 3 +++ src/NpgsqlFSharpVs/NpgsqlFSharpVs.csproj | 20 +++++++++++++++++++ tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs | 6 +++--- 5 files changed, 26 insertions(+), 11 deletions(-) diff --git a/paket.dependencies b/paket.dependencies index 90376ae..a031db5 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -11,16 +11,9 @@ nuget Microsoft.NET.Test.Sdk 15.7.2 nuget altcover ~> 6 nuget FSharp.Analyzers.SDK 0.8.0 nuget Npgsql -nuget ThrowawayDb.Postgres -<<<<<<< HEAD -nuget Npgsql.FSharp ~> 4.0 -||||||| parent of 645c934 (Use DustyTables and Throwaway instead of postgres packages) -nuget Npgsql.FSharp -======= nuget Npgsql.FSharp nuget ThrowawayDb nuget DustyTables ->>>>>>> 645c934 (Use DustyTables and Throwaway instead of postgres packages) nuget F23.StringSimilarity // [ FAKE GROUP ] diff --git a/src/NpgsqlFSharpAnalyzer.Core/InformationSchema.fs b/src/NpgsqlFSharpAnalyzer.Core/InformationSchema.fs index 815baea..eecc252 100644 --- a/src/NpgsqlFSharpAnalyzer.Core/InformationSchema.fs +++ b/src/NpgsqlFSharpAnalyzer.Core/InformationSchema.fs @@ -83,7 +83,6 @@ module RewriteSqlUsingParser = let unboundVars, parseErrors = getVariables tsql if parseErrors.Count = 0 then - printf "no error found parsing" let newTsql = (ReWriteSqlStatementToEnableMoreThanOneParameterDeclaration tsql unboundVars) cmd.Parameters.["@tsql"].Value <- newTsql let altered = ParseParameterInfo cmd diff --git a/src/NpgsqlFSharpAnalyzer.Core/SqlAnalysis.fs b/src/NpgsqlFSharpAnalyzer.Core/SqlAnalysis.fs index 6f536b7..473e5c4 100644 --- a/src/NpgsqlFSharpAnalyzer.Core/SqlAnalysis.fs +++ b/src/NpgsqlFSharpAnalyzer.Core/SqlAnalysis.fs @@ -6,6 +6,7 @@ open F23.StringSimilarity open NpgsqlFSharpParser open InformationSchema open Npgsql +open System.Data.SqlClient module SqlAnalysis = @@ -419,6 +420,8 @@ module SqlAnalysis = | :? PostgresException as databaseError -> // errors such as syntax errors are reported here Result.Error (sprintf "%s: %s" databaseError.Severity databaseError.MessageText) + | :? SqlException as sqlexcpetion -> + Result.Error (sprintf "%s" (sqlexcpetion.Message.Replace("The batch could not be analyzed because of compile errors.",String.Empty))) | error -> // any other generic error Result.Error (sprintf "%s\n%s" error.Message error.StackTrace) diff --git a/src/NpgsqlFSharpVs/NpgsqlFSharpVs.csproj b/src/NpgsqlFSharpVs/NpgsqlFSharpVs.csproj index b047627..b88f43f 100644 --- a/src/NpgsqlFSharpVs/NpgsqlFSharpVs.csproj +++ b/src/NpgsqlFSharpVs/NpgsqlFSharpVs.csproj @@ -159,4 +159,24 @@ + + + + + ..\..\..\..\.nuget\packages\fsharp.core\4.7.2\lib\net45\FSharp.Core.dll + True + True + + + + + + + ..\..\..\..\.nuget\packages\fsharp.core\4.7.2\lib\netstandard2.0\FSharp.Core.dll + True + True + + + + \ No newline at end of file diff --git a/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs b/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs index e3fdd79..df269f5 100644 --- a/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs +++ b/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs @@ -498,7 +498,7 @@ let tests = | Some columns -> Expect.equal 2 (List.length columns) "There are three columns" let rolesColumn = columns |> List.find (fun column -> column.Name = "roles") - Expect.equal rolesColumn.DataType.Name "text" "The data type is text" + Expect.equal rolesColumn.DataType.Name "nvarchar" "The data type is text" Expect.isTrue rolesColumn.DataType.IsArray "The data type is an array" Expect.isFalse rolesColumn.Nullable "The column is not nullable" } @@ -596,9 +596,9 @@ let tests = failwithf "Could not analyse result set metadata %s" errorMsg | Result.Ok (parameters, outputColumns, _) -> Expect.equal 1 parameters.Length "Query has one parameter" - Expect.equal "integer" parameters.[0].DataType.Name "The parameter is int4" + Expect.equal "int" parameters.[0].DataType.Name "The parameter is int4" Expect.equal 1 outputColumns.Length "There is one column returned" - Expect.equal "integer" outputColumns.[0].DataType.Name "The output type is int4" + Expect.equal "int" outputColumns.[0].DataType.Name "The output type is int4" } test "SQL query semantic analysis: missing column" { From 753714e9b2b0eb5f6997d5672a6cdf290fc8f812 Mon Sep 17 00:00:00 2001 From: Sudqi Jawabreh Date: Sat, 10 Apr 2021 19:07:23 +0300 Subject: [PATCH 07/18] Remove "@" character from paramater names to be compatabile with parsed paramters --- src/NpgsqlFSharpAnalyzer.Core/InformationSchema.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NpgsqlFSharpAnalyzer.Core/InformationSchema.fs b/src/NpgsqlFSharpAnalyzer.Core/InformationSchema.fs index eecc252..fbaa8bb 100644 --- a/src/NpgsqlFSharpAnalyzer.Core/InformationSchema.fs +++ b/src/NpgsqlFSharpAnalyzer.Core/InformationSchema.fs @@ -347,7 +347,7 @@ module InformationSchema = let typeName = if found then typeName1 else typeName2 { - Name = name + Name = name.Replace("@","") Direction = getDirection suggested_is_output suggested_is_input MaxLength = max_length Precision = precision From d9a8a38abd3eccf6cf4a95f5967d0200c6070997 Mon Sep 17 00:00:00 2001 From: Sudqi Jawabreh Date: Sat, 10 Apr 2021 19:33:14 +0300 Subject: [PATCH 08/18] Fix semanticAnalysis-missingParameter code because missing column test expects one warning message --- tests/examples/hashing/semanticAnalysis-missingParameter.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/examples/hashing/semanticAnalysis-missingParameter.fs b/tests/examples/hashing/semanticAnalysis-missingParameter.fs index a6b3eb8..4240a68 100644 --- a/tests/examples/hashing/semanticAnalysis-missingParameter.fs +++ b/tests/examples/hashing/semanticAnalysis-missingParameter.fs @@ -10,7 +10,7 @@ let findUsers() = |> Sql.query "SELECT * FROM users WHERE user_id = @user_id AND active = @active" |> Sql.parameters [ "user_id", Sql.int64 42L ] |> Sql.executeAsync (fun read -> - let userId = read.int "user_id" + let userId = read.int64 "user_id" let username = read.text "username" let active = read.bool "active" (userId, username, active)) From f9093ca1349d6aa61e573b5d216ae864b35ed081 Mon Sep 17 00:00:00 2001 From: Sudqi Jawabreh Date: Sat, 10 Apr 2021 19:36:10 +0300 Subject: [PATCH 09/18] Fix semanticAnalysis-typeMistmatch code because missing column test expects one warning message --- tests/examples/hashing/semanticAnalysis-typeMismatch.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/examples/hashing/semanticAnalysis-typeMismatch.fs b/tests/examples/hashing/semanticAnalysis-typeMismatch.fs index abc2bf0..cdb44e3 100644 --- a/tests/examples/hashing/semanticAnalysis-typeMismatch.fs +++ b/tests/examples/hashing/semanticAnalysis-typeMismatch.fs @@ -9,7 +9,7 @@ let findUsers() = |> Sql.connect |> Sql.query "SELECT * FROM users" |> Sql.executeAsync (fun read -> - let user_id = read.int "user_id" + let user_id = read.int64 "user_id" let username = read.text "username" // Sql.readInt should be Sql.readBool let active = read.int "active" From 4d1744e62659a0e08cbcf783b820b39cb2dba225 Mon Sep 17 00:00:00 2001 From: Sudqi Jawabreh Date: Sat, 10 Apr 2021 19:41:02 +0300 Subject: [PATCH 10/18] Remove Returning from update statement because it is not needed and not supported in tsql --- tests/examples/hashing/updateQueryWithParametersInAssignments.fs | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/examples/hashing/updateQueryWithParametersInAssignments.fs b/tests/examples/hashing/updateQueryWithParametersInAssignments.fs index 6c0b99d..00d57a5 100644 --- a/tests/examples/hashing/updateQueryWithParametersInAssignments.fs +++ b/tests/examples/hashing/updateQueryWithParametersInAssignments.fs @@ -7,7 +7,6 @@ let [] updateUsernameQuery = """ UPDATE users SET username = @username, last_login = @last_login WHERE user_id = @user_id - RETURNING * """ let usersAndTheirRoles connectionString = From e1be54f09e721f7a1d62f4849fbf5d825fbfedbb Mon Sep 17 00:00:00 2001 From: Sudqi Jawabreh Date: Sun, 11 Apr 2021 06:13:43 +0300 Subject: [PATCH 11/18] order unbound vars in ReWriteSqlStatementToEnableMoreThanOneParameterDeclaration to fix adjustment issue an issue appears when a var is replaced then another far behind it is replaced doesn't work fine with the adjustment --- .../InformationSchema.fs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/NpgsqlFSharpAnalyzer.Core/InformationSchema.fs b/src/NpgsqlFSharpAnalyzer.Core/InformationSchema.fs index fbaa8bb..d1d8c74 100644 --- a/src/NpgsqlFSharpAnalyzer.Core/InformationSchema.fs +++ b/src/NpgsqlFSharpAnalyzer.Core/InformationSchema.fs @@ -66,13 +66,15 @@ module RewriteSqlUsingParser = let ReWriteSqlStatementToEnableMoreThanOneParameterDeclaration (query:string) (unboundVars:Generic.IDictionary>) = let mutable tsql = query let mutable startAdjustment = 0 - for xs in unboundVars.Values do - for newName, start, len in xs do - let before = tsql - let start = start + startAdjustment - let after = before.Remove(start, len).Insert(start, newName) - tsql <- after - startAdjustment <- startAdjustment + (after.Length - before.Length) + // order vars according to position so adjustment works well + let orderdVars = unboundVars.Values |> List |> Seq.collect id |> Seq.sortBy (fun (newName, start, len) -> start) + + for newName, start, len in orderdVars do + let before = tsql + let start = start + startAdjustment + let after = before.Remove(start, len).Insert(start, newName) + tsql <- after + startAdjustment <- startAdjustment + (after.Length - before.Length) tsql From 62068d6a2bcb5abd0f625e3482ee7950603abe1e Mon Sep 17 00:00:00 2001 From: Sudqi Jawabreh Date: Sun, 11 Apr 2021 06:20:32 +0300 Subject: [PATCH 12/18] Fix test type mismatch with comparing against non-nullable column during UPDATE --- src/NpgsqlFSharpAnalyzer.Core/SqlAnalysis.fs | 4 ++-- .../hashing/updateQueryWithParametersInAssignments.fs | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/NpgsqlFSharpAnalyzer.Core/SqlAnalysis.fs b/src/NpgsqlFSharpAnalyzer.Core/SqlAnalysis.fs index 473e5c4..5df5355 100644 --- a/src/NpgsqlFSharpAnalyzer.Core/SqlAnalysis.fs +++ b/src/NpgsqlFSharpAnalyzer.Core/SqlAnalysis.fs @@ -684,7 +684,7 @@ module SqlAnalysis = if providedParam.paramFunc <> "Sql.jsonb" then yield typeMismatch [ "Sql.jsonb" ] - | ("text"|"json"|"xml") -> + | ("text"|"json"|"xml"|"nvarchar"|"varchar") -> 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" ] @@ -811,7 +811,7 @@ module SqlAnalysis = yield typeMismatch [ "Sql.readBool" ] | ("text"|"json"|"xml"|"jsonb") when attempt.funcName <> "Sql.readString" -> yield typeMismatch [ "Sql.readString" ] - | ("character varying"|"character"|"char"|"varchar"|"citext") when attempt.funcName <> "Sql.readString" -> + | ("character varying"|"character"|"char"|"nvarchar"|"varchar"|"citext") when attempt.funcName <> "Sql.readString" -> yield typeMismatch [ "Sql.readString" ] | ("int" | "int2" | "int4" | "smallint" | "integer") when attempt.funcName <> "Sql.readInt" -> yield typeMismatch [ "Sql.readInt" ] diff --git a/tests/examples/hashing/updateQueryWithParametersInAssignments.fs b/tests/examples/hashing/updateQueryWithParametersInAssignments.fs index 00d57a5..b8daf33 100644 --- a/tests/examples/hashing/updateQueryWithParametersInAssignments.fs +++ b/tests/examples/hashing/updateQueryWithParametersInAssignments.fs @@ -5,7 +5,7 @@ open System let [] updateUsernameQuery = """ UPDATE users - SET username = @username, last_login = @last_login + SET username = @username WHERE user_id = @user_id """ @@ -16,6 +16,5 @@ let usersAndTheirRoles connectionString = |> Sql.parameters [ "@user_id", Sql.intOrNone (Some 10) "@username", Sql.textOrNone (Some "John") - "@last_login", Sql.timestamptz DateTime.Now ] - |> Sql.execute (fun read -> read.int "user_id") + |> Sql.executeNonQuery From eb70eef0c3412c4990ec252242c0bd037b5bec1a Mon Sep 17 00:00:00 2001 From: Sudqi Jawabreh Date: Sun, 11 Apr 2021 06:57:23 +0300 Subject: [PATCH 13/18] Fix column type name when extracting output columns --- src/NpgsqlFSharpAnalyzer.Core/InformationSchema.fs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/NpgsqlFSharpAnalyzer.Core/InformationSchema.fs b/src/NpgsqlFSharpAnalyzer.Core/InformationSchema.fs index d1d8c74..74a7e6b 100644 --- a/src/NpgsqlFSharpAnalyzer.Core/InformationSchema.fs +++ b/src/NpgsqlFSharpAnalyzer.Core/InformationSchema.fs @@ -296,7 +296,12 @@ module InformationSchema = let resultColumn = string row.["name"] let typeid = unbox row.["system_type_id"] let userTypeId = row.GetValueOrDefault("user_type_id",0) - let found, typeName = typeIdName.TryGetValue((typeid,userTypeId)) + + // some times user type Id is returned as null + let found,typeName1 = typeIdName.TryGetValue ((typeid,userTypeId)) + let _,typeName2 = typeIdName.TryGetValue ((typeid,typeid)) + let typeName = if found then typeName1 else typeName2 + if table <> "" && schema <> "" && sourceColumn <> "" then let lookup = {SchemaName = schema; TableName = table; ColumnName = sourceColumn} yield { dbSchemaLookups.Columns.[lookup] with Name = resultColumn } From eb9dc7a8f260ae9f4a58fd9c231aa1778c7f70ed Mon Sep 17 00:00:00 2001 From: Sudqi Jawabreh Date: Sun, 11 Apr 2021 06:58:35 +0300 Subject: [PATCH 14/18] Bit is the same as as boolean in tsql when providing parameters --- src/NpgsqlFSharpAnalyzer.Core/SqlAnalysis.fs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/NpgsqlFSharpAnalyzer.Core/SqlAnalysis.fs b/src/NpgsqlFSharpAnalyzer.Core/SqlAnalysis.fs index 5df5355..eea275b 100644 --- a/src/NpgsqlFSharpAnalyzer.Core/SqlAnalysis.fs +++ b/src/NpgsqlFSharpAnalyzer.Core/SqlAnalysis.fs @@ -580,15 +580,7 @@ module SqlAnalysis = () else if not requiredParam.DataType.IsArray then match requiredParam.DataType.Name with - | "bit" -> - 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") -> + | ("bool" | "boolean" | "bit") -> 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" ] @@ -913,7 +905,7 @@ module SqlAnalysis = else yield typeMismatch [ replace "double" ] else () - | ("text"|"json"|"xml"|"jsonb"|"varchar") -> + | ("text"|"json"|"xml"|"jsonb"|"varchar"|"nvarchar") -> if column.Nullable && notUsing "textOrNone" && notUsing "stringOrNone" then yield typeMismatch [ replace "textOrNone"; replace "stringOrNone" ] else if notUsing "textOrNone" && notUsing "text" && notUsing "string" && notUsing "stringOrNone" From 1ded3f4db06e5ec3f95cc92f1474c7c214df189d Mon Sep 17 00:00:00 2001 From: Sudqi Jawabreh Date: Sun, 11 Apr 2021 06:59:03 +0300 Subject: [PATCH 15/18] Fix insert queries in tests --- tests/examples/hashing/executingQueryInsteadOfNonQuery.fs | 2 +- tests/examples/hashing/insertQueryWithNonNullableParameter.fs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/examples/hashing/executingQueryInsteadOfNonQuery.fs b/tests/examples/hashing/executingQueryInsteadOfNonQuery.fs index 7cf4766..bf33ea7 100644 --- a/tests/examples/hashing/executingQueryInsteadOfNonQuery.fs +++ b/tests/examples/hashing/executingQueryInsteadOfNonQuery.fs @@ -5,5 +5,5 @@ open Npgsql.FSharp let findRoles connection = connection |> Sql.query "INSERT INTO users (username, roles) VALUES (@username, @roles)" - |> Sql.parameters [ "@username", Sql.string "Hello"; "@roles", Sql.stringArray [| |] ] + |> Sql.parameters [ "@username", Sql.string "Hello"; "@roles", Sql.string "rolesValue" ] |> Sql.execute (fun read -> read.stringArray "roles") diff --git a/tests/examples/hashing/insertQueryWithNonNullableParameter.fs b/tests/examples/hashing/insertQueryWithNonNullableParameter.fs index 747cc1d..295688b 100644 --- a/tests/examples/hashing/insertQueryWithNonNullableParameter.fs +++ b/tests/examples/hashing/insertQueryWithNonNullableParameter.fs @@ -4,6 +4,6 @@ open Npgsql.FSharp let findUsers connection = connection - |> Sql.query "INSERT INTO users (username, active) VALUES (@username, @active) RETURNING *" + |> Sql.query "INSERT INTO users (username, active) VALUES (@username, @active)" |> Sql.parameters [ "@username", Sql.dbnull; "@active", Sql.bool true ] - |> Sql.execute (fun read -> read.text "username") + |> Sql.executeNonQuery From 4411fd7ed051b0b620fb3f72f152c2792027bbc9 Mon Sep 17 00:00:00 2001 From: Sudqi Jawabreh Date: Sun, 11 Apr 2021 07:43:52 +0300 Subject: [PATCH 16/18] Use output instead of Return --- tests/examples/hashing/insertQueryWithNonNullableParameter.fs | 4 ++-- .../hashing/updateQueryWithParametersInAssignments.fs | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/examples/hashing/insertQueryWithNonNullableParameter.fs b/tests/examples/hashing/insertQueryWithNonNullableParameter.fs index 295688b..a17db0f 100644 --- a/tests/examples/hashing/insertQueryWithNonNullableParameter.fs +++ b/tests/examples/hashing/insertQueryWithNonNullableParameter.fs @@ -4,6 +4,6 @@ open Npgsql.FSharp let findUsers connection = connection - |> Sql.query "INSERT INTO users (username, active) VALUES (@username, @active)" + |> Sql.query "INSERT INTO users (username, active) OUTPUT inserted.username VALUES (@username, @active) " |> Sql.parameters [ "@username", Sql.dbnull; "@active", Sql.bool true ] - |> Sql.executeNonQuery + |> Sql.execute (fun read -> read.text "username") diff --git a/tests/examples/hashing/updateQueryWithParametersInAssignments.fs b/tests/examples/hashing/updateQueryWithParametersInAssignments.fs index b8daf33..73f7f85 100644 --- a/tests/examples/hashing/updateQueryWithParametersInAssignments.fs +++ b/tests/examples/hashing/updateQueryWithParametersInAssignments.fs @@ -6,6 +6,7 @@ open System let [] updateUsernameQuery = """ UPDATE users SET username = @username + OUTPUT inserted.user_id WHERE user_id = @user_id """ @@ -17,4 +18,4 @@ let usersAndTheirRoles connectionString = "@user_id", Sql.intOrNone (Some 10) "@username", Sql.textOrNone (Some "John") ] - |> Sql.executeNonQuery + |> Sql.execute (fun read -> read.int "user_id") From c4356f0a5c9545c3fc41121a6e07eaebcb98e878 Mon Sep 17 00:00:00 2001 From: Sudqi Jawabreh Date: Sun, 11 Apr 2021 07:48:10 +0300 Subject: [PATCH 17/18] Remove array tests --- tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs | 79 ----------------------- 1 file changed, 79 deletions(-) diff --git a/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs b/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs index df269f5..a34deed 100644 --- a/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs +++ b/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs @@ -499,7 +499,6 @@ let tests = Expect.equal 2 (List.length columns) "There are three columns" let rolesColumn = columns |> List.find (fun column -> column.Name = "roles") Expect.equal rolesColumn.DataType.Name "nvarchar" "The data type is text" - Expect.isTrue rolesColumn.DataType.IsArray "The data type is an array" Expect.isFalse rolesColumn.Nullable "The column is not nullable" } @@ -703,84 +702,6 @@ let tests = failwith "Expected only one error message" } - test "SQL query semantic analysis: type mismatch when using text[]" { - use db = createTestDatabase() - - Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, roles nvarchar(max) not null)" - |> Sql.executeNonQueryAsync - |> Async.AwaitTask - |> Async.RunSynchronously - |> raiseWhenFailed - - match context (find "../examples/hashing/readingTextArray.fs") with - | None -> failwith "Could not crack project" - | Some context -> - match SqlAnalysis.databaseSchema db.ConnectionString with - | Result.Error connectionError -> - failwith connectionError - | Result.Ok schema -> - let operation = List.exactlyOne (SyntacticAnalysis.findSqlOperations context) - let messages = SqlAnalysis.analyzeOperation operation db.ConnectionString schema - match messages with - | [ message ] -> - Expect.stringContains message.Message "Please use read.stringArray instead" "Message contains suggestion to use Sql.stringArray" - | _ -> - failwith "Expected only one error message" - } - - test "SQL query semantic analysis: type mismatch when using uniqueidentitfier"{ - use db = createTestDatabase() - - Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, codes uniqueidentifier not null)" - |> Sql.executeNonQueryAsync - |> Async.AwaitTask - |> Async.RunSynchronously - |> raiseWhenFailed - - match context (find "../examples/hashing/readingUuidArray.fs") with - | None -> failwith "Could not crack project" - | Some context -> - match SqlAnalysis.databaseSchema db.ConnectionString with - | Result.Error connectionError -> - failwith connectionError - | Result.Ok schema -> - let operation = List.exactlyOne (SyntacticAnalysis.findSqlOperations context) - let messages = SqlAnalysis.analyzeOperation operation db.ConnectionString schema - match messages with - | [ message ] -> - Expect.stringContains message.Message "Please use read.uuidArray instead" "Message contains suggestion to use Sql.stringArray" - | _ -> - failwith "Expected only one error message" - } - - test "SQL query semantic analysis: type mismatch when using int[] as parameter" { - use db = createTestDatabase() - - Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) primary key, username nvarchar(max))" - |> Sql.executeNonQueryAsync - |> Async.AwaitTask - |> Async.RunSynchronously - |> raiseWhenFailed - - match context (find "../examples/hashing/usingIntArrayParameter.fs") with - | None -> failwith "Could not crack project" - | Some context -> - match SqlAnalysis.databaseSchema db.ConnectionString with - | Result.Error connectionError -> - failwith connectionError - | Result.Ok schema -> - let operation = List.exactlyOne (SyntacticAnalysis.findSqlOperations context) - let messages = SqlAnalysis.analyzeOperation operation db.ConnectionString schema - match messages with - | [ message ] -> - Expect.stringContains message.Message "Sql.intArray" "Message contains suggestion to use Sql.stringArray" - | _ -> - failwith "Expected only one error message" - } - test "SQL query semantic analysis: detect incorrectly used Sql.execute where as Sql.executeNonQuery was needed" { use db = createTestDatabase() From f246511b36d76484d310d7e430a189cddcafedfe Mon Sep 17 00:00:00 2001 From: Sudqi Jawabreh Date: Mon, 9 Aug 2021 12:18:16 +0300 Subject: [PATCH 18/18] Port some tests to work on MS SQL --- tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs | 24 ++++++++++--------- .../castingNonNullableStaysNonNullable.fs | 6 ++--- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs b/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs index a34deed..163c605 100644 --- a/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs +++ b/tests/NpgsqlFSharpAnalyzer.Tests/Tests.fs @@ -74,9 +74,9 @@ let tests = use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE EXTENSION IF NOT EXISTS citext;CREATE SCHEMA test; CREATE TABLE test.articles (id BIGINT PRIMARY KEY NOT NULL,art_name CITEXT UNIQUE NOT NULL, stock BIGINT NOT NULL);" + |> Sql.query "CREATE SCHEMA test CREATE TABLE test.articles (id BIGINT PRIMARY KEY NOT NULL,art_name TEXT NOT NULL, stock BIGINT NOT NULL);" |> Sql.executeNonQuery - |> raiseWhenFailed + |> ignore match context (find "../examples/hashing/MultipleNestedModules.fs") with | None -> failwith "Could not crack project" @@ -89,16 +89,16 @@ let tests = | Result.Ok schema -> let errors = SqlAnalysis.analyzeOperation operations.[0] db.ConnectionString schema Expect.equal 1 errors.Length "There should be one error message" - Expect.stringContains errors.[0].Message "column \"x\" does not exist" "There should be an error message" + Expect.stringContains errors.[0].Message "Invalid column name 'x'" "There should be an error message" } test "Semantic analysis using FSX: finding SQL blocks in multiple nested modules which query a non-public schema" { use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE EXTENSION IF NOT EXISTS citext;CREATE SCHEMA test; CREATE TABLE test.articles (id BIGINT PRIMARY KEY NOT NULL,art_name CITEXT UNIQUE NOT NULL, stock BIGINT NOT NULL);" + |> Sql.query "CREATE SCHEMA test CREATE TABLE test.articles (id BIGINT PRIMARY KEY NOT NULL,art_name TEXT NOT NULL, stock BIGINT NOT NULL);" |> Sql.executeNonQuery - |> raiseWhenFailed + |> ignore match context (find "../examples/hashing/MultipleNestedModules.fsx") with | None -> failwith "Could not crack project" @@ -111,7 +111,7 @@ let tests = | Result.Ok schema -> let errors = SqlAnalysis.analyzeOperation operations.[0] db.ConnectionString schema Expect.equal 1 errors.Length "There should be one error message" - Expect.stringContains errors.[0].Message "column \"x\" does not exist" "There should be an error message" + Expect.stringContains errors.[0].Message "Invalid column name 'x'" "There should be an error message" } test "Syntactic analysis: SQL block found from top-level expression in module" { @@ -337,13 +337,14 @@ let tests = Expect.isEmpty messages "No errors returned" } - test "Semantic analysis: casting non-nullable columns stays non-nullable" { + // https://sqlsunday.com/2019/06/05/cast-convert-makes-expressions-nullable/ + test "Semantic analysis: casting non-nullable columns doesn't stay non-nullable in MS SQL" { use db = createTestDatabase() Sql.connect db.ConnectionString - |> Sql.query "CREATE TABLE users (user_id bigserial primary key, username text not null)" + |> Sql.query "CREATE TABLE users (user_id bigint identity(1,1) NOT NULL primary key, username text not null)" |> Sql.executeNonQuery - |> raiseWhenFailed + |> ignore match context (find "../examples/hashing/castingNonNullableStaysNonNullable.fs") with | None -> failwith "Could not crack project" @@ -354,7 +355,7 @@ let tests = | Result.Ok schema -> let blocks = SyntacticAnalysis.findSqlOperations context let messages = blocks |> List.collect (fun block -> SqlAnalysis.analyzeOperation block db.ConnectionString schema) - Expect.isEmpty messages "No errors returned" + Expect.equal 3 messages.Length "Three errors returned" } test "Semantic analysis: incorrect queries in executeTransaction are detected" { @@ -502,7 +503,8 @@ let tests = Expect.isFalse rolesColumn.Nullable "The column is not nullable" } - test "SQL schema analysis with user defined arrays" { + // skip this test + ptest "SQL schema analysis with user defined arrays" { use db = createTestDatabase () Sql.connect db.ConnectionString diff --git a/tests/examples/hashing/castingNonNullableStaysNonNullable.fs b/tests/examples/hashing/castingNonNullableStaysNonNullable.fs index 49ddd41..79a3b79 100644 --- a/tests/examples/hashing/castingNonNullableStaysNonNullable.fs +++ b/tests/examples/hashing/castingNonNullableStaysNonNullable.fs @@ -5,17 +5,17 @@ open Npgsql.FSharp let userIds connection = connection |> Sql.connect - |> Sql.query "SELECT user_id::text AS useridtext FROM users" + |> Sql.query "SELECT CAST(user_id as nvarchar) AS useridtext FROM users" |> Sql.execute (fun read -> read.text "useridtext") let moreIds connection = connection |> Sql.connect - |> Sql.query "SELECT user_id::text as useridtext FROM users" + |> Sql.query "SELECT CAST (user_id as nvarchar) as useridtext FROM users" |> Sql.execute (fun read -> read.text "useridtext") let withoutAlias connection = connection |> Sql.connect - |> Sql.query "SELECT user_id::text FROM users" + |> Sql.query "SELECT CAST (user_id as nvarchar) FROM users" |> Sql.execute (fun read -> read.text "user_id")