Tiger
/
TigerEmu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed Fluent NHibernate for newer MariaDB versions

fluent_nhibernate
Tiger 2023-09-23 14:45:38 +02:00
parent 4b2a01fe58
commit f4690c2dd3
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Game/Habbos/Habbo.cs
View File

@ -4,7 +4,6 @@ public class Habbo
{ {
public virtual uint Id { get; set; } public virtual uint Id { get; set; }
public virtual string Username { get; set; } = null!; public virtual string Username { get; set; } = null!;
public virtual string Password { get; set; } = null!;
public virtual string Email { get; set; } = null!; public virtual string Email { get; set; } = null!;
public virtual DateTime AccountCreated { get; set; } public virtual DateTime AccountCreated { get; set; }
public virtual DateTime? LastLogin { get; set; } public virtual DateTime? LastLogin { get; set; }

1
Game/Habbos/HabboMap.cs
View File

@ -10,7 +10,6 @@ public class HabboMap : ClassMap<Habbo>
LazyLoad(); LazyLoad();
Id(h => h.Id).Column("id").GeneratedBy.Identity(); Id(h => h.Id).Column("id").GeneratedBy.Identity();
Map(h => h.Username).Column("username").Not.Nullable(); Map(h => h.Username).Column("username").Not.Nullable();
Map(h => h.Password).Column("password").Not.Nullable();
Map(h => h.Email).Column("email").Not.Nullable(); Map(h => h.Email).Column("email").Not.Nullable();
Map(h => h.AccountCreated).Column("account_created").Not.Nullable(); Map(h => h.AccountCreated).Column("account_created").Not.Nullable();
Map(h => h.LastLogin).Column("last_login").Nullable(); Map(h => h.LastLogin).Column("last_login").Nullable();

4
Game/Settings/Setting.cs
View File

@ -2,6 +2,6 @@ namespace Tiger.Game.Settings;
public class Setting public class Setting
{ {
public virtual string Key { get; set; } = string.Empty; public virtual string Key { get; set; } = null!;
public virtual string Value { get; set; } = string.Empty; public virtual string Value { get; set; } = null!;
} }

26
Game/Settings/SettingMap.cs
View File

@ -1,13 +1,13 @@
// using FluentNHibernate.Mapping; using FluentNHibernate.Mapping;
//
// namespace Tiger.Game.Settings; namespace Tiger.Game.Settings;
//
// public class SettingMap : ClassMap<Setting> public class SettingMap : ClassMap<Setting>
// { {
// public SettingMap() public SettingMap()
// { {
// Table("settings"); Table("settings");
// Id(s => s.Key).Column("skey").Not.Nullable(); Id(s => s.Key).Column("skey").Not.Nullable();
// Map(s => s.Value).Column("value").Not.Nullable(); Map(s => s.Value).Column("value").Not.Nullable();
// } }
// } }

5
Storage/NhSessionFactory.cs
View File

@ -2,8 +2,9 @@ using System.Reflection;
using FluentNHibernate.Cfg; using FluentNHibernate.Cfg;
using FluentNHibernate.Cfg.Db; using FluentNHibernate.Cfg.Db;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using MySql.Data.MySqlClient; using MySqlConnector;
using NHibernate; using NHibernate;
using NHibernate.Driver.MySqlConnector;
namespace Tiger.Storage; namespace Tiger.Storage;
@ -26,7 +27,7 @@ public class NhSessionFactory : INhSessionFactory
}; };
_sessionFactory = Fluently.Configure() _sessionFactory = Fluently.Configure()
.Database(MySQLConfiguration.Standard.ConnectionString(stringBuilder.ToString()).ShowSql()) .Database(MySQLConfiguration.Standard.ConnectionString(stringBuilder.ToString()).Driver<MySqlConnectorDriver>())
.Mappings(m => m.FluentMappings.AddFromAssembly(Assembly.GetExecutingAssembly())) .Mappings(m => m.FluentMappings.AddFromAssembly(Assembly.GetExecutingAssembly()))
.BuildSessionFactory(); .BuildSessionFactory();
} }

3
TigerEmu.csproj
View File

@ -18,7 +18,8 @@
<PackageReference Include="Microsoft.Extensions.Configuration.Yaml" Version="2.0.0-preview2" /> <PackageReference Include="Microsoft.Extensions.Configuration.Yaml" Version="2.0.0-preview2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0-rc.1.23419.4" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0-rc.1.23419.4" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0-rc.1.23419.4" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0-rc.1.23419.4" />
<PackageReference Include="MySql.Data" Version="8.1.0" /> <PackageReference Include="MySqlConnector" Version="2.3.0-beta.3" />
<PackageReference Include="NHibernate.Driver.MySqlConnector" Version="2.0.5-ci.4" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Update="appsettings.yaml"> <None Update="appsettings.yaml">