Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #236 from Arkshine/fix/missing-sqlite-charset

Browse Source 
Fix missing SQL_SetCharset native in SQLite
This commit is contained in:
Vincent Herbet
2015-04-20 22:47:16 +02:00
parent 81e091e005 b88841c6ef
commit cc11191e57
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/sqlite/basic_sql.cpp
View File

@@ -595,6 +595,12 @@ static cell AMX_NATIVE_CALL SQL_QuoteStringFmt(AMX *amx, cell *params)
} }
} }
static cell AMX_NATIVE_CALL SQL_SetCharset(AMX *amx, cell *params)
{
/* SQLite supports only UTF-8/16 */
return 0;
}
AMX_NATIVE_INFO g_BaseSqlNatives[] = AMX_NATIVE_INFO g_BaseSqlNatives[] =
{ {
{"SQL_MakeDbTuple", SQL_MakeDbTuple}, {"SQL_MakeDbTuple", SQL_MakeDbTuple},
@@ -620,6 +626,7 @@ AMX_NATIVE_INFO g_BaseSqlNatives[] =
{"SQL_QuoteString", SQL_QuoteString}, {"SQL_QuoteString", SQL_QuoteString},
{"SQL_QuoteStringFmt", SQL_QuoteStringFmt}, {"SQL_QuoteStringFmt", SQL_QuoteStringFmt},
{"SQL_NextResultSet", SQL_NextResultSet}, {"SQL_NextResultSet", SQL_NextResultSet},
{"SQL_SetCharset", SQL_SetCharset},
{NULL, NULL}, {NULL, NULL},
}; };

4
modules/sqlite/msvc12/sqlite.vcxproj.filters
View File

@@ -80,7 +80,7 @@
<ClCompile Include="..\..\..\public\sdk\amxxmodule.cpp"> <ClCompile Include="..\..\..\public\sdk\amxxmodule.cpp">
<Filter>Module SDK\SDK Base</Filter> <Filter>Module SDK\SDK Base</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\sqlite-source\sqlite3.c"> <ClCompile Include="..\..\..\third_party\sqlite\sqlite3.c">
<Filter>SQLite Source</Filter> <Filter>SQLite Source</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
@@ -136,7 +136,7 @@
<ClInclude Include="..\moduleconfig.h"> <ClInclude Include="..\moduleconfig.h">
<Filter>Module SDK</Filter> <Filter>Module SDK</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\sqlite-source\sqlite3.h"> <ClInclude Include="..\..\..\third_party\sqlite\sqlite3.h">
<Filter>SQLite Source</Filter> <Filter>SQLite Source</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>

3
plugins/include/sqlx.inc
View File

@@ -67,7 +67,8 @@ native Handle:SQL_Connect(Handle:cn_tuple, &errcode, error[], maxlength);
* *
* If a connection tuple is supplied, this should be called before SQL_Connect or SQL_ThreadQuery. * If a connection tuple is supplied, this should be called before SQL_Connect or SQL_ThreadQuery.
* Also note the change will remain until you call this function with another value. * Also note the change will remain until you call this function with another value.
* * This native does nothing in SQLite.
*
* Example: "utf8", "latin1" * Example: "utf8", "latin1"
* *
* @param h Database or connection tuple Handle. * @param h Database or connection tuple Handle.