From 1bc3544b1cf2bb77135f659cb057007f2d5de113 Mon Sep 17 00:00:00 2001 From: Jan Piotrowski Date: Thu, 27 Feb 2020 20:40:58 +0100 Subject: [PATCH 1/2] fix(GetConstraintsPertab): Also work with non-lowercase column names Possibly closes #6 --- sql.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql.go b/sql.go index b069f0a..2c2b9fa 100644 --- a/sql.go +++ b/sql.go @@ -320,7 +320,7 @@ FROM (SELECT n.nspname FROM pg_catalog.pg_class c, pg_catalog.pg_constraint con, pg_namespace n - WHERE c.oid = '%[1]s' :: regclass + WHERE c.oid = '"%[1]s"' :: regclass AND conrelid = c.oid AND n.oid = c.relnamespace AND contype IN ( 'u', 'f', 'c', 'p' ) @@ -545,4 +545,4 @@ WHERE %[2]s = '%[6]s' Debugf("query: %s", query) Fatalf("Error when updating the foreign key for table %s, err: %v", key.Table, err) } -} \ No newline at end of file +} From 52a0b3aec8e78f973212db77d0d79deb64bf9b01 Mon Sep 17 00:00:00 2001 From: Faisal Ali Date: Thu, 27 Feb 2020 20:30:29 +0000 Subject: [PATCH 2/2] Fix for uppercase column (#1) * Fix for uppercase colum + Uppercase columns are being converted to lowercase and hence error'ng out. this is fixed + Bump the version of the mock-data tool * version bump --- mock.go | 2 +- sql.go | 2 +- worker.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mock.go b/mock.go index 803e391..1eccaa1 100644 --- a/mock.go +++ b/mock.go @@ -7,7 +7,7 @@ import ( var ( programName = "mock" - programVersion = "v2.1" + programVersion = "v2.2" ExecutionTimestamp = TimeNow() Path = fmt.Sprintf("%s/%s/%s", os.Getenv("HOME"), programName, ExecutionTimestamp) ) diff --git a/sql.go b/sql.go index 2c2b9fa..2f3b485 100644 --- a/sql.go +++ b/sql.go @@ -320,7 +320,7 @@ FROM (SELECT n.nspname FROM pg_catalog.pg_class c, pg_catalog.pg_constraint con, pg_namespace n - WHERE c.oid = '"%[1]s"' :: regclass + WHERE c.oid = '%[1]s' :: regclass AND conrelid = c.oid AND n.oid = c.relnamespace AND contype IN ( 'u', 'f', 'c', 'p' ) diff --git a/worker.go b/worker.go index b95e6f1..dbbae22 100644 --- a/worker.go +++ b/worker.go @@ -158,8 +158,8 @@ DataTypePickerLoop: // Copy the data to the database table func CopyData(tab string, col []string, data []string, db *pg.DB) { // Copy Statement and start loading - copyStatment := fmt.Sprintf(`COPY %s(%s) FROM STDIN WITH CSV DELIMITER '%s' QUOTE e'\x01'`, - tab, strings.Join(col, ","), delimiter) + copyStatment := fmt.Sprintf(`COPY %s("%s") FROM STDIN WITH CSV DELIMITER '%s' QUOTE e'\x01'`, + tab, strings.Join(col, "\",\""), delimiter) _, err := db.CopyFrom(strings.NewReader(strings.Join(data, delimiter)), copyStatment) // Handle Error