mod_storage_sql2, util.sql: Set character encoding on every connect

diff --git a/plugins/mod_storage_sql2.lua b/plugins/mod_storage_sql2.lua
index 0531c90500cc79b54c381a19b05d672219b5bbae..d5e0494faf5636f18a0dc0eb43fca331332a57b8 100644 (file)
--- 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 5a1dda5d41d3261885a0a8f5f919b42c76bc2202..453597da3f117ded9c1f06ef4df5017afdb839eb 100644 (file)
--- 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, ...)