Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/289247
Change subject: Fix encoding and paging on unsubscribe table
......................................................................
Fix encoding and paging on unsubscribe table
Make collation match other tables, give it an int ID to page on.
FIXME: export.py always writes the order_by column to the csv.
Bug: T135204
Change-Id: I2b4ff0f5949b11d6bc5f7f9bdc2442bcc04a7785
---
M silverpop_export/export.py
M silverpop_export/update_table.sql
2 files changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools
refs/changes/47/289247/1
diff --git a/silverpop_export/export.py b/silverpop_export/export.py
index f70a151..e4cbd9d 100644
--- a/silverpop_export/export.py
+++ b/silverpop_export/export.py
@@ -89,12 +89,12 @@
log.info("Starting unsubscribe data export")
exportq = DbQuery()
exportq.tables.append('silverpop_excluded')
- exportq.columns.append('email')
+ exportq.columns.append('*')
run_export_query(
db=db,
query=exportq,
output=output_path,
- sort_by_index="email"
+ sort_by_index="id"
)
diff --git a/silverpop_export/update_table.sql
b/silverpop_export/update_table.sql
index ba294e0..5019eef 100755
--- a/silverpop_export/update_table.sql
+++ b/silverpop_export/update_table.sql
@@ -299,13 +299,14 @@
DROP TABLE IF EXISTS silverpop_excluded;
CREATE TABLE IF NOT EXISTS silverpop_excluded(
+ id int AUTO_INCREMENT PRIMARY KEY,
email varchar(255),
INDEX sx_email (email),
CONSTRAINT sx_email_u UNIQUE (email)
-);
+) COLLATE 'utf8_unicode_ci' AUTO_INCREMENT=1;
-INSERT IGNORE INTO silverpop_excluded
+INSERT IGNORE INTO silverpop_excluded (email)
SELECT email
FROM log_civicrm.log_civicrm_email e;
--
To view, visit https://gerrit.wikimedia.org/r/289247
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b4ff0f5949b11d6bc5f7f9bdc2442bcc04a7785
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Ejegg <eeggles...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
