From 3fe4c54ee4beb4bda9f504f07f48f7dd8926da47 Mon Sep 17 00:00:00 2001 From: 28810 <28810@YEXIANGQIN> Date: Fri, 10 Jan 2020 22:03:47 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=20DbFirst=20mysql/pgsql/?= =?UTF-8?q?sqlserver=20=E8=8E=B7=E5=8F=96=E4=B8=BB=E9=94=AE=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=9A=84=20bug=EF=BC=9B=200.10.7=20=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E5=90=8E=E7=9A=84=20bug=20#182?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Providers/FreeSql.Provider.MySql/MySqlDbFirst.cs | 2 +- Providers/FreeSql.Provider.Odbc/GBase/__OdbcGBaseDbFirst.cs | 2 +- Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlDbFirst.cs | 2 +- .../FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLDbFirst.cs | 2 +- .../FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerDbFirst.cs | 2 +- Providers/FreeSql.Provider.PostgreSQL/PostgreSQLDbFirst.cs | 2 +- Providers/FreeSql.Provider.SqlServer/SqlServerDbFirst.cs | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Providers/FreeSql.Provider.MySql/MySqlDbFirst.cs b/Providers/FreeSql.Provider.MySql/MySqlDbFirst.cs index 04feb558..e170694e 100644 --- a/Providers/FreeSql.Provider.MySql/MySqlDbFirst.cs +++ b/Providers/FreeSql.Provider.MySql/MySqlDbFirst.cs @@ -287,7 +287,7 @@ case when a.index_name = 'PRIMARY' then 1 else 0 end 'IsPrimaryKey', 0 'IsClustered', 0 'IsDesc' from information_schema.statistics a -where a.table_schema in ({1}) and {0} and a.index_name <> 'PRIMARY' +where a.table_schema in ({1}) and {0} ", loc8, databaseIn); ds = _orm.Ado.ExecuteArray(CommandType.Text, sql); if (ds == null) return loc1; diff --git a/Providers/FreeSql.Provider.Odbc/GBase/__OdbcGBaseDbFirst.cs b/Providers/FreeSql.Provider.Odbc/GBase/__OdbcGBaseDbFirst.cs index e2f10f07..245ab0cf 100644 --- a/Providers/FreeSql.Provider.Odbc/GBase/__OdbcGBaseDbFirst.cs +++ b/Providers/FreeSql.Provider.Odbc/GBase/__OdbcGBaseDbFirst.cs @@ -294,7 +294,7 @@ inner join pg_class b on b.oid = a.indexrelid inner join pg_attribute c on c.attnum > 0 and c.attrelid = b.oid inner join pg_namespace ns on ns.oid = b.relnamespace inner join pg_class d on d.oid = a.indrelid -where {loc8.ToString().Replace("a.table_name", "ns.nspname || '.' || d.relname")} and a.indisprimary = 'f' +where {loc8.ToString().Replace("a.table_name", "ns.nspname || '.' || d.relname")} "; ds = _orm.Ado.ExecuteArray(CommandType.Text, sql); if (ds == null) return loc1; diff --git a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlDbFirst.cs b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlDbFirst.cs index afd2549b..f9506697 100644 --- a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlDbFirst.cs +++ b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlDbFirst.cs @@ -257,7 +257,7 @@ case when a.index_name = 'PRIMARY' then 1 else 0 end 'IsPrimaryKey', 0 'IsClustered', 0 'IsDesc' from information_schema.statistics a -where a.table_schema in ({1}) and {0} and a.index_name <> 'PRIMARY' +where a.table_schema in ({1}) and {0} ", loc8, databaseIn); ds = _orm.Ado.ExecuteArray(CommandType.Text, sql); if (ds == null) return loc1; diff --git a/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLDbFirst.cs b/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLDbFirst.cs index d4229572..d248291e 100644 --- a/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLDbFirst.cs +++ b/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLDbFirst.cs @@ -294,7 +294,7 @@ inner join pg_class b on b.oid = a.indexrelid inner join pg_attribute c on c.attnum > 0 and c.attrelid = b.oid inner join pg_namespace ns on ns.oid = b.relnamespace inner join pg_class d on d.oid = a.indrelid -where {loc8.ToString().Replace("a.table_name", "ns.nspname || '.' || d.relname")} and a.indisprimary = 'f' +where {loc8.ToString().Replace("a.table_name", "ns.nspname || '.' || d.relname")} "; ds = _orm.Ado.ExecuteArray(CommandType.Text, sql); if (ds == null) return loc1; diff --git a/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerDbFirst.cs b/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerDbFirst.cs index 4e3652b1..5f21d5dd 100644 --- a/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerDbFirst.cs +++ b/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerDbFirst.cs @@ -305,7 +305,7 @@ select from sys.index_columns a inner join sys.indexes b on b.object_id = a.object_id and b.index_id = a.index_id left join sys.columns c on c.object_id = a.object_id and c.column_id = a.column_id -where {loc8.ToString().Replace("a.table_name", "a.object_id")} and b.is_primary_key = 0 +where {loc8.ToString().Replace("a.table_name", "a.object_id")} ; use [{olddatabase}]; "; diff --git a/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLDbFirst.cs b/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLDbFirst.cs index 5910c1d3..f10093c2 100644 --- a/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLDbFirst.cs +++ b/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLDbFirst.cs @@ -405,7 +405,7 @@ inner join pg_class b on b.oid = a.indexrelid inner join pg_attribute c on c.attnum > 0 and c.attrelid = b.oid inner join pg_namespace ns on ns.oid = b.relnamespace inner join pg_class d on d.oid = a.indrelid -where {loc8.ToString().Replace("a.table_name", "ns.nspname || '.' || d.relname")} and a.indisprimary = 'f' +where {loc8.ToString().Replace("a.table_name", "ns.nspname || '.' || d.relname")} "; ds = _orm.Ado.ExecuteArray(CommandType.Text, sql); if (ds == null) return loc1; diff --git a/Providers/FreeSql.Provider.SqlServer/SqlServerDbFirst.cs b/Providers/FreeSql.Provider.SqlServer/SqlServerDbFirst.cs index 1f709c10..31089821 100644 --- a/Providers/FreeSql.Provider.SqlServer/SqlServerDbFirst.cs +++ b/Providers/FreeSql.Provider.SqlServer/SqlServerDbFirst.cs @@ -308,7 +308,7 @@ select from sys.index_columns a inner join sys.indexes b on b.object_id = a.object_id and b.index_id = a.index_id left join sys.columns c on c.object_id = a.object_id and c.column_id = a.column_id -where {loc8.ToString().Replace("a.table_name", "a.object_id")} and b.is_primary_key = 0 +where {loc8.ToString().Replace("a.table_name", "a.object_id")} ; use [{olddatabase}]; ";