This commit is contained in:
hananiel 2019-09-26 22:59:51 -04:00
Родитель efb1fe4782
Коммит 7c4369c21f
9 изменённых файлов: 235 добавлений и 4 удалений

Просмотреть файл

@ -15,6 +15,10 @@ using System.Data;
using System.Data.MySqlClient;
using System.Data;
#endif
#if (Postgres)
using Npgsql;
using System.Data;
#endif
namespace Company.WebApplication1.Controllers
{
#if (!NoAuth)
@ -74,6 +78,30 @@ namespace Company.WebApplication1.Controllers
return tables;
}
#endif
#if (Postgres)
private readonly NpgsqlConnection _dbConnection;
public ValuesController([FromServices] NpgsqlConnection dbConnection)
{
_dbConnection = dbConnection;
}
// GET api/values
[HttpGet]
public ActionResult<IEnumerable<string>> Get()
{
List<string> tables = new List<string>();
_dbConnection.Open();
DataTable dt = _dbConnection.GetSchema("Databases");
_dbConnection.Close();
foreach (DataRow row in dt.Rows)
{
string tablename = (string)row[2];
tables.Add(tablename);
}
return tables;
}
#endif
#if (!ValuesControllerWithArgs)
[HttpGet]
public ActionResult<string> Get()

Просмотреть файл

@ -15,6 +15,10 @@ using System.Data;
using System.Data.MySqlClient;
using System.Data;
#endif
#if (Postgres)
using Npgsql;
using System.Data;
#endif
namespace Company.WebApplication1.Controllers
{
#if (!NoAuth)
@ -49,7 +53,7 @@ namespace Company.WebApplication1.Controllers
return tables;
}
#endif
#if(MySql)
#if (MySql)
private readonly SqlConnection _dbConnection;
public ValuesController([FromServices] SqlConnection dbConnection)
{
@ -73,6 +77,30 @@ namespace Company.WebApplication1.Controllers
return tables;
}
#endif
#if (Postgres)
private readonly NpgsqlConnection _dbConnection;
public ValuesController([FromServices] NpgsqlConnection dbConnection)
{
_dbConnection = dbConnection;
}
// GET api/values
[HttpGet]
public ActionResult<IEnumerable<string>> Get()
{
List<string> tables = new List<string>();
_dbConnection.Open();
DataTable dt = _dbConnection.GetSchema("Databases");
_dbConnection.Close();
foreach (DataRow row in dt.Rows)
{
string tablename = (string)row[2];
tables.Add(tablename);
}
return tables;
}
#endif
#if (!ValuesControllerWithArgs)
[HttpGet]
public ActionResult<string> Get()

Просмотреть файл

@ -15,6 +15,11 @@ using System.Data;
using System.Data.MySqlClient;
using System.Data;
#endif
#if (Postgres)
using Npgsql;
using System.Data;
#endif
namespace Company.WebApplication1.Controllers
{
#if (!NoAuth)
@ -50,7 +55,7 @@ namespace Company.WebApplication1.Controllers
}
#endif
#if(MySql)
#if (MySql)
private readonly SqlConnection _dbConnection;
public ValuesController([FromServices] SqlConnection dbConnection)
{
@ -74,6 +79,30 @@ namespace Company.WebApplication1.Controllers
return tables;
}
#endif
#if (Postgres)
private readonly NpgsqlConnection _dbConnection;
public ValuesController([FromServices] NpgsqlConnection dbConnection)
{
_dbConnection = dbConnection;
}
// GET api/values
[HttpGet]
public ActionResult<IEnumerable<string>> Get()
{
List<string> tables = new List<string>();
_dbConnection.Open();
DataTable dt = _dbConnection.GetSchema("Databases");
_dbConnection.Close();
foreach (DataRow row in dt.Rows)
{
string tablename = (string)row[2];
tables.Add(tablename);
}
return tables;
}
#endif
#if (!ValuesControllerWithArgs)
[HttpGet]
public ActionResult<string> Get()

Просмотреть файл

@ -15,6 +15,10 @@ using System.Data;
using System.Data.MySqlClient;
using System.Data;
#endif
#if (Postgres)
using Npgsql;
using System.Data;
#endif
namespace Company.WebApplication1.Controllers
{
#if (!NoAuth)
@ -74,6 +78,30 @@ namespace Company.WebApplication1.Controllers
return tables;
}
#endif
#if (Postgres)
private readonly NpgsqlConnection _dbConnection;
public ValuesController([FromServices] NpgsqlConnection dbConnection)
{
_dbConnection = dbConnection;
}
// GET api/values
[HttpGet]
public ActionResult<IEnumerable<string>> Get()
{
List<string> tables = new List<string>();
_dbConnection.Open();
DataTable dt = _dbConnection.GetSchema("Databases");
_dbConnection.Close();
foreach (DataRow row in dt.Rows)
{
string tablename = (string)row[2];
tables.Add(tablename);
}
return tables;
}
#endif
#if (!ValuesControllerWithArgs)
[HttpGet]
public ActionResult<string> Get()

Просмотреть файл

@ -15,6 +15,10 @@ using System.Data;
using System.Data.MySqlClient;
using System.Data;
{{/MySql}}
{{#Postgres}}
using Npgsql;
using System.Data;
{{/Postgres}}
namespace {{ProjectNameSpace}}.Controllers
{
{{#Auth}}
@ -72,6 +76,30 @@ namespace {{ProjectNameSpace}}.Controllers
return tables;
}
{{/MySql}}
{{#Postgres}}
private readonly NpgsqlConnection _dbConnection;
public ValuesController([FromServices] NpgsqlConnection dbConnection)
{
_dbConnection = dbConnection;
}
// GET api/values
[HttpGet]
public ActionResult<IEnumerable<string>> Get()
{
List<string> tables = new List<string>();
_dbConnection.Open();
DataTable dt = _dbConnection.GetSchema("Databases");
_dbConnection.Close();
foreach (DataRow row in dt.Rows)
{
string tablename = (string)row[2];
tables.Add(tablename);
}
return tables;
}
{{/Postgres}}
{{^ValuesControllerWithArgs}}
[HttpGet]
public ActionResult<string> Get()

Просмотреть файл

@ -15,6 +15,10 @@ using System.Data;
using System.Data.MySqlClient;
using System.Data;
{{/MySql}}
{{#Postgres}}
using Npgsql;
using System.Data;
{{/Postgres}}
namespace {{ProjectNameSpace}}.Controllers
{
{{#Auth}}
@ -72,6 +76,30 @@ namespace {{ProjectNameSpace}}.Controllers
return tables;
}
{{/MySql}}
{{#Postgres}}
private readonly NpgsqlConnection _dbConnection;
public ValuesController([FromServices] NpgsqlConnection dbConnection)
{
_dbConnection = dbConnection;
}
// GET api/values
[HttpGet]
public ActionResult<IEnumerable<string>> Get()
{
List<string> tables = new List<string>();
_dbConnection.Open();
DataTable dt = _dbConnection.GetSchema("Databases");
_dbConnection.Close();
foreach (DataRow row in dt.Rows)
{
string tablename = (string)row[2];
tables.Add(tablename);
}
return tables;
}
{{/Postgres}}
{{^ValuesControllerWithArgs}}
[HttpGet]
public ActionResult<string> Get()

Просмотреть файл

@ -15,6 +15,10 @@ using System.Data;
using System.Data.MySqlClient;
using System.Data;
{{/MySql}}
{{#Postgres}}
using Npgsql;
using System.Data;
{{/Postgres}}
namespace {{ProjectNameSpace}}.Controllers
{
{{#Auth}}
@ -72,6 +76,30 @@ namespace {{ProjectNameSpace}}.Controllers
return tables;
}
{{/MySql}}
{{#Postgres}}
private readonly NpgsqlConnection _dbConnection;
public ValuesController([FromServices] NpgsqlConnection dbConnection)
{
_dbConnection = dbConnection;
}
// GET api/values
[HttpGet]
public ActionResult<IEnumerable<string>> Get()
{
List<string> tables = new List<string>();
_dbConnection.Open();
DataTable dt = _dbConnection.GetSchema("Databases");
_dbConnection.Close();
foreach (DataRow row in dt.Rows)
{
string tablename = (string)row[2];
tables.Add(tablename);
}
return tables;
}
{{/Postgres}}
{{^ValuesControllerWithArgs}}
[HttpGet]
public ActionResult<string> Get()

Просмотреть файл

@ -15,6 +15,10 @@ using System.Data;
using System.Data.MySqlClient;
using System.Data;
{{/MySql}}
{{#Postgres}}
using Npgsql;
using System.Data;
{{/Postgres}}
namespace {{ProjectNameSpace}}.Controllers
{
{{#Auth}}
@ -72,6 +76,30 @@ namespace {{ProjectNameSpace}}.Controllers
return tables;
}
{{/MySql}}
{{#Postgres}}
private readonly NpgsqlConnection _dbConnection;
public ValuesController([FromServices] NpgsqlConnection dbConnection)
{
_dbConnection = dbConnection;
}
// GET api/values
[HttpGet]
public ActionResult<IEnumerable<string>> Get()
{
List<string> tables = new List<string>();
_dbConnection.Open();
DataTable dt = _dbConnection.GetSchema("Databases");
_dbConnection.Close();
foreach (DataRow row in dt.Rows)
{
string tablename = (string)row[2];
tables.Add(tablename);
}
return tables;
}
{{/Postgres}}
{{^ValuesControllerWithArgs}}
[HttpGet]
public ActionResult<string> Get()

Просмотреть файл

@ -201,10 +201,16 @@ namespace Steeltoe.Initializr.Tests
string startUpContents = files.Find(x => x.Key == "Startup.cs").Value;
Assert.Contains("using Steeltoe.CloudFoundry.Connector.PostgreSql;", startUpContents);
Assert.Contains("services.AddPostgresConnection(Configuration);", startUpContents);
string valuesController = files.Find(x => x.Key == "Controllers\\ValuesController.cs").Value;
Assert.Contains("using Npgsql;", valuesController);
Assert.Contains("using System.Data", valuesController);
Assert.Contains(@"public ValuesController([FromServices] NpgsqlConnection dbConnection)", valuesController);
Assert.Contains(@"DataTable dt = _dbConnection.GetSchema(""Databases"");", valuesController);
}
[Fact]
public async Task CreateTemplate_ConfigServer()
{