From 8758bbf35919c9764971c472c43bf1929685f89b Mon Sep 17 00:00:00 2001 From: Murali Nandigama Date: Wed, 7 Apr 2010 14:28:37 -0700 Subject: [PATCH] changed tables to MyIASM --- unittest-logs/dbschema.py | 8 +-- unittest-logs/dbschema.pyc | Bin 1144 -> 1185 bytes unittest-logs/dbschema.py~ | 74 +++++++++++++++++++++++++ unittest-logs/unittestweb/settings.py | 2 +- unittest-logs/unittestweb/settings.py~ | 2 +- 5 files changed, 80 insertions(+), 6 deletions(-) create mode 100755 unittest-logs/dbschema.py~ diff --git a/unittest-logs/dbschema.py b/unittest-logs/dbschema.py index 67aaf29..9e41757 100755 --- a/unittest-logs/dbschema.py +++ b/unittest-logs/dbschema.py @@ -54,21 +54,21 @@ def CreateDBSchema(conn): conn.execute(""" - CREATE TABLE IF NOT EXISTS trees( id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, name TEXT) + CREATE TABLE IF NOT EXISTS trees( id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, name TEXT) ENGINE MyISAM """) conn.execute(""" - CREATE TABLE IF NOT EXISTS builds(id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, treeid INT, os INT, starttime INT, status INT, changeset TEXT, logfile TEXT) + CREATE TABLE IF NOT EXISTS builds(id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, treeid INT, os INT, starttime INT, status INT, changeset TEXT, logfile TEXT) ENGINE MyISAM """) conn.execute(""" CREATE INDEX builds_starttime ON builds (starttime) """) conn.execute(""" - CREATE TABLE IF NOT EXISTS tests (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, buildid INT, name TEXT, description TEXT) + CREATE TABLE IF NOT EXISTS tests (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, buildid INT, name TEXT, description TEXT) ENGINE MyISAM """) conn.execute(""" - CREATE INDEX tests_name ON tests (name(1024)) + CREATE INDEX tests_name ON tests (name(255)) """) diff --git a/unittest-logs/dbschema.pyc b/unittest-logs/dbschema.pyc index 87f5079d488077618aa758416207e463426e1c13..4ceb0387e2d373735e93d055cbe889a79ef8025d 100644 GIT binary patch delta 140 zcmeytv5=GP;wN4%!5D{py2A~?&;^M;9Kb#?C8s-fC`F_0~P8` op21kphpKS0I8z4WQlMlPArpLnilio+F)J_|nVN2nVwPhB00PS-#Q*>R delta 94 zcmZ3;`GbS);wN4%`P~!Qo-tNTe48!ArGN^GcTRk(H+dOj{bXaN494jb-|A03%@mEP X%y;5jsmTe<3M_^OMkbq^ndKM(jQbmo diff --git a/unittest-logs/dbschema.py~ b/unittest-logs/dbschema.py~ new file mode 100755 index 0000000..67aaf29 --- /dev/null +++ b/unittest-logs/dbschema.py~ @@ -0,0 +1,74 @@ + +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is TopFails site code. +# +# The Initial Developer of the Original Code is +# Mozilla foundation +# Portions created by the Initial Developer are Copyright (C) 2010 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# Serge Gautherie +# Ted Mielczarek . +# Murali Nandigama +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 2 or later (the "GPL"), or +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + +# +# DB schema maintenance functions. +# + +import logging + +__all__ = \ + [ + "CreateDBSchema" + ] + +def CreateDBSchema(conn): + logging.info("Executing CreateDBSchema()") + + + conn.execute(""" + CREATE TABLE IF NOT EXISTS trees( id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, name TEXT) + """) + + conn.execute(""" + CREATE TABLE IF NOT EXISTS builds(id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, treeid INT, os INT, starttime INT, status INT, changeset TEXT, logfile TEXT) + """) + conn.execute(""" + CREATE INDEX builds_starttime ON builds (starttime) + """) + + conn.execute(""" + CREATE TABLE IF NOT EXISTS tests (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, buildid INT, name TEXT, description TEXT) + """) + conn.execute(""" + CREATE INDEX tests_name ON tests (name(1024)) + """) + + diff --git a/unittest-logs/unittestweb/settings.py b/unittest-logs/unittestweb/settings.py index 95245b4..71c2b47 100755 --- a/unittest-logs/unittestweb/settings.py +++ b/unittest-logs/unittestweb/settings.py @@ -12,7 +12,7 @@ MANAGERS = ADMINS DATABASE_ENGINE = 'mysql' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. DATABASE_NAME = 'topfailsdb' # Or path to database file if using sqlite3. DATABASE_USER = 'root' # Not used with sqlite3. -DATABASE_PASSWORD = '' # Not used with sqlite3. +DATABASE_PASSWORD = 'mkngama' # Not used with sqlite3. DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3. DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3. diff --git a/unittest-logs/unittestweb/settings.py~ b/unittest-logs/unittestweb/settings.py~ index 71c2b47..95245b4 100755 --- a/unittest-logs/unittestweb/settings.py~ +++ b/unittest-logs/unittestweb/settings.py~ @@ -12,7 +12,7 @@ MANAGERS = ADMINS DATABASE_ENGINE = 'mysql' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. DATABASE_NAME = 'topfailsdb' # Or path to database file if using sqlite3. DATABASE_USER = 'root' # Not used with sqlite3. -DATABASE_PASSWORD = 'mkngama' # Not used with sqlite3. +DATABASE_PASSWORD = '' # Not used with sqlite3. DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3. DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3.