More sql stuff

src/framework/CMakeLists.txt

@@ -450,6 +450,9 @@ if(FRAMEWORK_SQL)
     set(framework_LIBRARIES ${framework_LIBRARIES} ${MYSQL_LIBRARY})
 
     set(framework_SOURCES ${framework_SOURCES}
+        ${CMAKE_CURRENT_LIST_DIR}/sql/declarations.h
+        ${CMAKE_CURRENT_LIST_DIR}/sql/database.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/sql/database.h
         ${CMAKE_CURRENT_LIST_DIR}/sql/mysql.cpp
         ${CMAKE_CURRENT_LIST_DIR}/sql/mysql.h
     )

src/framework/luafunctions.cpp

@@ -45,6 +45,10 @@
 #include <framework/net/server.h>
 #endif
 
+#ifdef FW_SQL
+#include <framework/sql/mysql.h>
+#endif
+
 void Application::registerLuaFunctions()
 {
     // conversion globals
@@ -700,4 +704,14 @@ void Application::registerLuaFunctions()
     g_lua.bindSingletonFunction("g_sounds", "isAudioEnabled", &SoundManager::isAudioEnabled, &g_sounds);
     g_lua.bindSingletonFunction("g_sounds", "getCurrentMusic", &SoundManager::getCurrentMusic, &g_sounds);
 #endif
+
+#ifdef FW_SQL
+    // Database
+    g_lua.registerClass<Database>();
+
+    // Mysql
+    g_lua.registerClass<DatabaseMySQL>();
+    g_lua.bindClassStaticFunction<DatabaseMySQL>("create", []{ return DatabaseMySQLPtr(new DatabaseMySQL); });
+    g_lua.bindClassMemberFunction<DatabaseMySQL>("connect", &DatabaseMySQL::connect);
+#endif
 }

src/framework/sql/database.cpp

@@ -0,0 +1,9 @@
+#include "database.h"
+
+Database::Database()
+{
+}
+
+Database::~Database()
+{
+}

src/framework/sql/database.h

@@ -0,0 +1,15 @@
+#ifndef DATABASE_H
+#define DATABASE_H
+
+#include "declarations.h"
+#include <framework/global.h>
+#include <framework/luaengine/luaobject.h>
+
+class Database : public LuaObject
+{
+public:
+    Database();
+    ~Database();
+};
+
+#endif

src/framework/sql/declarations.h

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef FRAMEWORK_SQL_DECLARATIONS_H
+#define FRAMEWORK_SQL_DECLARATIONS_H
+
+#include <framework/global.h>
+
+class DatabaseMySQL;
+
+typedef stdext::shared_object_ptr<DatabaseMySQL> DatabaseMySQLPtr;
+
+#endif

src/framework/sql/mysql.h

@@ -1,6 +1,7 @@
-#ifndef DATABASE_H
-#define DATABASE_H
+#ifndef DATABASEMYSQL_H
+#define DATABASEMYSQL_H
 
+#include "database.h"
 #include <framework/global.h>
 #ifdef WIN32
 #include <winsock2.h>
@@ -9,7 +10,7 @@
 
 class DBResult;
 
-class DatabaseMySQL
+class DatabaseMySQL : public Database
 {
 public:
     DatabaseMySQL();