Software / code / prosody
Comparison
plugins/mod_storage_sql2.lua @ 6534:b89406fa076c
Merge 0.10 -> trunk
| author | Waqas Hussain <waqas20@gmail.com> |
|---|---|
| date | Tue, 16 Dec 2014 18:33:54 -0500 |
| parent | 6349:0cee68dd35f8 |
| parent | 6532:a966efeb6cb3 |
| child | 6727:eb9c842b80fa |
comparison
equal
deleted
inserted
replaced
| 6527:074a41ee0409 | 6534:b89406fa076c |
|---|---|
| 111 assert(params.driver and params.database, "Both the SQL driver and the database need to be specified"); | 111 assert(params.driver and params.database, "Both the SQL driver and the database need to be specified"); |
| 112 | 112 |
| 113 --local dburi = db2uri(params); | 113 --local dburi = db2uri(params); |
| 114 engine = mod_sql:create_engine(params); | 114 engine = mod_sql:create_engine(params); |
| 115 | 115 |
| 116 engine:set_encoding(); | |
| 117 | |
| 118 if module:get_option("sql_manage_tables", true) then | 116 if module:get_option("sql_manage_tables", true) then |
| 119 -- Automatically create table, ignore failure (table probably already exists) | 117 -- Automatically create table, ignore failure (table probably already exists) |
| 120 create_table(); | 118 create_table(); |
| 121 -- Encoding mess | 119 -- Encoding mess |
| 122 upgrade_table(); | 120 upgrade_table(); |