diff options
| author | Kim Alvefur <zash@zash.se> | 2014-12-11 09:18:39 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-12-11 09:18:39 +0100 |
| commit | 2d59206551b8daf44888f8c3176e70911845b170 (patch) | |
| tree | 5be4e89291fa09d4adf85485d8cf2193d4868c3f | |
| parent | 0d4164c42c6693acd8f46fa88616fb38944d4c27 (diff) | |
| download | prosody-2d59206551b8daf44888f8c3176e70911845b170.tar.gz prosody-2d59206551b8daf44888f8c3176e70911845b170.zip | |
mod_storage_sql2, util.sql: Set character encoding on every connect
| -rw-r--r-- | plugins/mod_storage_sql2.lua | 2 | ||||
| -rw-r--r-- | util/sql.lua | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/plugins/mod_storage_sql2.lua b/plugins/mod_storage_sql2.lua index 0531c905..d5e0494f 100644 --- a/plugins/mod_storage_sql2.lua +++ b/plugins/mod_storage_sql2.lua @@ -113,8 +113,6 @@ do -- process options to get a db connection --local dburi = db2uri(params); engine = mod_sql:create_engine(params); - engine:set_encoding(); - if module:get_option("sql_manage_tables", true) then -- Automatically create table, ignore failure (table probably already exists) create_table(); diff --git a/util/sql.lua b/util/sql.lua index 5a1dda5d..453597da 100644 --- a/util/sql.lua +++ b/util/sql.lua @@ -156,6 +156,7 @@ function engine:connect() dbh:autocommit(false); -- don't commit automatically self.conn = dbh; self.prepared = {}; + self:set_encoding(); return true; end function engine:execute(sql, ...) |