Major Bugs Fixed; v1.1.1

Author: chmuhammadsohaib

NHXDB/NHXDB.py

@@ -28,6 +28,7 @@ def __init__(self):
 			self.cwd = os.getcwd()
 			self.initialized = True
 			self.permissions = True
+			self.pop = False
 		except PermissionError:
 			self.permissions = False
 			self.initialized = False
@@ -297,8 +298,8 @@ def create_table(self, structure, override=False):
 			else:
 				buff.update({"null": False})
 			if "default" in field and (((type(field["default"]) == int and field["type"] != "int") or (type(field["default"]) == str and field["type"] != "str") or (type(field["default"]) == bool and field["type"] != "bool") or (type(field["default"]) == float and field["type"] != "float")) or (len(str(field["default"])) > buff["length"])):
-				# Returns status code 511 = Invalid default values for Field
-				return self.returner(511)
+				# Returns status code 510 = Invalid default values for Field
+				return self.returner(510)
 			elif "default" in field and ("ai" not in field or field["ai"] != True):
 				buff.update({"default": field["default"]})
 			else:
@@ -337,9 +338,9 @@ def drop_table(self, table_name):
 		if type(table_name) != str:
 			return self.returner(300)
 		os.chdir("./NHX_DB_Dat/" + self.logged_DB + "/tables/")
-		if os.path.exists(table_name) != True:
+		if os.path.exists(table_name.lower()) != True:
 			return self.returner(404)
-		shutil.rmtree(table_name)
+		shutil.rmtree(table_name.lower())
 		return self.returner(200)
 
 
@@ -421,8 +422,8 @@ def alter_table(self, values):
 				else:
 					buff.update({"null": False})
 				if "default" in field and (((type(field["default"]) == int and field["type"] != "int") or (type(field["default"]) == str and field["type"] != "str") or (type(field["default"]) == bool and field["type"] != "bool") or (type(field["default"]) == float and field["type"] != "float")) or (len(str(field["default"])) > buff["length"])):
-					# Returns status code 511 = Invalid default values for Field
-					return self.returner(511)
+					# Returns status code 510 = Invalid default values for Field
+					return self.returner(510)
 				elif "default" in field and ("ai" not in field or field["ai"] != True):
 					buff.update({"default": field["default"]})
 				else:
@@ -462,28 +463,33 @@ def alter_table(self, values):
 			for field in values["fields"]:
 				if type(field) != str:
 					return self.returner(300)
+			initial_dir = os.getcwd()
+			to_edit = {}
+			for field in values["fields"]:
+				to_edit.update({field: None})
+			self.pop = True
+			status_code = self.update_data(values["table_name"], {"fields": to_edit, "criteria": "*"})
+			self.pop = False
+			if status_code != 200:
+				return self.returner(status_code)
+			os.chdir(initial_dir)
 			with open("config.NHX", "r+", newline="") as file:
 				reader = csv.reader(file, delimiter="|")
 				for index, row in enumerate(reader):
 					if index == 0:
 						fields = row
 			for field in fields:
 				field = literal_eval(field)
-				flagged = True
 				if field["name"].lower() in to_drop:
-					flagged = False
 					pass
 				else:
 					to_update.append(field)
-			if flagged:
-				# Returns status Code 509 = Cannot drop a field already not in Table
-				return self.returner(509)
 			with open("config.NHX", "w+", newline='') as file:
 				writer = csv.writer(file, delimiter='|')
 				writer.writerow(to_update)
 		else:
-			# Returns status code 510 = Unsupported Operation
-			return self.returner(510)
+			# Returns status code 509 = Unsupported Operation
+			return self.returner(509)
 		return self.returner(200)
 
 
@@ -598,6 +604,8 @@ def update_data(self, table_name, values):
 			return self.returner(304)
 		if type(table_name) != str or type(values) != dict:
 			return self.returner(300)
+		if "fields" not in values or "criteria" not in values:
+			return self.returner(302)
 		if os.getcwd() != self.cwd:
 			os.chdir(self.cwd)
 		if os.path.exists("./NHX_DB_Dat/" + self.logged_DB + "/tables/" + table_name.lower()) == False:
@@ -622,31 +630,50 @@ def update_data(self, table_name, values):
 			else:
 				nindexread.append(field["name"].lower())
 		flagged = True
-		if "criteria" not in values or values["criteria"] == "*":
+		if values["criteria"] == "*":
 			for field in fields:
 				field = literal_eval(field)
 				if field["name"] in to_alter:
-					if field["attribute"] == "primary" or field["attribute"] == "unique":
-						return self.returner(603)
+					if self.pop != True:
+						if field["attribute"] == "primary" or field["attribute"] == "unique":
+							return self.returner(603)
+						if (field["null"] == False) and (values["fields"][field["name"]] == "" or values["fields"][field["name"]] == None) and (field["ai"] == False and field["default"] == None):
+							return self.returner(600)
+						if len(str(values["fields"][field["name"]])) > field["length"]:
+							return self.returner(602)
+						if (field["type"].lower() == "int" and type(values["fields"][field["name"]]) != int) or (field["type"] == "float" and type(values["fields"][field["name"]]) != float) or (field["type"] == "str" and type(values["fields"][field["name"]]) != str) or ((field["type"] == "bool" and type(values["fields"][field["name"]]) != bool)):
+							return self.returner(601)
 					flagged = False
 					to_up = []
 					if field["attribute"] != None:
 						with open("index.NHX", "r+", newline='') as file:
 							reader = csv.DictReader(file, fieldnames=indexread, delimiter="|")
 							for index, row in enumerate(reader):
-								row.update({field["name"] : values["fields"][field["name"]]})
-								to_up.append(row)
+								if self.pop and field["name"] in values["fields"]:
+									row.pop(field["name"])
+									to_up.append(row)
+								else:
+									row.update({field["name"] : values["fields"][field["name"]]})
+									to_up.append(row)
 						with open("index.NHX", "w+", newline='') as file:
+							if self.pop:
+								indexread.remove(field["name"])
 							writer = csv.DictWriter(file, fieldnames=indexread, delimiter="|")
 							for index, row in enumerate(to_up):
 								writer.writerow(row)
 					else:
 						with open("nindex.NHX", "r+", newline='') as file:
 							reader = csv.DictReader(file, fieldnames=nindexread, delimiter="|")
 							for index, row in enumerate(reader):
-								row.update({field["name"] : values["fields"][field["name"]]})
-								to_up.append(row)
+								if self.pop and field["name"] in values["fields"]:
+									row.pop(field["name"])
+									to_up.append(row)
+								else:
+									row.update({field["name"] : values["fields"][field["name"]]})
+									to_up.append(row)
 						with open("nindex.NHX", "w+", newline='') as file:
+							if self.pop:
+								nindexread.remove(field["name"])
 							writer = csv.DictWriter(file, fieldnames=nindexread, delimiter="|")
 							for index, row in enumerate(to_up):
 								writer.writerow(row)
@@ -827,7 +854,6 @@ def update_data(self, table_name, values):
 							reader = csv.DictReader(file, delimiter="|", fieldnames=indexread)
 							flagged = False
 							for row in reader:
-								print(fieldx, values, row)
 								if str(values["fields"][fieldx["name"].lower()]) == str(row[fieldx["name"]]):
 									flag = True
 									break
@@ -1100,7 +1126,18 @@ def select_data(self, table_name, criteria):
 				reader = csv.DictReader(file, delimiter="|", fieldnames=nindexread)
 				for row in reader:
 					nindexlines.append(row)
-			tout = indexlines + nindexlines
+			tout = []
+			try:
+				nindexlines[0]
+			except IndexError:
+				return self.returner(indexlines)
+			try:
+				indexlines[0]
+			except IndexError:
+				return self.returner(nindexlines)
+			for index, row in enumerate(indexlines):
+				row.update(nindexlines[index])
+				tout.append(row)
 			return self.returner(tout)
 		if criteria != "*":
 			splitted = []

README.md

@@ -210,9 +210,8 @@ Since this Database is designed to be as developer friendly as possible, we beli
 | 506 | Cannot create two fields with same name
 | 507 | Cannot have length more than 255 for int and more than 16384 for str
 | 508 | Cannot have bool type in an attributed field
-| 509 | Cannot drop a field already not in table
-| 510 | Unsupported Operation
-| 511 | Invalid Default values for Field
+| 509 | Unsupported Operation
+| 510 | Invalid Default values for Field
 | 600 | Values for a non Null field is not specified
 | 601 | Values provided do not match their types
 | 602 | Values provided are longer than the size allocated
@@ -228,10 +227,4 @@ Since this Database is designed to be as developer friendly as possible, we beli
 
 > Key: 1xx is Database Setting Up, 200 is Success, 3xx is Database related error, 404 is not found error for any, 5xx is Table related Error, 6xx is data related error, and 700 is Internal error. (Approximately)
 
-License
-----
-
-MIT
-
-
 **Found it useful? Go, install the module and get started!**

checker.py

@@ -43,16 +43,16 @@
 dropx = {
 	"table_name": "NHX",
 	"operation": "drop",
-	"fields": ["hq"]
+	"fields": ["true"]
 	}
 datax = {
-	"true": "afehsdufsr",
-	"hq": 131,
-	"password": 97127
+	"true": "dsadsaddsa",
+	"hq": 1331,
+	"password": 9714227
 	}
 criteria = {
 	"fields": {
-		"name": "SomethfsfsjfgdingDIFF",
+		"true": "SomethfsfsjfgdingDIFF",
 		"password": 12164342113,
 		"hq": 101
 		},

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="NHXDB",
-    version="v1.1.0",
+    version="v1.1.1",
     author="Ch. Muhammad Sohaib",
     author_email="chmuhammadsohaib@gmail.com",
     description="A lightweight Database Module with a blend of SQL Language and ORM syntax",