Merge pull request #170 from chrismaeda/master

MySQL and Postgres user file system modules that support custom db schemas

Author: chatscriptnlp

SRC/Makefile

@@ -1,67 +1,103 @@
-.PHONY = all clean binary server debugserver standalone pgserver debugpgserver mongoserver debugmongoserver foreignserver mongotreetaggerserver 
+.PHONY = clean binary server debugserver standalone pgserver debugpgserver mysqlserver debugmysqlserver mongoserver debugmongoserver foreignserver mongotreetaggerserver 
 
+# Removed the 'all' target.  It does not  make sense since each build target requires a different set of defines.
+# So we need to clean before building each target in order compile in the right stuff.  
+#
+# E.g. to build pg and mysql:
+#
+# 1. make clean pgserver
+# 2. make clean mysqlserver
 
+# Note: to build mysql targets on Ubuntu:
+# sudo apt-get install libmysqlclient-dev
+
+# store executable names in make variables so that cleanall target works
+executable.server=../BINARIES/ChatScript
 server: DEFINES+= -DLOCKUSERFILE=1  -DEVSERVER=1 -DEVSERVER_FORK=1  -DDISCARDPOSTGRES=1 -DDISCARDMONGO=1 -DDISCARDMYSQL=1 
 server: PGLOAD= -pthread
 server: INCLUDEDIRS=-Ievserver
-server: all
-server: EXECUTABLE=../BINARIES/ChatScript
+server: binary
+server: EXECUTABLE=$(executable.server)
 server: CFLAGS=-c  -std=c++11 -Wall  -funsigned-char  -Wno-write-strings -Wno-char-subscripts -Wno-strict-aliasing 
 
+executable.debugserver=../BINARIES/ChatScriptDebug
 debugserver: DEFINES+= -DLOCKUSERFILE=1 -DDISCARDPOSTGRES=1 -DDISCARDMONGO=1 -DDISCARDMYSQL=1  -DDEBUG -DEVSERVER=1 -DEVSERVER_FORK=1 
 debugserver: PGLOAD= -pthread
 debugserver: INCLUDEDIRS=-Ievserver
-debugserver: all
-debugserver: EXECUTABLE=../BINARIES/ChatScriptDebug
+debugserver: binary
+debugserver: EXECUTABLE=$(executable.debugserver)
 debugserver: CFLAGS=-c -std=c++11 -Wall  -funsigned-char  -Wno-write-strings -Wno-char-subscripts -Wno-strict-aliasing -g
 
+executable.standalone=../BINARIES/ChatScript
 standalone: DEFINES+=  -DDISCARDSERVER=1 -DDISCARDPOSTGRES=1 -DDISCARDMONGO=1 -DDISCARDMYSQL=1 -DEVSERVER=1 -DEVSERVER_FORK=1
 standalone: PGLOAD= -pthread
 standalone: INCLUDEDIRS=-Ievserver
-standalone: all
-standalone: EXECUTABLE=../BINARIES/ChatScript
+standalone: binary
+standalone: EXECUTABLE=$(executable.standalone)
 standalone: CFLAGS=-c -std=c++11  -Wall  -funsigned-char  -Wno-write-strings -Wno-char-subscripts -Wno-strict-aliasing 
 
+executable.pgserver=../BINARIES/ChatScriptpg
 pgserver: DEFINES+= -DLOCKUSERFILE=1 -DEVSERVER=1 -DEVSERVER_FORK=1 -DDISCARDMONGO=1 -DDISCARDMYSQL=1
 pgserver: PGLOAD= -lpq -pthread
-pgserver: all
-pgserver: EXECUTABLE=../BINARIES/ChatScriptpg
+pgserver: binary
+pgserver: EXECUTABLE=$(executable.pgserver)
 pgserver: INCLUDEDIRS=-Ievserver -Ipostgres
 pgserver: CFLAGS=-c -std=c++11 -Wall  -funsigned-char  -Wno-write-strings -Wno-char-subscripts -Wno-strict-aliasing 
 
-debugpgserver: DEFINES+= -DLOCKUSERFILE=1  -DDEBUG -DEVSERVER=1 -DEVSERVER_FORK=1  -DDISCARDMONGO=1  
+executable.debugpgserver=../BINARIES/ChatScriptpgDebug
+debugpgserver: DEFINES+= -DLOCKUSERFILE=1  -DDEBUG -DEVSERVER=1 -DEVSERVER_FORK=1  -DDISCARDMONGO=1 -DDISCARDMYSQL=1
 debugpgserver: PGLOAD= -lpq -pthread
-debugpgserver: INCLUDEDIRS=-Ievserver
-debugpgserver: all
-debugpgserver: EXECUTABLE=../BINARIES/ChatScriptpgDebug
+debugpgserver: INCLUDEDIRS=-Ievserver -Ipostgres 
+debugpgserver: binary
+debugpgserver: EXECUTABLE=$(executable.debugpgserver)
 debugpgserver: CFLAGS=-c -std=c++11 -Wall  -funsigned-char  -Wno-write-strings -Wno-char-subscripts -Wno-strict-aliasing -g
 
+executable.mysqlserver=../BINARIES/ChatScriptMysql
+mysqlserver: DEFINES+= -DLOCKUSERFILE=1 -DEVSERVER=1 -DEVSERVER_FORK=1 -DDISCARDPOSTGRES=1 -DDISCARDMONGO=1
+mysqlserver: PGLOAD= -lmysqlclient -pthread
+mysqlserver: binary
+mysqlserver: EXECUTABLE=$(executable.mysqlserver)
+mysqlserver: INCLUDEDIRS=-Ievserver 
+mysqlserver: CFLAGS=-c -std=c++11 -Wall  -funsigned-char  -Wno-write-strings -Wno-char-subscripts -Wno-strict-aliasing 
+
+executable.debugmysqlserver=../BINARIES/ChatScriptMysqlDebug
+debugmysqlserver: DEFINES+= -DLOCKUSERFILE=1  -DDEBUG -DEVSERVER=1 -DEVSERVER_FORK=1 -DDISCARDPOSTGRES=1 -DDISCARDMONGO=1  
+debugmysqlserver: PGLOAD= -lmysqlclient -pthread 
+debugmysqlserver: INCLUDEDIRS=-Ievserver
+debugmysqlserver: binary
+debugmysqlserver: EXECUTABLE=$(executable.debugmysqlserver)
+debugmysqlserver: CFLAGS=-c -std=c++11 -Wall  -funsigned-char  -Wno-write-strings -Wno-char-subscripts -Wno-strict-aliasing -g
+
+executable.mongoserver=../BINARIES/ChatScriptMongo
 mongoserver: DEFINES+= -DLOCKUSERFILE=1 -DEVSERVER=1 -DEVSERVER_FORK=1 -DDISCARDPOSTGRES=1 -DDISCARDMYSQL=1
 mongoserver: PGLOAD= -pthread
-mongoserver: all
-mongoserver: EXECUTABLE=../BINARIES/ChatScriptMongo
+mongoserver: binary
+mongoserver: EXECUTABLE=$(executable.mongoserver)
 mongoserver: INCLUDEDIRS=-Iinclude -I/usr/local/include/libbson-1.0 -I/usr/local/include/libmongoc-1.0
 mongoserver: CFLAGS=-c -std=c++11  -Wall  -funsigned-char  -Wno-write-strings -Wno-char-subscripts -Wno-strict-aliasing -g
 
+executable.debugmongoserver=../BINARIES/ChatScriptMongoDebug
 debugmongoserver: DEFINES+= -DLOCKUSERFILE=1  -DDEBUG -DEVSERVER=1 -DEVSERVER_FORK=1  -DDISCARDPOSTGRES=1  -DDISCARDMYSQL=1
 debugmongoserver: PGLOAD= -lpq -pthread
-debugmongoserver: all
+debugmongoserver: binary
 debugmongoserver: INCLUDEDIRS=-Iinclude -I/usr/local/include/libbson-1.0 -I/usr/local/include/libmongoc-1.0
-debugmongoserver: EXECUTABLE=../BINARIES/ChatScriptMongoDebug
+debugmongoserver: EXECUTABLE=$(executable.debugmongoserver)
 debugmongoserver: CFLAGS=-c -std=c++11 -Wall  -funsigned-char  -Wno-write-strings -Wno-char-subscripts -Wno-strict-aliasing -g
 
+executable.foreignserver=../BINARIES/ChatScriptForeign
 foreignserver: DEFINES+= -DLOCKUSERFILE=1  -DEVSERVER=1 -DEVSERVER_FORK=1  -DDISCARDPOSTGRES=1 -DDISCARDMONGO=1 -DDISCARDMYSQL=1 -DTREETAGGER=1
 foreignserver: PGLOAD= -pthread -L../treetagger -L../BINARIES -ltreetagger
 foreignserver: INCLUDEDIRS=-Ievserver
-foreignserver: all
-foreignserver: EXECUTABLE=../BINARIES/ChatScriptForeign
+foreignserver: binary
+foreignserver: EXECUTABLE=$(executable.foreignserver)
 foreignserver: CFLAGS=-c -std=c++11 -Wall  -funsigned-char  -Wno-write-strings -Wno-char-subscripts -Wno-strict-aliasing 
 
+executable.mongotreetaggerserver=../BINARIES/ChatScriptMongoForeign
 mongotreetaggerserver: DEFINES+= -DLOCKUSERFILE=1  -DEVSERVER=1 -DEVSERVER_FORK=1  -DDISCARDPOSTGRES=1  -DDISCARDMYSQL=1 -DTREETAGGER=1
 mongotreetaggerserver: PGLOAD= -pthread -L../treetagger -L../BINARIES -ltreetagger
 mongotreetaggerserver: INCLUDEDIRS=-Iinclude -I/usr/local/include/libbson-1.0 -I/usr/local/include/libmongoc-1.0
-mongotreetaggerserver: all
-mongotreetaggerserver: EXECUTABLE=../BINARIES/ChatScriptMongoForeign
+mongotreetaggerserver: binary
+mongotreetaggerserver: EXECUTABLE=$(executable.mongotreetaggerserver)
 mongotreetaggerserver: CFLAGS=-c -std=c++11 -Wall  -funsigned-char  -Wno-write-strings -Wno-char-subscripts -Wno-strict-aliasing 
 
 UNAME := $(shell uname)
@@ -93,16 +129,27 @@ debugmongoserver: LDFLAGS+= -lgcrypt -lsasl2 -lmongoc-1.0 -lbson-1.0
 mongotreetaggerserver: LDFLAGS+= -lgcrypt -lsasl2 -lmongoc-1.0 -lbson-1.0 
 endif
 
-SOURCES=constructCode.cpp duktape/duktape.c evserver.cpp csocket.cpp cs_ev.c dictionarySystem.cpp englishTagger.cpp factSystem.cpp json.cpp functionExecute.cpp english.cpp infer.cpp javascript.cpp jsmn.cpp markSystem.cpp mongodb.cpp os.cpp outputSystem.cpp patternSystem.cpp postgres.cpp privatesrc.cpp scriptCompile.cpp spellcheck.cpp secure.cpp systemVariables.cpp tagger.cpp testing.cpp textUtilities.cpp tokenSystem.cpp topicSystem.cpp userCache.cpp userSystem.cpp variableSystem.cpp mainSystem.cpp 
+SOURCES=constructCode.cpp duktape/duktape.c evserver.cpp csocket.cpp cs_ev.c dictionarySystem.cpp englishTagger.cpp factSystem.cpp json.cpp functionExecute.cpp english.cpp infer.cpp javascript.cpp jsmn.cpp markSystem.cpp mysql.cpp mongodb.cpp os.cpp outputSystem.cpp patternSystem.cpp postgres.cpp privatesrc.cpp scriptCompile.cpp spellcheck.cpp secure.cpp systemVariables.cpp tagger.cpp testing.cpp textUtilities.cpp tokenSystem.cpp topicSystem.cpp userCache.cpp userSystem.cpp variableSystem.cpp mainSystem.cpp 
 OBJECTS=$(SOURCES:.cpp=.o)
- 
-all: $(SOURCES) binary
+
+default: server
 
 clean:
-	-rm -f $(EXECUTABLE)
-	-rm -f ../$(EXECUTABLE)
 	-rm -f *.o
 
+cleanall: clean
+	-rm -f $(executable.server)
+	-rm -f $(executable.debugserver)
+	-rm -f $(executable.standalone)
+	-rm -f $(executable.pgserver)
+	-rm -f $(executable.debugpgserver)
+	-rm -f $(executable.mysqlserver)
+	-rm -f $(executable.debugmysqlserver)
+	-rm -f $(executable.mongoserver)
+	-rm -f $(executable.debugmongoserver)
+	-rm -f $(executable.foreignserver)
+	-rm -f $(executable.mongotreetaggerserver)
+
 binary: $(OBJECTS)
 	$(CC) $(OBJECTS) $(LDFLAGS) $(DEFINES) $(INCLUDEDIRS) -o $(EXECUTABLE)
 

SRC/common.h

@@ -25,7 +25,7 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 //#define DISCARDMONGO 1
 //#define DISCARDJSONOPEN 1 
 //#define DISCARDJAVASCRIPT 1
-#define DISCARDMYSQL 1
+//#define DISCARDMYSQL 1
 
 // these can add components
 //#define  TREETAGGER 1
@@ -220,4 +220,4 @@ using namespace std;
     #define GetCurrentDir getcwd
 #endif
 
-#endif
+#endif

SRC/evserver.cpp

@@ -72,6 +72,7 @@ ev_io ev_accept_r_g;
 ev_timer tt_g;
 
 bool postgresInited = false;
+bool mysqlInited = false;
 
 #ifdef EVSERVER_FORK
 // child monitors
@@ -622,6 +623,14 @@ int evsrv_do_chat(Client_t *client)
 		postgresInited = true;
 	}
 #endif
+#ifndef DISCARDMYSQL
+	if (mysqlconf && !mysqlInited)
+	{
+		MySQLUserFilesCode(); //Forked must hook uniquely AFTER forking
+		mysqlInited = true;
+	}
+#endif
+
 	if (!client->data) 	client->data = (char*) malloc(outputsize);
 	if (!client->data) printf("Malloc failed for child data\r\n");
 

SRC/mainSystem.cpp

@@ -624,6 +624,66 @@ static void ProcessArgument(char* arg)
 	else if (!strnicmp(arg,(char*)"english=",8) )  strcpy(languageFolder,arg+8);
 #ifndef DISCARDPOSTGRES
 	else if (!strnicmp(arg,(char*)"pguser=",7) )  strcpy(postgresparams, arg+7);
+	// Postgres Override SQL
+	else if (!strnicmp(arg,(char*)"pguserread=",11) )
+	{
+		strcpy(postgresuserread, arg+11);
+		pguserread = postgresuserread;
+	}
+	else if (!strnicmp(arg,(char*)"pguserinsert=",13) )
+	{
+		strcpy(postgresuserinsert, arg+13);
+		pguserinsert = postgresuserinsert;
+	}
+	else if (!strnicmp(arg,(char*)"pguserupdate=",13) )
+	{
+		strcpy(postgresuserupdate, arg+13);
+		pguserupdate = postgresuserupdate;
+	}
+#endif
+#ifndef DISCARDMYSQL
+	else if (!strnicmp(arg,(char*)"mysqlhost=",10) )
+	{
+		mysqlconf = true;
+		strcpy(mysqlhost, arg+10);
+	}
+	else if (!strnicmp(arg,(char*)"mysqlport=",10) )
+	{
+		mysqlconf = true;
+		unsigned int port = atoi(arg+10);
+		mysqlport = port;
+	}
+	else if (!strnicmp(arg,(char*)"mysqldb=",8) )
+	{
+		mysqlconf = true;
+		strcpy(mysqldb, arg+8);
+	}
+	else if (!strnicmp(arg,(char*)"mysqluser=",10) )
+	{
+		mysqlconf = true;
+		strcpy(mysqluser, arg+10);
+	}
+	else if (!strnicmp(arg,(char*)"mysqlpasswd=",12) )
+	{
+		mysqlconf = true;
+		strcpy(mysqlpasswd, arg+12);
+	}
+	// MySQL Query Override SQL
+	else if (!strnicmp(arg,(char*)"mysqluserread=",14) )
+	{
+		strcpy(my_userread_sql, arg+14);
+		mysql_userread = my_userread_sql;
+	}
+	else if (!strnicmp(arg,(char*)"mysqluserinsert=",16) )
+	{
+		strcpy(my_userinsert_sql, arg+16);
+		mysql_userinsert = my_userinsert_sql;
+	}
+	else if (!strnicmp(arg,(char*)"mysqluserupdate=",16) )
+	{
+		strcpy(my_userupdate_sql, arg+16);
+		mysql_userupdate = my_userupdate_sql;
+	}
 #endif
 #ifndef DISCARDMONGO
 	else if (!strnicmp(arg,(char*)"mongo=",6) )  strcpy(mongodbparams,arg+6);

SRC/my_sql.h

@@ -15,13 +15,29 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #endif
 
 #ifndef DISCARDMYSQL
-void MySQLShutDown();
+
+extern bool mysqlconf;
+extern char mysqlhost[300];
+extern unsigned int mysqlport;
+extern char mysqldb[300];
+extern char mysqluser[300];
+extern char mysqlpasswd[300];
+
+extern char *mysql_userread;
+extern char *mysql_userinsert;
+extern char *mysql_userupdate;
+extern char my_userread_sql[300];
+extern char my_userinsert_sql[300];
+extern char my_userupdate_sql[300];
+
 void MySQLUserFilesCode();
+void MySQLShutDown();
 void MySQLserFilesCloseCode();
 extern char* mySQLparams;
+
 FunctionResult MySQLInitCode(char* buffer);
 FunctionResult MySQLCloseCode(char* buffer);
 FunctionResult MySQLExecuteCode(char* buffer);
 #endif
 
-#endif
+#endif