New database scheme, storing key name inside tables for improving searching

[mojodb.git] / MySQL.py

diff --git a/MySQL.py b/MySQL.py
index 76f7312ef1dc8e74db64e6ebdc8f86e84751e6cc..e983a670fa957f2d082f21b6c41a729512a05716 100644 (file)
--- a/MySQL.py
+++ b/MySQL.py
@@ -19,21 +19,94 @@
 #
 ##############################################################################
 
-import mojo
+import dbutils
+import connection
 import MySQLdb
 
-class Connection(mojo.Connection):
+SQL_FIELD_TYPES = {
+    'char': 'VARCHAR',
+    'text': 'LONGTEXT',
+    'float': 'DOUBLE',
+    }
+
+
+class Query(dbutils.Query):
+    def sql(self):
+        res = "SELECT "
+        res += ",".join(["(%s)" % f.sql() for f in self.fields])
+
+        res += " FROM "
+        res += ",".join([t.sql() for t in self.tables])
+
+        if self.constraints:
+            res += " WHERE "
+            res += " AND ".join(["(%s)" % c.sql() for c in self.constraints])
+
+        return res
+
+
+class Field(dbutils.Field):
+    def sql(self):
+        return "%s.`%s`" % (self.table.sql(), self.field_name)
+
+
+class Table(dbutils.Table):
+    def sql(self):
+        return "`%s`.`%s`" % (self.db_name, self.table_name)
+
+
+class Constraint(dbutils.Constraint):
+    def sql(self):
+        operator = self.operator.strip().lower()
+        if operator == "starts":
+            return "(%s) LIKE (%s)" % (self.args[0].sql(), self.args[1].sql()[:-1] + "%'")
+        elif operator == "in":
+            return "(%s) IN (%s)" % (self.args[0].sql(), ",".join(["(%s)" % a.sql() for a in self.args[1:]]))
+        elif operator == "=":
+            return "(%s) = (%s)" % (self.args[0].sql(), self.args[1].sql())
+        else:
+            token = " %s " % operator.upper()
+            return token.join(["(%s)" % a.sql() for a in self.args])
+
+
+class Literal(dbutils.Literal):
+    def sql(self):
+        if type(self.value) in (int, float):
+            return "%s" % self.value
+        else:
+            return "'%s'" % str(self.value).replace("'", "''")
+
+
+class Connection(connection.Connection):
+    Query = Query
+    Field = Field
+    Table = Table
+    Constraint = Constraint
+    Literal = Literal
+
     def __init__(self, *args, **kwargs):
         self._db_con = MySQLdb.connect(*args, **kwargs)
+        self._db_con_autocommit = MySQLdb.connect(*args, **kwargs)
 
-    def query(self, sql):
-        cur = self._db_con.cursor()
+    def query(self, sql, db=None):
+        if db is None:
+            db = self._db_con
+        cur = db.cursor()
         cur.execute(sql)
         res = cur.fetchall()
         cur.close()
         cur = None
         return res
 
+    def execute(self, sql, db=None):
+        if db is None:
+            db = self._db_con
+        cur = db.cursor()
+        res = cur.execute(sql)
+        cur.close()
+        cur = None
+        return res
+
     def _get_databases(self):
         return [x[0] for x in self.query("SHOW DATABASES")]
 
@@ -43,34 +116,57 @@ class Connection(mojo.Connection):
     def _count_rows(self, db_name, table_name):
         return self.query("SELECT COUNT(*) FROM `%s`.`%s`" % (db_name, table_name))[0][0]
 
-    def _get_sql_field(self, db_name, field):
-        if type(field) is tuple:
-            return "`%s`.`%s`.`%s`" % (db_name, field[0], field[1])
-        elif type(field) is dict:
-            return "(%s)" % self._get_sql_query(db_name, field)
-        else:
-            return str(field)
-        
-    def _get_sql_query(self, db_name, query):
-        sql = "SELECT "
-        sql += ",".join([self._get_sql_field(db_name, x) for x in query['select']])
+    def _create_database(self, db_name):
+        return (self.execute("CREATE DATABASE `%s`" % db_name, db=self._db_con_autocommit) or False) and True
+
+    def _get_sql_field_type(self, field_type):
+        return SQL_FIELD_TYPES.get(field_type, "UNKNOW")
+
+    def _create_table(self, db_name, table_name, fields):
+        primary = []
+        sql = "CREATE TABLE `%s`.`%s` (" % (db_name, table_name)
+
+        sql_fields = []
+        for f in fields:
+            sql_field = "%s %s" % (f['name'], self._get_sql_field_type(f['type']))
+            if f.get('size'):
+                sql_field += "(%s)" % f['size']
+            if f.get('primary'):
+                primary.append(f['name'])
+            if 'null' in f and not f['null']:
+                sql_field += " NOT NULL"
+            sql_fields.append(sql_field)
+        sql += ",".join(sql_fields)
 
-        sql += " FROM "
-        sql += ",".join(query['from'])
+        if primary:
+            sql += ", PRIMARY KEY(%s)" % ",".join(primary)
 
-        if query.get('where'):
-            sql += " WHERE "
-            where = []
-            for cond in query['where']:
-                where.append("%s %s %s" % (self._get_sql_field(db_name, cond[0]), cond[1], self._get_sql_field(db_name, cond[2])))
-            sql += " AND ".join(where)
+        sql += ")"
 
-        return sql
+        return (self.execute(sql, db=self._db_con_autocommit) or False) and True
 
-    def _get_cursor(self, db_name, query):
+    def _get_cursor(self, query):
         cur = self._db_con.cursor()
-        cur.execute(self._get_sql_query(db_name, query))
+        cur.execute(query.sql())
         return cur
 
     def _next(self, cur):
         return cur.fetchone()
+
+    def _insert(self, db_name, table_name, values):
+        keys = []
+        vals = []
+        for k, v in values.iteritems():
+            keys.append(k)
+            if type(v) is str:
+                vals.append("'%s'" % v.replace("'", "''"))
+            else:
+                vals.append(str(v))
+        sql = "INSERT INTO `%s`.`%s`(%s) VALUES (%s)" % (db_name, table_name, ",".join(keys), ",".join(vals))
+        return self.execute(sql)
+
+    def commit(self):
+        self._db_con.commit()
+
+    def rollback(self):
+        self._db_con.rollback()