bugfix

Author: starlying

src/Datory/Database.cs

@@ -254,7 +254,9 @@ public async Task CreateTableAsync(string tableName, IEnumerable<TableColumn> ta
         {
             var sqlBuilder = new StringBuilder();
 
-            sqlBuilder.Append($@"CREATE TABLE {GetQuotedIdentifier(tableName)} (").AppendLine();
+            tableName = GetQuotedIdentifier(Utilities.FilterSql(tableName));
+
+            sqlBuilder.Append($@"CREATE TABLE {tableName} (").AppendLine();
 
             var primaryKeyColumns = new List<TableColumn>();
             TableColumn identityColumn = null;
@@ -353,8 +355,8 @@ public async Task CreateIndexAsync(string tableName, string indexName, params st
         {
             if (columns == null || columns.Length == 0) return;
 
-            var fullTableName = GetQuotedIdentifier(tableName);
-            var fullIndexName = GetQuotedIdentifier(indexName);
+            var fullTableName = GetQuotedIdentifier(Utilities.FilterSql(tableName));
+            var fullIndexName = GetQuotedIdentifier(Utilities.FilterSql(indexName));
             var sqlString = new StringBuilder($@"CREATE INDEX {fullIndexName} ON {fullTableName}(");
 
             foreach (var column in columns)
@@ -470,7 +472,8 @@ public async Task<List<TableColumn>> GetTableColumnsAsync(string tableName)
         public async Task DropTableAsync(string tableName)
         {
             using var connection = GetConnection();
-            await connection.ExecuteAsync($"DROP TABLE {GetQuotedIdentifier(tableName)}");
+            tableName = GetQuotedIdentifier(Utilities.FilterSql(tableName));
+            await connection.ExecuteAsync($"DROP TABLE {tableName}");
         }
 
         public async Task<List<string>> GetDatabaseNamesAsync()

src/Datory/DatabaseImpl/DmImpl.cs

@@ -184,8 +184,8 @@ private DataType ToDataType(string dataTypeStr)
         public async Task<List<TableColumn>> GetTableColumnsAsync(string connectionString, string tableName)
         {
             var list = new List<TableColumn>();
-
             var owner = Utilities.GetConnectionStringDatabase(connectionString);
+            tableName = Utilities.FilterSql(tableName);
 
             using (var connection = new DmConnection(connectionString))
             {
@@ -243,7 +243,8 @@ public async Task<List<TableColumn>> GetTableColumnsAsync(string connectionStrin
 
         public string GetAddColumnsSqlString(string tableName, string columnsSqlString)
         {
-            return $"ALTER TABLE {GetQuotedIdentifier(tableName)} ADD ({columnsSqlString})";
+            tableName = GetQuotedIdentifier(Utilities.FilterSql(tableName));
+            return $"ALTER TABLE {tableName} ADD ({columnsSqlString})";
         }
     }
 }

src/Datory/DatabaseImpl/MySqlImpl.cs

@@ -185,6 +185,7 @@ private DataType ToDataType(string dataTypeStr)
         public async Task<List<TableColumn>> GetTableColumnsAsync(string connectionString, string tableName)
         {
             var list = new List<TableColumn>();
+            tableName = Utilities.FilterSql(tableName);
 
             using (var connection = new MySqlConnection(connectionString))
             {
@@ -242,7 +243,8 @@ public async Task<List<TableColumn>> GetTableColumnsAsync(string connectionStrin
 
         public string GetAddColumnsSqlString(string tableName, string columnsSqlString)
         {
-            return $"ALTER TABLE {GetQuotedIdentifier(tableName)} ADD ({columnsSqlString})";
+            tableName = GetQuotedIdentifier(Utilities.FilterSql(tableName));
+            return $"ALTER TABLE {tableName} ADD ({columnsSqlString})";
         }
     }
 }

src/Datory/DatabaseImpl/PostgreSqlImpl.cs

@@ -172,6 +172,7 @@ private DataType ToDataType(string dataTypeStr)
         public async Task<List<TableColumn>> GetTableColumnsAsync(string connectionString, string tableName)
         {
             var list = new List<TableColumn>();
+            tableName = Utilities.FilterSql(tableName);
 
             using (var connection = GetConnection(connectionString))
             {
@@ -235,7 +236,8 @@ public async Task<List<TableColumn>> GetTableColumnsAsync(string connectionStrin
 
         public string GetAddColumnsSqlString(string tableName, string columnsSqlString)
         {
-            return $"ALTER TABLE {GetQuotedIdentifier(tableName)} ADD {columnsSqlString}";
+            tableName = GetQuotedIdentifier(Utilities.FilterSql(tableName));
+            return $"ALTER TABLE {tableName} ADD {columnsSqlString}";
         }
     }
 }

src/Datory/DatabaseImpl/SQLiteImpl.cs

@@ -162,6 +162,7 @@ private int ToLength(string dataTypeStr)
         public async Task<List<TableColumn>> GetTableColumnsAsync(string connectionString, string tableName)
         {
             var list = new List<TableColumn>();
+            tableName = Utilities.FilterSql(tableName);
 
             using (var connection = new SQLiteConnection(connectionString))
             {
@@ -195,7 +196,8 @@ public async Task<List<TableColumn>> GetTableColumnsAsync(string connectionStrin
 
         public string GetAddColumnsSqlString(string tableName, string columnsSqlString)
         {
-            return $"ALTER TABLE {GetQuotedIdentifier(tableName)} ADD " + columnsSqlString;
+            tableName = GetQuotedIdentifier(Utilities.FilterSql(tableName));
+            return $"ALTER TABLE {tableName} ADD " + columnsSqlString;
         }
     }
 }

src/Datory/DatabaseImpl/SqlServerImpl.cs

@@ -220,6 +220,7 @@ private DataType ToDataType(string dataTypeStr, string dataLength)
         public async Task<List<TableColumn>> GetTableColumnsAsync(string connectionString, string tableName)
         {
             var list = new List<TableColumn>();
+            tableName = Utilities.FilterSql(tableName);
 
             using (var connection = GetConnection(connectionString))
             {
@@ -291,7 +292,8 @@ public async Task<List<TableColumn>> GetTableColumnsAsync(string connectionStrin
 
         public string GetAddColumnsSqlString(string tableName, string columnsSqlString)
         {
-            return $"ALTER TABLE {GetQuotedIdentifier(tableName)} ADD {columnsSqlString}";
+            tableName = GetQuotedIdentifier(Utilities.FilterSql(tableName));
+            return $"ALTER TABLE {tableName} ADD {columnsSqlString}";
         }
     }
 }

src/Datory/Utils/RepositoryUtils.Insert.cs

@@ -20,6 +20,8 @@ public static async Task<int> InsertObjectAsync<T>(IDatabase database, string ta
             dataInfo.CreatedDate = DateTime.Now;
             dataInfo.LastModifiedDate = DateTime.Now;
 
+            tableName = Utilities.FilterSql(tableName);
+
             var identityInsert = false;
             if (dataInfo.Id > 0)
             {
@@ -205,6 +207,8 @@ private static string GetDateTimeSqlString(DateTime dateTime)
 
         private static async Task InsertRowsAsync(IDatabase database, string tableName, string columnNames, List<string> valuesList, DynamicParameters parameterList)
         {
+            tableName = Utilities.FilterSql(tableName);
+            
             if (database.DatabaseType == DatabaseType.SqlServer)
             {
                 var sqlStringBuilder = new StringBuilder($@"INSERT INTO {tableName} ({columnNames}) VALUES ");

src/Datory/Utils/RepositoryUtils.cs

@@ -24,6 +24,7 @@ private static async Task<CompileInfo> CompileAsync(IDatabase database, string t
             {
                 query.Method = "select";
             }
+            tableName = Utilities.FilterSql(tableName);
 
             string sql;
             Dictionary<string, object> namedBindings;

src/SSCMS/SSCMS.csproj

@@ -35,8 +35,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Datory" Version="7.2.0" />
-    <!-- <ProjectReference Include="..\Datory\Datory.csproj" /> -->
+    <!-- <PackageReference Include="Datory" Version="7.2.0" /> -->
+    <ProjectReference Include="..\Datory\Datory.csproj" />
   </ItemGroup>
 
 </Project>