แก้บัก MyDatabase
This commit is contained in:
@@ -80,7 +80,8 @@ left join public.{0}DepartmentData{0} as orgdata on orgdata.id = he.department_i
|
||||
left join public.hrm_employee_types as het on het.id = he.employee_type_id
|
||||
left join public.users as u on u.employee_id = he.employee_id
|
||||
where he.workingstatus = 'สถานะปฏิบัติงาน' and he.deleted_at is null and mpn.deleted_at is null
|
||||
and opd.deleted_at is null and htm.deleted_at is null;
|
||||
and opd.deleted_at is null and htm.deleted_at is null
|
||||
order by he.firstname,he.lastname;
|
||||
", '"'.ToString());
|
||||
var para = db.GetParameterListNpgsql();
|
||||
DataTable dt = db.ExecuteDataTableNpgsql(sql, para);
|
||||
|
||||
@@ -22,7 +22,16 @@ namespace TTSW.Utils
|
||||
public DataTable ExecuteDataTableNpgsql(string queryString, List<NpgsqlParameter> para)
|
||||
{
|
||||
System.Data.DataSet ds = new DataSet();
|
||||
string connectionString = Configuration.GetConnectionString("externalDBConnectionString");
|
||||
|
||||
var DB_HOST = Environment.GetEnvironmentVariable("DB_HOST");
|
||||
var DB_PORT = Environment.GetEnvironmentVariable("DB_PORT");
|
||||
var DB_NAME = Environment.GetEnvironmentVariable("DB_NAME");
|
||||
var DB_USERNAME = Environment.GetEnvironmentVariable("DB_USERNAME");
|
||||
var DB_PASSWORD = Environment.GetEnvironmentVariable("DB_PASSWORD");
|
||||
|
||||
var envConnectionString = $"Server={DB_HOST};Port={DB_PORT};Database={DB_NAME};User ID={DB_USERNAME};Password={DB_PASSWORD};";
|
||||
|
||||
string connectionString = !string.IsNullOrEmpty(DB_HOST) ? envConnectionString : Configuration.GetConnectionString("externalDBConnectionString");
|
||||
|
||||
using (NpgsqlConnection conn = new NpgsqlConnection(connectionString))
|
||||
using (NpgsqlCommand cmd = new NpgsqlCommand(queryString, conn))
|
||||
|
||||
Reference in New Issue
Block a user