Skip to content

Commit

Permalink
File Renaming and Compatibility FirebirdSql.Data.FirebirdClient
Browse files Browse the repository at this point in the history
  • Loading branch information
ralmsdeveloper committed Aug 30, 2017
1 parent d63a232 commit aead2b4
Show file tree
Hide file tree
Showing 120 changed files with 1,199 additions and 1,303 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Models\Author.cs" />
<Compile Include="Models\Book.cs" />
<Compile Include="Models\FirebirdDbContext.cs" />
<Compile Include="Models\TestGuid.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Test.cs" />
Expand Down
26 changes: 0 additions & 26 deletions EFCore.FirebirdSQL.Test/Models/Author.cs

This file was deleted.

19 changes: 0 additions & 19 deletions EFCore.FirebirdSQL.Test/Models/Book.cs

This file was deleted.

45 changes: 0 additions & 45 deletions EFCore.FirebirdSQL.Test/Models/FirebirdDbContext.cs

This file was deleted.

15 changes: 0 additions & 15 deletions EFCore.FirebirdSQL.Test/Models/TestGuid.cs

This file was deleted.

4 changes: 2 additions & 2 deletions EFCore.FirebirdSQL.Test/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
using System.Collections.Generic;
using System.Linq;

namespace EFCore.FirebirdSqlSQL.Test
namespace EFCore.FbSQL.Test
{
class Program
{

static void Main(string[] args)
{
{
//Command Sample Scaffolding
//Scaffold-DbContext "User=SYSDBA;Password=masterkey;Database=R:\RALMS.FDB;DataSource=127.0.0.1;Port=2017;Dialect=3;Charset=UTF8;Role=;Connection lifetime=15;Pooling=true;Packet Size=8192;ServerType=0;" EntityFrameworkCore.FirebirdSQL -OutputDir Models -Context "FirebirdDbContext" -DataAnnotations -force -verbose
Console.WriteLine("# Wait... ");
Expand Down
4 changes: 2 additions & 2 deletions EFCore.FirebirdSQL.Test/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
// As informações gerais sobre um assembly são controladas por
// conjunto de atributos. Altere estes valores de atributo para modificar as informações
// associada a um assembly.
[assembly: AssemblyTitle("EFCore.FirebirdSqlSQL.Test")]
[assembly: AssemblyTitle("EFCore.FbSQL.Test")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("EFCore.FirebirdSqlSQL.Test")]
[assembly: AssemblyProduct("EFCore.FbSQL.Test")]
[assembly: AssemblyCopyright("Copyright © 2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
Expand Down
4 changes: 2 additions & 2 deletions EFCore.FirebirdSQL.Test/Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System.ComponentModel.DataAnnotations;
using System.Diagnostics;

namespace EFCore.FirebirdSqlSQL.Test
namespace EFCore.FbSQL.Test
{
public class Context : DbContext
{
Expand All @@ -33,7 +33,7 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
"Packet Size=8192;" +
"ServerType=0";

optionsBuilder.UseFirebirdSql(connectionString);
optionsBuilder.UseFb(connectionString);

//if used Log (log of commands)
LoggerFactory loggerFactory = new LoggerFactory();
Expand Down
2 changes: 1 addition & 1 deletion EFCore.FirebirdSQL.Test/Trace.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System.Text;
using System.Threading.Tasks;

namespace EFCore.FirebirdSqlSQL.Test
namespace EFCore.FbSQL.Test
{
public class TraceLogger : ILogger
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* EntityFrameworkCore.FirebirdSqlSQL - Congratulations EFCore Team
* https://www.FirebirdSqlsql.org/en/net-provider/
* FirebirdSql.EntityFrameworkCore.Firebird
* https://www.firebirdsql.org/en/net-provider/
* Permission to use, copy, modify, and distribute this software and its
* documentation for any purpose, without fee, and without a written
* agreement is hereby granted, provided that the above copyright notice
Expand All @@ -10,15 +10,15 @@
* Developer's Public License Version 1.0 (the "License");
* you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
* http://www.FirebirdSqlsql.org/index.php?op=doc&id=idpl
* http://www.firebirdsql.org/index.php?op=doc&id=idpl
*
* Software distributed under the License is distributed on
* an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
* express or implied. See the License for the specific
* language governing rights and limitations under the License.
*
* Copyright (c) 2017 Rafael Almeida
* Made In Sergipe-Brasil - [email protected]
* Credits: Rafael Almeida ([email protected])
* Sergipe-Brazil
* All Rights Reserved.
*/

Expand All @@ -30,9 +30,9 @@

namespace Microsoft.EntityFrameworkCore.Design.Internal
{
public class FirebirdSqlAnnotationCodeGenerator : AnnotationCodeGenerator
public class FbAnnotationCodeGenerator : AnnotationCodeGenerator
{
public FirebirdSqlAnnotationCodeGenerator([NotNull] AnnotationCodeGeneratorDependencies dependencies)
public FbAnnotationCodeGenerator([NotNull] AnnotationCodeGeneratorDependencies dependencies)
: base(dependencies)
{
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* EntityFrameworkCore.FirebirdSqlSQL - Congratulations EFCore Team
* https://www.FirebirdSqlsql.org/en/net-provider/
* FirebirdSql.EntityFrameworkCore.Firebird
* https://www.firebirdsql.org/en/net-provider/
* Permission to use, copy, modify, and distribute this software and its
* documentation for any purpose, without fee, and without a written
* agreement is hereby granted, provided that the above copyright notice
Expand All @@ -10,15 +10,15 @@
* Developer's Public License Version 1.0 (the "License");
* you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
* http://www.FirebirdSqlsql.org/index.php?op=doc&id=idpl
* http://www.firebirdsql.org/index.php?op=doc&id=idpl
*
* Software distributed under the License is distributed on
* an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
* express or implied. See the License for the specific
* language governing rights and limitations under the License.
*
* Copyright (c) 2017 Rafael Almeida
* Made In Sergipe-Brasil - [email protected]
* Credits: Rafael Almeida ([email protected])
* Sergipe-Brazil
* All Rights Reserved.
*/

Expand All @@ -32,14 +32,14 @@

namespace Microsoft.EntityFrameworkCore.Design.Internal
{
public class FirebirdSqlDesignTimeServices : IDesignTimeServices
public class FbDesignTimeServices : IDesignTimeServices
{
public virtual void ConfigureDesignTimeServices([NotNull] IServiceCollection serviceCollection)
=> serviceCollection
.AddSingleton<IRelationalTypeMapper, FirebirdSqlTypeMapper>()
.AddSingleton<IDatabaseModelFactory, FirebirdSqlDatabaseModelFactory>()
.AddSingleton<IScaffoldingProviderCodeGenerator, FirebirdSqlScaffoldingCodeGenerator>()
.AddSingleton<IAnnotationCodeGenerator, FirebirdSqlAnnotationCodeGenerator>();
.AddSingleton<IRelationalTypeMapper, FbTypeMapper>()
.AddSingleton<IDatabaseModelFactory, FbDatabaseModelFactory>()
.AddSingleton<IScaffoldingProviderCodeGenerator, FbScaffoldingCodeGenerator>()
.AddSingleton<IAnnotationCodeGenerator, FbAnnotationCodeGenerator>();
}
}

9 changes: 5 additions & 4 deletions EFCore.FirebirdSQL/EFCore.FirebirdSQL.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>EntityFrameworkCore.FirebirdSQL</AssemblyName>
<RootNamespace>EntityFrameworkCore.FirebirdSQL</RootNamespace>
<AssemblyName>FirebirdSql.EntityFrameworkCore.Firebird</AssemblyName>
<RootNamespace>FirebirdSql.EntityFrameworkCore.Firebird</RootNamespace>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>EntityFramework.FIrebirdSQL.snk</AssemblyOriginatorKeyFile>
<AssemblyVersion>2.0.0.0</AssemblyVersion>
<FileVersion>2.0.0.0</FileVersion>
<Copyright>Copyright © Rafael Almeida</Copyright>
<Company>Rafael Almeida</Company>
<Authors>Rafael Almeida</Authors>
<Version>2.0.5-preview5</Version>
<Version>2.0.6-preview6</Version>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<RepositoryType>git</RepositoryType>
<PackageTags>EntityFrameworkCore.FirebirdSQL; FirebirdSQL;Entity Framework Core;entity-framework-core;EF;Data;O/RM</PackageTags>
Expand All @@ -21,7 +21,8 @@
<Product>EntityFrameworkCore.FirebirdSQL</Product>
<PackageProjectUrl>https://github.com/ralmsdeveloper/EntityFrameworkCore.FirebirdSQL</PackageProjectUrl>
<PackageIconUrl>https://firebirdsql.org/img/site/fb.jpg</PackageIconUrl>
<PackageLicenseUrl>https://github.com/ralmsdeveloper/EntityFrameworkCore.FirebirdSQL/blob/master/LICENSE</PackageLicenseUrl>
<PackageLicenseUrl>https://raw.githubusercontent.com/cincuranet/FirebirdSql.Data.FirebirdClient/master/license.txt</PackageLicenseUrl>
<RepositoryUrl>https://github.com/ralmsdeveloper/EntityFrameworkCore.FirebirdSQL</RepositoryUrl>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* EntityFrameworkCore.FirebirdSqlSQL - Congratulations EFCore Team
* https://www.FirebirdSqlsql.org/en/net-provider/
* FirebirdSql.EntityFrameworkCore.Firebird
* https://www.firebirdsql.org/en/net-provider/
* Permission to use, copy, modify, and distribute this software and its
* documentation for any purpose, without fee, and without a written
* agreement is hereby granted, provided that the above copyright notice
Expand All @@ -10,15 +10,15 @@
* Developer's Public License Version 1.0 (the "License");
* you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
* http://www.FirebirdSqlsql.org/index.php?op=doc&id=idpl
* http://www.firebirdsql.org/index.php?op=doc&id=idpl
*
* Software distributed under the License is distributed on
* an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
* express or implied. See the License for the specific
* language governing rights and limitations under the License.
*
* Copyright (c) 2017 Rafael Almeida
* Made In Sergipe-Brasil - [email protected]
* Credits: Rafael Almeida ([email protected])
* Sergipe-Brazil
* All Rights Reserved.
*/

Expand All @@ -34,7 +34,7 @@ namespace Microsoft.EntityFrameworkCore
/// <summary>
/// FirebirdSQL specific extension methods for <see cref="DbContext.Database" />.
/// </summary>
public static class FirebirdSqlDatabaseFacadeExtensions
public static class FbDatabaseFacadeExtensions
{
/// <summary>
/// <para>
Expand All @@ -49,7 +49,7 @@ public static class FirebirdSqlDatabaseFacadeExtensions
/// </summary>
/// <param name="database"> The facade from <see cref="DbContext.Database" />. </param>
/// <returns> True if FirebirdSQL is being used; false otherwise. </returns>
public static bool IsFirebirdSql([NotNull] this DatabaseFacade database)
public static bool IsFb([NotNull] this DatabaseFacade database)
=> database.ProviderName.Equals(
typeof(FbOptionsExtension).GetTypeInfo().Assembly.GetName().Name,
StringComparison.Ordinal);
Expand Down
Loading

0 comments on commit aead2b4

Please sign in to comment.