Mercurial > p > roundup > code


  
3476


1142dafe0d7f
added setorderprop() and setlabelprop() to Class (lots of patches)

Richard Jones <richard@users.sourceforge.net>
parents: 
3458
diff
changeset


     1 #$Id: back_mysql.py,v 1.64 2006-01-20 02:40:56 richard Exp $


1415


6883852e9b15
mysql backend passes all tests (at last!)

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1375
diff
changeset


     2 #


1433


8429095241d7
mysql tests will not be run if there is no chance of passing.

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1415
diff
changeset


     3 # Copyright (c) 2003 Martynas Sklyzmantas, Andrey Lebedev <andrey@micro.lt>


1415


6883852e9b15
mysql backend passes all tests (at last!)

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1375
diff
changeset


     4 #


6883852e9b15
mysql backend passes all tests (at last!)

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1375
diff
changeset


     5 # This module is free software, and you may redistribute it and/or modify


6883852e9b15
mysql backend passes all tests (at last!)

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1375
diff
changeset


     6 # under the same terms as Python, so long as this copyright message and


6883852e9b15
mysql backend passes all tests (at last!)

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1375
diff
changeset


     7 # disclaimer are retained in their original form.


6883852e9b15
mysql backend passes all tests (at last!)

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1375
diff
changeset


     8 #


2005


fc52d57c6c3e
documentation cleanup

Richard Jones <richard@users.sourceforge.net>
parents: 
1988
diff
changeset


     9 


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


    10 '''This module defines a backend implementation for MySQL.


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


    11 


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


    12 


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


    13 How to implement AUTO_INCREMENT:


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


    14 


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


    15 mysql> create table foo (num integer auto_increment primary key, name


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


    16 varchar(255)) AUTO_INCREMENT=1 type=InnoDB;


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


    17 


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


    18 ql> insert into foo (name) values ('foo5');


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


    19 Query OK, 1 row affected (0.00 sec)


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


    20 


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


    21 mysql> SELECT num FROM foo WHERE num IS NULL;


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


    22 +-----+


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


    23 | num |


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


    24 +-----+


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


    25 |   4 |


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


    26 +-----+


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


    27 1 row in set (0.00 sec)


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


    28 


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


    29 mysql> SELECT num FROM foo WHERE num IS NULL;


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


    30 Empty set (0.00 sec)


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


    31 


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


    32 NOTE: we don't need an index on the id column if it's PRIMARY KEY


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


    33 


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


    34 '''


2005


fc52d57c6c3e
documentation cleanup

Richard Jones <richard@users.sourceforge.net>
parents: 
1988
diff
changeset


    35 __docformat__ = 'restructuredtext'


1415


6883852e9b15
mysql backend passes all tests (at last!)

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1375
diff
changeset


    36 


1375


faf93d3fbf2f
added mysql backend

Richard Jones <richard@users.sourceforge.net>
parents: 
diff
changeset


    37 from roundup.backends.rdbms_common import *


1415


6883852e9b15
mysql backend passes all tests (at last!)

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1375
diff
changeset


    38 from roundup.backends import rdbms_common


1375


faf93d3fbf2f
added mysql backend

Richard Jones <richard@users.sourceforge.net>
parents: 
diff
changeset


    39 import MySQLdb


1434


b953750bdc04
trackers on mysql can be initialised

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1433
diff
changeset


    40 import os, shutil


1375


faf93d3fbf2f
added mysql backend

Richard Jones <richard@users.sourceforge.net>
parents: 
diff
changeset


    41 from MySQLdb.constants import ER


3155


57b60bda9473
Python 2.3 minimum version - bye bye roundup.rlog, you had a short life.

Richard Jones <richard@users.sourceforge.net>
parents: 
3147
diff
changeset


    42 import logging


1375


faf93d3fbf2f
added mysql backend

Richard Jones <richard@users.sourceforge.net>
parents: 
diff
changeset


    43 


2693


59ea85d47d34
add dbnamestr argument to connection_dict...

Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 
2679
diff
changeset


    44 def connection_dict(config, dbnamestr=None):


59ea85d47d34
add dbnamestr argument to connection_dict...

Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 
2679
diff
changeset


    45     d = rdbms_common.connection_dict(config, dbnamestr)


2679


b3f0b7b9d20d
for MySQL connection, password argument is called 'passwd'.

Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 
2634
diff
changeset


    46     if d.has_key('password'):


b3f0b7b9d20d
for MySQL connection, password argument is called 'passwd'.

Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 
2634
diff
changeset


    47         d['passwd'] = d['password']


b3f0b7b9d20d
for MySQL connection, password argument is called 'passwd'.

Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 
2634
diff
changeset


    48         del d['password']


3025


7032b500b7e0
fix port number as int in mysql connection info [SF#1082530]

Richard Jones <richard@users.sourceforge.net>
parents: 
2727
diff
changeset


    49     if d.has_key('port'):


7032b500b7e0
fix port number as int in mysql connection info [SF#1082530]

Richard Jones <richard@users.sourceforge.net>
parents: 
2727
diff
changeset


    50         d['port'] = int(d['port'])


2679


b3f0b7b9d20d
for MySQL connection, password argument is called 'passwd'.

Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 
2634
diff
changeset


    51     return d


b3f0b7b9d20d
for MySQL connection, password argument is called 'passwd'.

Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 
2634
diff
changeset


    52 


1873


f63aa57386b0
Backend improvements.

Richard Jones <richard@users.sourceforge.net>
parents: 
1839
diff
changeset


    53 def db_nuke(config):


f63aa57386b0
Backend improvements.

Richard Jones <richard@users.sourceforge.net>
parents: 
1839
diff
changeset


    54     """Clear all database contents and drop database itself"""


2075


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


    55     if db_exists(config):


2679


b3f0b7b9d20d
for MySQL connection, password argument is called 'passwd'.

Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 
2634
diff
changeset


    56         kwargs = connection_dict(config)


2634


f47ca4541770
Both RDBMS backends now use the same config.ini section, [rdbms].

Richard Jones <richard@users.sourceforge.net>
parents: 
2617
diff
changeset


    57         conn = MySQLdb.connect(**kwargs)


2075


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


    58         try:


2634


f47ca4541770
Both RDBMS backends now use the same config.ini section, [rdbms].

Richard Jones <richard@users.sourceforge.net>
parents: 
2617
diff
changeset


    59             conn.select_db(config.RDBMS_NAME)


2075


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


    60         except:


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


    61             # no, it doesn't exist


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


    62             pass


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


    63         else:


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


    64             cursor = conn.cursor()


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


    65             cursor.execute("SHOW TABLES")


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


    66             tables = cursor.fetchall()


2634


f47ca4541770
Both RDBMS backends now use the same config.ini section, [rdbms].

Richard Jones <richard@users.sourceforge.net>
parents: 
2617
diff
changeset


    67             # stupid MySQL bug requires us to drop all the tables first


2075


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


    68             for table in tables:


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


    69                 command = 'DROP TABLE %s'%table[0]


2075


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


    70                 if __debug__:


3155


57b60bda9473
Python 2.3 minimum version - bye bye roundup.rlog, you had a short life.

Richard Jones <richard@users.sourceforge.net>
parents: 
3147
diff
changeset


    71                     logging.getLogger('hyperdb').debug(command)


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


    72                 cursor.execute(command)


2634


f47ca4541770
Both RDBMS backends now use the same config.ini section, [rdbms].

Richard Jones <richard@users.sourceforge.net>
parents: 
2617
diff
changeset


    73             command = "DROP DATABASE %s"%config.RDBMS_NAME


3155


57b60bda9473
Python 2.3 minimum version - bye bye roundup.rlog, you had a short life.

Richard Jones <richard@users.sourceforge.net>
parents: 
3147
diff
changeset


    74             logging.getLogger('hyperdb').info(command)


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


    75             cursor.execute(command)


2075


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


    76             conn.commit()


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


    77         conn.close()


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


    78 


1873


f63aa57386b0
Backend improvements.

Richard Jones <richard@users.sourceforge.net>
parents: 
1839
diff
changeset


    79     if os.path.exists(config.DATABASE):


f63aa57386b0
Backend improvements.

Richard Jones <richard@users.sourceforge.net>
parents: 
1839
diff
changeset


    80         shutil.rmtree(config.DATABASE)


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


    81 


2075


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


    82 def db_create(config):


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


    83     """Create the database."""


2679


b3f0b7b9d20d
for MySQL connection, password argument is called 'passwd'.

Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 
2634
diff
changeset


    84     kwargs = connection_dict(config)


2634


f47ca4541770
Both RDBMS backends now use the same config.ini section, [rdbms].

Richard Jones <richard@users.sourceforge.net>
parents: 
2617
diff
changeset


    85     conn = MySQLdb.connect(**kwargs)


2075


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


    86     cursor = conn.cursor()


2634


f47ca4541770
Both RDBMS backends now use the same config.ini section, [rdbms].

Richard Jones <richard@users.sourceforge.net>
parents: 
2617
diff
changeset


    87     command = "CREATE DATABASE %s"%config.RDBMS_NAME


3155


57b60bda9473
Python 2.3 minimum version - bye bye roundup.rlog, you had a short life.

Richard Jones <richard@users.sourceforge.net>
parents: 
3147
diff
changeset


    88     logging.getLogger('hyperdb').info(command)


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


    89     cursor.execute(command)


2075


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


    90     conn.commit()


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


    91     conn.close()


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


    92 


1873


f63aa57386b0
Backend improvements.

Richard Jones <richard@users.sourceforge.net>
parents: 
1839
diff
changeset


    93 def db_exists(config):


2075


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


    94     """Check if database already exists."""


2679


b3f0b7b9d20d
for MySQL connection, password argument is called 'passwd'.

Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 
2634
diff
changeset


    95     kwargs = connection_dict(config)


2634


f47ca4541770
Both RDBMS backends now use the same config.ini section, [rdbms].

Richard Jones <richard@users.sourceforge.net>
parents: 
2617
diff
changeset


    96     conn = MySQLdb.connect(**kwargs)


1873


f63aa57386b0
Backend improvements.

Richard Jones <richard@users.sourceforge.net>
parents: 
1839
diff
changeset


    97     try:


2075


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


    98         try:


2634


f47ca4541770
Both RDBMS backends now use the same config.ini section, [rdbms].

Richard Jones <richard@users.sourceforge.net>
parents: 
2617
diff
changeset


    99             conn.select_db(config.RDBMS_NAME)


2075


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


   100         except MySQLdb.OperationalError:


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


   101             return 0


1873


f63aa57386b0
Backend improvements.

Richard Jones <richard@users.sourceforge.net>
parents: 
1839
diff
changeset


   102     finally:


2075


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


   103         conn.close()


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


   104     return 1


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


   105 


1434


b953750bdc04
trackers on mysql can be initialised

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1433
diff
changeset


   106 


1375


faf93d3fbf2f
added mysql backend

Richard Jones <richard@users.sourceforge.net>
parents: 
diff
changeset


   107 class Database(Database):


faf93d3fbf2f
added mysql backend

Richard Jones <richard@users.sourceforge.net>
parents: 
diff
changeset


   108     arg = '%s'


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   109 


3048


d9b4224f955c
merge from maint-0-8

Richard Jones <richard@users.sourceforge.net>
parents: 
3025
diff
changeset


   110     # used by some code to switch styles of query


d9b4224f955c
merge from maint-0-8

Richard Jones <richard@users.sourceforge.net>
parents: 
3025
diff
changeset


   111     implements_intersect = 0


d9b4224f955c
merge from maint-0-8

Richard Jones <richard@users.sourceforge.net>
parents: 
3025
diff
changeset


   112 


1912


2b0ab61db194
fixes for [SF#818339]

Richard Jones <richard@users.sourceforge.net>
parents: 
1911
diff
changeset


   113     # Backend for MySQL to use.


1913


d929c31a3620
clarified minimum version required for MySQL backend (4.0.16)

Richard Jones <richard@users.sourceforge.net>
parents: 
1912
diff
changeset


   114     # InnoDB is faster, but if you're running <4.0.16 then you'll need to


d929c31a3620
clarified minimum version required for MySQL backend (4.0.16)

Richard Jones <richard@users.sourceforge.net>
parents: 
1912
diff
changeset


   115     # use BDB to pass all unit tests.


d929c31a3620
clarified minimum version required for MySQL backend (4.0.16)

Richard Jones <richard@users.sourceforge.net>
parents: 
1912
diff
changeset


   116     mysql_backend = 'InnoDB'


d929c31a3620
clarified minimum version required for MySQL backend (4.0.16)

Richard Jones <richard@users.sourceforge.net>
parents: 
1912
diff
changeset


   117     #mysql_backend = 'BDB'


2082


c091cacdc505
Finished implementation of session and one-time-key stores for RDBMS backends.

Richard Jones <richard@users.sourceforge.net>
parents: 
2077
diff
changeset


   118 


2099


3837257ca9a5
*** empty log message ***

Richard Jones <richard@users.sourceforge.net>
parents: 
2098
diff
changeset


   119     hyperdb_to_sql_datatypes = {


3421


0d9406d14186
MySQL now creates String columns using the TEXT column type

Richard Jones <richard@users.sourceforge.net>
parents: 
3383
diff
changeset


   120         hyperdb.String : 'TEXT',


2099


3837257ca9a5
*** empty log message ***

Richard Jones <richard@users.sourceforge.net>
parents: 
2098
diff
changeset


   121         hyperdb.Date   : 'DATETIME',


3837257ca9a5
*** empty log message ***

Richard Jones <richard@users.sourceforge.net>
parents: 
2098
diff
changeset


   122         hyperdb.Link   : 'INTEGER',


3837257ca9a5
*** empty log message ***

Richard Jones <richard@users.sourceforge.net>
parents: 
2098
diff
changeset


   123         hyperdb.Interval  : 'VARCHAR(255)',


3837257ca9a5
*** empty log message ***

Richard Jones <richard@users.sourceforge.net>
parents: 
2098
diff
changeset


   124         hyperdb.Password  : 'VARCHAR(255)',


2166


cd42c3c7173a
MySQL and Postgresql use BOOL/BOOLEAN for Boolean types

Richard Jones <richard@users.sourceforge.net>
parents: 
2100
diff
changeset


   125         hyperdb.Boolean   : 'BOOL',


2099


3837257ca9a5
*** empty log message ***

Richard Jones <richard@users.sourceforge.net>
parents: 
2098
diff
changeset


   126         hyperdb.Number    : 'REAL',


3837257ca9a5
*** empty log message ***

Richard Jones <richard@users.sourceforge.net>
parents: 
2098
diff
changeset


   127     }


3837257ca9a5
*** empty log message ***

Richard Jones <richard@users.sourceforge.net>
parents: 
2098
diff
changeset


   128 


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   129     hyperdb_to_sql_value = {


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   130         hyperdb.String : str,


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   131         # no fractional seconds for MySQL


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   132         hyperdb.Date   : lambda x: x.formal(sep=' '),


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   133         hyperdb.Link   : int,


2217


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   134         hyperdb.Interval  : str,


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   135         hyperdb.Password  : str,


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   136         hyperdb.Boolean   : int,


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   137         hyperdb.Number    : lambda x: x,


2244


ac4f295499a4
fixed journal marshalling in RDBMS backends [SF#943627]

Richard Jones <richard@users.sourceforge.net>
parents: 
2240
diff
changeset


   138         hyperdb.Multilink : lambda x: x,    # used in journal marshalling


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   139     }


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   140 


2082


c091cacdc505
Finished implementation of session and one-time-key stores for RDBMS backends.

Richard Jones <richard@users.sourceforge.net>
parents: 
2077
diff
changeset


   141     def sql_open_connection(self):


2693


59ea85d47d34
add dbnamestr argument to connection_dict...

Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 
2679
diff
changeset


   142         kwargs = connection_dict(self.config, 'db')


3155


57b60bda9473
Python 2.3 minimum version - bye bye roundup.rlog, you had a short life.

Richard Jones <richard@users.sourceforge.net>
parents: 
3147
diff
changeset


   143         logging.getLogger('hyperdb').info('open database %r'%(kwargs['db'],))


2082


c091cacdc505
Finished implementation of session and one-time-key stores for RDBMS backends.

Richard Jones <richard@users.sourceforge.net>
parents: 
2077
diff
changeset


   144         try:


2634


f47ca4541770
Both RDBMS backends now use the same config.ini section, [rdbms].

Richard Jones <richard@users.sourceforge.net>
parents: 
2617
diff
changeset


   145             conn = MySQLdb.connect(**kwargs)


2082


c091cacdc505
Finished implementation of session and one-time-key stores for RDBMS backends.

Richard Jones <richard@users.sourceforge.net>
parents: 
2077
diff
changeset


   146         except MySQLdb.OperationalError, message:


c091cacdc505
Finished implementation of session and one-time-key stores for RDBMS backends.

Richard Jones <richard@users.sourceforge.net>
parents: 
2077
diff
changeset


   147             raise DatabaseError, message


c091cacdc505
Finished implementation of session and one-time-key stores for RDBMS backends.

Richard Jones <richard@users.sourceforge.net>
parents: 
2077
diff
changeset


   148         cursor = conn.cursor()


3216


27aba1d8fccc
merge from maint-0-8

Richard Jones <richard@users.sourceforge.net>
parents: 
3155
diff
changeset


   149         cursor.execute("SET AUTOCOMMIT=0")


2456


1cd69db95b23
fixed some more mysql 0.6->0.7 upgrade bugs [SF#950410]

Richard Jones <richard@users.sourceforge.net>
parents: 
2431
diff
changeset


   150         cursor.execute("START TRANSACTION")


2082


c091cacdc505
Finished implementation of session and one-time-key stores for RDBMS backends.

Richard Jones <richard@users.sourceforge.net>
parents: 
2077
diff
changeset


   151         return (conn, cursor)


2679


b3f0b7b9d20d
for MySQL connection, password argument is called 'passwd'.

Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 
2634
diff
changeset


   152 


2082


c091cacdc505
Finished implementation of session and one-time-key stores for RDBMS backends.

Richard Jones <richard@users.sourceforge.net>
parents: 
2077
diff
changeset


   153     def open_connection(self):


2075


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


   154         # make sure the database actually exists


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


   155         if not db_exists(self.config):


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


   156             db_create(self.config)


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


   157 


2082


c091cacdc505
Finished implementation of session and one-time-key stores for RDBMS backends.

Richard Jones <richard@users.sourceforge.net>
parents: 
2077
diff
changeset


   158         self.conn, self.cursor = self.sql_open_connection()


1375


faf93d3fbf2f
added mysql backend

Richard Jones <richard@users.sourceforge.net>
parents: 
diff
changeset


   159 


faf93d3fbf2f
added mysql backend

Richard Jones <richard@users.sourceforge.net>
parents: 
diff
changeset


   160         try:


2073


261c2e6ceb1e
*** empty log message ***

Richard Jones <richard@users.sourceforge.net>
parents: 
2005
diff
changeset


   161             self.load_dbschema()


1433


8429095241d7
mysql tests will not be run if there is no chance of passing.

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1415
diff
changeset


   162         except MySQLdb.OperationalError, message:


8429095241d7
mysql tests will not be run if there is no chance of passing.

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1415
diff
changeset


   163             if message[0] != ER.NO_DB_ERROR:


8429095241d7
mysql tests will not be run if there is no chance of passing.

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1415
diff
changeset


   164                 raise


1375


faf93d3fbf2f
added mysql backend

Richard Jones <richard@users.sourceforge.net>
parents: 
diff
changeset


   165         except MySQLdb.ProgrammingError, message:


faf93d3fbf2f
added mysql backend

Richard Jones <richard@users.sourceforge.net>
parents: 
diff
changeset


   166             if message[0] != ER.NO_SUCH_TABLE:


faf93d3fbf2f
added mysql backend

Richard Jones <richard@users.sourceforge.net>
parents: 
diff
changeset


   167                 raise DatabaseError, message


2075


b1704ba7be41
make mysql / postgresql work again. beginnings of otk/session store in rdbmses

Richard Jones <richard@users.sourceforge.net>
parents: 
2073
diff
changeset


   168             self.init_dbschema()


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   169             self.sql("CREATE TABLE schema (schema TEXT) TYPE=%s"%


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   170                 self.mysql_backend)


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   171             self.sql('''CREATE TABLE ids (name VARCHAR(255),


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   172                 num INTEGER) TYPE=%s'''%self.mysql_backend)


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   173             self.sql('create index ids_name_idx on ids(name)')


2073


261c2e6ceb1e
*** empty log message ***

Richard Jones <richard@users.sourceforge.net>
parents: 
2005
diff
changeset


   174             self.create_version_2_tables()


261c2e6ceb1e
*** empty log message ***

Richard Jones <richard@users.sourceforge.net>
parents: 
2005
diff
changeset


   175 


3458


931dc7ed25c7
handle "schema" being reserved word in MySQL 5+ [SF#1397569]

Richard Jones <richard@users.sourceforge.net>
parents: 
3457
diff
changeset


   176     def load_dbschema(self):


931dc7ed25c7
handle "schema" being reserved word in MySQL 5+ [SF#1397569]

Richard Jones <richard@users.sourceforge.net>
parents: 
3457
diff
changeset


   177         ''' Load the schema definition that the database currently implements


931dc7ed25c7
handle "schema" being reserved word in MySQL 5+ [SF#1397569]

Richard Jones <richard@users.sourceforge.net>
parents: 
3457
diff
changeset


   178         '''


931dc7ed25c7
handle "schema" being reserved word in MySQL 5+ [SF#1397569]

Richard Jones <richard@users.sourceforge.net>
parents: 
3457
diff
changeset


   179         self.cursor.execute('select `schema` from `schema`')


931dc7ed25c7
handle "schema" being reserved word in MySQL 5+ [SF#1397569]

Richard Jones <richard@users.sourceforge.net>
parents: 
3457
diff
changeset


   180         schema = self.cursor.fetchone()


931dc7ed25c7
handle "schema" being reserved word in MySQL 5+ [SF#1397569]

Richard Jones <richard@users.sourceforge.net>
parents: 
3457
diff
changeset


   181         if schema:


931dc7ed25c7
handle "schema" being reserved word in MySQL 5+ [SF#1397569]

Richard Jones <richard@users.sourceforge.net>
parents: 
3457
diff
changeset


   182             self.database_schema = eval(schema[0])


931dc7ed25c7
handle "schema" being reserved word in MySQL 5+ [SF#1397569]

Richard Jones <richard@users.sourceforge.net>
parents: 
3457
diff
changeset


   183         else:


931dc7ed25c7
handle "schema" being reserved word in MySQL 5+ [SF#1397569]

Richard Jones <richard@users.sourceforge.net>
parents: 
3457
diff
changeset


   184             self.database_schema = {}


931dc7ed25c7
handle "schema" being reserved word in MySQL 5+ [SF#1397569]

Richard Jones <richard@users.sourceforge.net>
parents: 
3457
diff
changeset


   185 


2073


261c2e6ceb1e
*** empty log message ***

Richard Jones <richard@users.sourceforge.net>
parents: 
2005
diff
changeset


   186     def create_version_2_tables(self):


2093


3f6024ab2c7a
That's the last of the RDBMS migration steps done! Yay!

Richard Jones <richard@users.sourceforge.net>
parents: 
2089
diff
changeset


   187         # OTK store


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   188         self.sql('''CREATE TABLE otks (otk_key VARCHAR(255),


2721


1cd01cf106e1
extend OTK and session table value cols to TEXT [SF#1031271]

Richard Jones <richard@users.sourceforge.net>
parents: 
2720
diff
changeset


   189             otk_value TEXT, otk_time FLOAT(20))


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   190             TYPE=%s'''%self.mysql_backend)


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   191         self.sql('CREATE INDEX otks_key_idx ON otks(otk_key)')


2093


3f6024ab2c7a
That's the last of the RDBMS migration steps done! Yay!

Richard Jones <richard@users.sourceforge.net>
parents: 
2089
diff
changeset


   192 


3f6024ab2c7a
That's the last of the RDBMS migration steps done! Yay!

Richard Jones <richard@users.sourceforge.net>
parents: 
2089
diff
changeset


   193         # Sessions store


2727


93e2e5b55a3c
new Interval props weren't created properly in rdbms

Richard Jones <richard@users.sourceforge.net>
parents: 
2721
diff
changeset


   194         self.sql('''CREATE TABLE sessions (session_key VARCHAR(255),


93e2e5b55a3c
new Interval props weren't created properly in rdbms

Richard Jones <richard@users.sourceforge.net>
parents: 
2721
diff
changeset


   195             session_time FLOAT(20), session_value TEXT)


2721


1cd01cf106e1
extend OTK and session table value cols to TEXT [SF#1031271]

Richard Jones <richard@users.sourceforge.net>
parents: 
2720
diff
changeset


   196             TYPE=%s'''%self.mysql_backend)


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   197         self.sql('''CREATE INDEX sessions_key_idx ON


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   198             sessions(session_key)''')


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   199 


2093


3f6024ab2c7a
That's the last of the RDBMS migration steps done! Yay!

Richard Jones <richard@users.sourceforge.net>
parents: 
2089
diff
changeset


   200         # full-text indexing store


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   201         self.sql('''CREATE TABLE __textids (_class VARCHAR(255),


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   202             _itemid VARCHAR(255), _prop VARCHAR(255), _textid INT)


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   203             TYPE=%s'''%self.mysql_backend)


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   204         self.sql('''CREATE TABLE __words (_word VARCHAR(30),


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   205             _textid INT) TYPE=%s'''%self.mysql_backend)


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   206         self.sql('CREATE INDEX words_word_ids ON __words(_word)')


2093


3f6024ab2c7a
That's the last of the RDBMS migration steps done! Yay!

Richard Jones <richard@users.sourceforge.net>
parents: 
2089
diff
changeset


   207         sql = 'insert into ids (name, num) values (%s,%s)'%(self.arg, self.arg)


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   208         self.sql(sql, ('__textids', 1))


2093


3f6024ab2c7a
That's the last of the RDBMS migration steps done! Yay!

Richard Jones <richard@users.sourceforge.net>
parents: 
2089
diff
changeset


   209 


2217


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   210     def add_new_columns_v2(self):


2100


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   211         '''While we're adding the actor column, we need to update the


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   212         tables to have the correct datatypes.'''


2100


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   213         for klass in self.classes.values():


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   214             cn = klass.classname


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   215             properties = klass.getprops()


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   216             old_spec = self.database_schema['tables'][cn]


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   217 


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   218             # figure the non-Multilink properties to copy over


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   219             propnames = ['activity', 'creation', 'creator']


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   220 


2100


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   221             # figure actions based on data type


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   222             for name, s_prop in old_spec[1]:


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   223                 # s_prop is a repr() string of a hyperdb type object


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   224                 if s_prop.find('Multilink') == -1:


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   225                     if properties.has_key(name):


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   226                         propnames.append(name)


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   227                     continue


2100


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   228                 tn = '%s_%s'%(cn, name)


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   229 


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   230                 if properties.has_key(name):


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   231                     # grabe the current values


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   232                     sql = 'select linkid, nodeid from %s'%tn


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   233                     self.sql(sql)


2100


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   234                     rows = self.cursor.fetchall()


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   235 


2100


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   236                 # drop the old table


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   237                 self.drop_multilink_table_indexes(cn, name)


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   238                 sql = 'drop table %s'%tn


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   239                 self.sql(sql)


2100


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   240 


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   241                 if properties.has_key(name):


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   242                     # re-create and populate the new table


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   243                     self.create_multilink_table(klass, name)


2679


b3f0b7b9d20d
for MySQL connection, password argument is called 'passwd'.

Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 
2634
diff
changeset


   244                     sql = '''insert into %s (linkid, nodeid) values


2100


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   245                         (%s, %s)'''%(tn, self.arg, self.arg)


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   246                     for linkid, nodeid in rows:


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   247                         self.sql(sql, (int(linkid), int(nodeid)))


2100


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   248 


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   249             # figure the column names to fetch


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   250             fetch = ['_%s'%name for name in propnames]


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   251 


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   252             # select the data out of the old table


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   253             fetch.append('id')


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   254             fetch.append('__retired__')


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   255             fetchcols = ','.join(fetch)


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   256             sql = 'select %s from _%s'%(fetchcols, cn)


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   257             self.sql(sql)


2100


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   258 


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   259             # unserialise the old data


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   260             olddata = []


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   261             propnames = propnames + ['id', '__retired__']


2456


1cd69db95b23
fixed some more mysql 0.6->0.7 upgrade bugs [SF#950410]

Richard Jones <richard@users.sourceforge.net>
parents: 
2431
diff
changeset


   262             cols = []


2617


33fffbf7ae68
merge from maint-0-7

Richard Jones <richard@users.sourceforge.net>
parents: 
2578
diff
changeset


   263             first = 1


2100


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   264             for entry in self.cursor.fetchall():


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   265                 l = []


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   266                 olddata.append(l)


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   267                 for i in range(len(propnames)):


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   268                     name = propnames[i]


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   269                     v = entry[i]


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   270 


2100


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   271                     if name in ('id', '__retired__'):


2456


1cd69db95b23
fixed some more mysql 0.6->0.7 upgrade bugs [SF#950410]

Richard Jones <richard@users.sourceforge.net>
parents: 
2431
diff
changeset


   272                         if first:


1cd69db95b23
fixed some more mysql 0.6->0.7 upgrade bugs [SF#950410]

Richard Jones <richard@users.sourceforge.net>
parents: 
2431
diff
changeset


   273                             cols.append(name)


2100


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   274                         l.append(int(v))


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   275                         continue


2456


1cd69db95b23
fixed some more mysql 0.6->0.7 upgrade bugs [SF#950410]

Richard Jones <richard@users.sourceforge.net>
parents: 
2431
diff
changeset


   276                     if first:


1cd69db95b23
fixed some more mysql 0.6->0.7 upgrade bugs [SF#950410]

Richard Jones <richard@users.sourceforge.net>
parents: 
2431
diff
changeset


   277                         cols.append('_' + name)


2100


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   278                     prop = properties[name]


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   279                     if isinstance(prop, Date) and v is not None:


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   280                         v = date.Date(v)


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   281                     elif isinstance(prop, Interval) and v is not None:


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   282                         v = date.Interval(v)


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   283                     elif isinstance(prop, Password) and v is not None:


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   284                         v = password.Password(encrypted=v)


2679


b3f0b7b9d20d
for MySQL connection, password argument is called 'passwd'.

Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 
2634
diff
changeset


   285                     elif (isinstance(prop, Boolean) or


2100


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   286                             isinstance(prop, Number)) and v is not None:


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   287                         v = float(v)


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   288 


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   289                     # convert to new MySQL data type


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   290                     prop = properties[name]


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   291                     if v is not None:


2217


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   292                         e = self.hyperdb_to_sql_value[prop.__class__](v)


2431


12fb2aa3c6d2
fixes to mysql upgrade code

Richard Jones <richard@users.sourceforge.net>
parents: 
2424
diff
changeset


   293                     else:


12fb2aa3c6d2
fixes to mysql upgrade code

Richard Jones <richard@users.sourceforge.net>
parents: 
2424
diff
changeset


   294                         e = None


2217


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   295                     l.append(e)


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   296 


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   297                     # Intervals store the seconds value too


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   298                     if isinstance(prop, Interval):


2456


1cd69db95b23
fixed some more mysql 0.6->0.7 upgrade bugs [SF#950410]

Richard Jones <richard@users.sourceforge.net>
parents: 
2431
diff
changeset


   299                         if first:


1cd69db95b23
fixed some more mysql 0.6->0.7 upgrade bugs [SF#950410]

Richard Jones <richard@users.sourceforge.net>
parents: 
2431
diff
changeset


   300                             cols.append('__' + name + '_int__')


2217


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   301                         if v is not None:


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   302                             l.append(v.as_seconds())


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   303                         else:


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   304                             l.append(e)


2617


33fffbf7ae68
merge from maint-0-7

Richard Jones <richard@users.sourceforge.net>
parents: 
2578
diff
changeset


   305                 first = 0


2100


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   306 


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   307             self.drop_class_table_indexes(cn, old_spec[0])


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   308 


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   309             # drop the old table


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   310             self.sql('drop table _%s'%cn)


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   311 


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   312             # create the new table


2100


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   313             self.create_class_table(klass)


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   314 


2100


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   315             # do the insert of the old data


2456


1cd69db95b23
fixed some more mysql 0.6->0.7 upgrade bugs [SF#950410]

Richard Jones <richard@users.sourceforge.net>
parents: 
2431
diff
changeset


   316             args = ','.join([self.arg for x in cols])


1cd69db95b23
fixed some more mysql 0.6->0.7 upgrade bugs [SF#950410]

Richard Jones <richard@users.sourceforge.net>
parents: 
2431
diff
changeset


   317             cols = ','.join(cols)


1cd69db95b23
fixed some more mysql 0.6->0.7 upgrade bugs [SF#950410]

Richard Jones <richard@users.sourceforge.net>
parents: 
2431
diff
changeset


   318             sql = 'insert into _%s (%s) values (%s)'%(cn, cols, args)


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   319             for entry in olddata:


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   320                 self.sql(sql, tuple(entry))


2100


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   321 


2244


ac4f295499a4
fixed journal marshalling in RDBMS backends [SF#943627]

Richard Jones <richard@users.sourceforge.net>
parents: 
2240
diff
changeset


   322             # now load up the old journal data to migrate it


2100


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   323             cols = ','.join('nodeid date tag action params'.split())


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   324             sql = 'select %s from %s__journal'%(cols, cn)


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   325             self.sql(sql)


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   326 


2244


ac4f295499a4
fixed journal marshalling in RDBMS backends [SF#943627]

Richard Jones <richard@users.sourceforge.net>
parents: 
2240
diff
changeset


   327             # data conversions


2100


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   328             olddata = []


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   329             for nodeid, journaldate, journaltag, action, params in \


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   330                     self.cursor.fetchall():


2431


12fb2aa3c6d2
fixes to mysql upgrade code

Richard Jones <richard@users.sourceforge.net>
parents: 
2424
diff
changeset


   331                 #nodeid = int(nodeid)


3140


2487b070043b
slightly better fix

Richard Jones <richard@users.sourceforge.net>
parents: 
3088
diff
changeset


   332                 journaldate = date.Date(journaldate)


2431


12fb2aa3c6d2
fixes to mysql upgrade code

Richard Jones <richard@users.sourceforge.net>
parents: 
2424
diff
changeset


   333                 #params = eval(params)


2100


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   334                 olddata.append((nodeid, journaldate, journaltag, action,


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   335                     params))


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   336 


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   337             # drop journal table and indexes


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   338             self.drop_journal_table_indexes(cn)


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   339             sql = 'drop table %s__journal'%cn


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   340             self.sql(sql)


2100


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   341 


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   342             # re-create journal table


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   343             self.create_journal_table(klass)


3140


2487b070043b
slightly better fix

Richard Jones <richard@users.sourceforge.net>
parents: 
3088
diff
changeset


   344             dc = self.hyperdb_to_sql_value[hyperdb.Date]


2100


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   345             for nodeid, journaldate, journaltag, action, params in olddata:


3140


2487b070043b
slightly better fix

Richard Jones <richard@users.sourceforge.net>
parents: 
3088
diff
changeset


   346                 self.save_journal(cn, cols, nodeid, dc(journaldate),


2100


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   347                     journaltag, action, params)


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   348 


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   349             # make sure the normal schema update code doesn't try to


2679


b3f0b7b9d20d
for MySQL connection, password argument is called 'passwd'.

Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 
2634
diff
changeset


   350             # change things


2100


62ed6505cbec
MySQL migration of old backend database to new, typed database complete.

Richard Jones <richard@users.sourceforge.net>
parents: 
2099
diff
changeset


   351             self.database_schema['tables'][cn] = klass.schema()


2077


3e0961d6d44d
Added the "actor" property.

Richard Jones <richard@users.sourceforge.net>
parents: 
2075
diff
changeset


   352 


2413


7d0bb6601809
fix some column datatypes in postgresql and mysql

Richard Jones <richard@users.sourceforge.net>
parents: 
2379
diff
changeset


   353     def fix_version_2_tables(self):


7d0bb6601809
fix some column datatypes in postgresql and mysql

Richard Jones <richard@users.sourceforge.net>
parents: 
2379
diff
changeset


   354         # Convert journal date column to TIMESTAMP, params column to TEXT


7d0bb6601809
fix some column datatypes in postgresql and mysql

Richard Jones <richard@users.sourceforge.net>
parents: 
2379
diff
changeset


   355         self._convert_journal_tables()


7d0bb6601809
fix some column datatypes in postgresql and mysql

Richard Jones <richard@users.sourceforge.net>
parents: 
2379
diff
changeset


   356 


7d0bb6601809
fix some column datatypes in postgresql and mysql

Richard Jones <richard@users.sourceforge.net>
parents: 
2379
diff
changeset


   357         # Convert all String properties to TEXT


7d0bb6601809
fix some column datatypes in postgresql and mysql

Richard Jones <richard@users.sourceforge.net>
parents: 
2379
diff
changeset


   358         self._convert_string_properties()


7d0bb6601809
fix some column datatypes in postgresql and mysql

Richard Jones <richard@users.sourceforge.net>
parents: 
2379
diff
changeset


   359 


1375


faf93d3fbf2f
added mysql backend

Richard Jones <richard@users.sourceforge.net>
parents: 
diff
changeset


   360     def __repr__(self):


faf93d3fbf2f
added mysql backend

Richard Jones <richard@users.sourceforge.net>
parents: 
diff
changeset


   361         return '<myroundsql 0x%x>'%id(self)


faf93d3fbf2f
added mysql backend

Richard Jones <richard@users.sourceforge.net>
parents: 
diff
changeset


   362 


faf93d3fbf2f
added mysql backend

Richard Jones <richard@users.sourceforge.net>
parents: 
diff
changeset


   363     def sql_fetchone(self):


faf93d3fbf2f
added mysql backend

Richard Jones <richard@users.sourceforge.net>
parents: 
diff
changeset


   364         return self.cursor.fetchone()


faf93d3fbf2f
added mysql backend

Richard Jones <richard@users.sourceforge.net>
parents: 
diff
changeset


   365 


faf93d3fbf2f
added mysql backend

Richard Jones <richard@users.sourceforge.net>
parents: 
diff
changeset


   366     def sql_fetchall(self):


faf93d3fbf2f
added mysql backend

Richard Jones <richard@users.sourceforge.net>
parents: 
diff
changeset


   367         return self.cursor.fetchall()


1906


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   368 


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   369     def sql_index_exists(self, table_name, index_name):


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   370         self.sql('show index from %s'%table_name)


1906


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   371         for index in self.cursor.fetchall():


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   372             if index[2] == index_name:


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   373                 return 1


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   374         return 0


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   375 


2424


74474ec41050
argh! backwards compat

Richard Jones <richard@users.sourceforge.net>
parents: 
2413
diff
changeset


   376     def create_class_table(self, spec, create_sequence=1):


1375


faf93d3fbf2f
added mysql backend

Richard Jones <richard@users.sourceforge.net>
parents: 
diff
changeset


   377         cols, mls = self.determine_columns(spec.properties.items())


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   378 


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   379         # add on our special columns


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   380         cols.append(('id', 'INTEGER PRIMARY KEY'))


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   381         cols.append(('__retired__', 'INTEGER DEFAULT 0'))


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   382 


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   383         # create the base table


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   384         scols = ','.join(['%s %s'%x for x in cols])


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   385         sql = 'create table _%s (%s) type=%s'%(spec.classname, scols,


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   386             self.mysql_backend)


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   387         self.sql(sql)


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   388 


1906


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   389         self.create_class_table_indexes(spec)


1375


faf93d3fbf2f
added mysql backend

Richard Jones <richard@users.sourceforge.net>
parents: 
diff
changeset


   390         return cols, mls


faf93d3fbf2f
added mysql backend

Richard Jones <richard@users.sourceforge.net>
parents: 
diff
changeset


   391 


3457


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   392     def create_class_table_indexes(self, spec):


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   393         ''' create the class table for the given spec


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   394         '''


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   395         # create __retired__ index


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   396         index_sql2 = 'create index _%s_retired_idx on _%s(__retired__)'%(


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   397                         spec.classname, spec.classname)


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   398         self.sql(index_sql2)


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   399 


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   400         # create index for key property


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   401         if spec.key:


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   402             if isinstance(spec.properties[spec.key], String):


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   403                 idx = spec.key + '(255)'


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   404             else:


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   405                 idx = spec.key


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   406             index_sql3 = 'create index _%s_%s_idx on _%s(_%s)'%(


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   407                         spec.classname, spec.key,


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   408                         spec.classname, idx)


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   409             self.sql(index_sql3)


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   410 


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   411         # TODO: create indexes on (selected?) Link property columns, as


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   412         # they're more likely to be used for lookup


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   413 


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   414     def create_class_table_key_index(self, cn, key):


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   415         ''' create the class table for the given spec


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   416         '''


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   417         prop = self.classes[cn].getprops()[key]


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   418         if isinstance(prop, String):


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   419             sql = 'create index _%s_%s_idx on _%s(_%s(255))'%(cn, key, cn, key)


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   420         else:


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   421             sql = 'create index _%s_%s_idx on _%s(_%s)'%(cn, key, cn, key)


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   422         self.sql(sql)


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   423 


1906


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   424     def drop_class_table_indexes(self, cn, key):


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   425         # drop the old table indexes first


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   426         l = ['_%s_id_idx'%cn, '_%s_retired_idx'%cn]


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   427         if key:


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   428             l.append('_%s_%s_idx'%(cn, key))


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   429 


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   430         table_name = '_%s'%cn


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   431         for index_name in l:


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   432             if not self.sql_index_exists(table_name, index_name):


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   433                 continue


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   434             index_sql = 'drop index %s on %s'%(index_name, table_name)


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   435             self.sql(index_sql)


1906


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   436 


1375


faf93d3fbf2f
added mysql backend

Richard Jones <richard@users.sourceforge.net>
parents: 
diff
changeset


   437     def create_journal_table(self, spec):


2679


b3f0b7b9d20d
for MySQL connection, password argument is called 'passwd'.

Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 
2634
diff
changeset


   438         ''' create the journal table for a class given the spec and


2413


7d0bb6601809
fix some column datatypes in postgresql and mysql

Richard Jones <richard@users.sourceforge.net>
parents: 
2379
diff
changeset


   439             already-determined cols


7d0bb6601809
fix some column datatypes in postgresql and mysql

Richard Jones <richard@users.sourceforge.net>
parents: 
2379
diff
changeset


   440         '''


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   441         # journal table


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   442         cols = ','.join(['%s varchar'%x


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   443             for x in 'nodeid date tag action params'.split()])


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   444         sql = '''create table %s__journal (


2413


7d0bb6601809
fix some column datatypes in postgresql and mysql

Richard Jones <richard@users.sourceforge.net>
parents: 
2379
diff
changeset


   445             nodeid integer, date datetime, tag varchar(255),


2244


ac4f295499a4
fixed journal marshalling in RDBMS backends [SF#943627]

Richard Jones <richard@users.sourceforge.net>
parents: 
2240
diff
changeset


   446             action varchar(255), params text) type=%s'''%(


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   447             spec.classname, self.mysql_backend)


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   448         self.sql(sql)


1906


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   449         self.create_journal_table_indexes(spec)


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   450 


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   451     def drop_journal_table_indexes(self, classname):


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   452         index_name = '%s_journ_idx'%classname


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   453         if not self.sql_index_exists('%s__journal'%classname, index_name):


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   454             return


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   455         index_sql = 'drop index %s on %s__journal'%(index_name, classname)


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   456         self.sql(index_sql)


1375


faf93d3fbf2f
added mysql backend

Richard Jones <richard@users.sourceforge.net>
parents: 
diff
changeset


   457 


faf93d3fbf2f
added mysql backend

Richard Jones <richard@users.sourceforge.net>
parents: 
diff
changeset


   458     def create_multilink_table(self, spec, ml):


faf93d3fbf2f
added mysql backend

Richard Jones <richard@users.sourceforge.net>
parents: 
diff
changeset


   459         sql = '''CREATE TABLE `%s_%s` (linkid VARCHAR(255),


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   460             nodeid VARCHAR(255)) TYPE=%s'''%(spec.classname, ml,


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   461                 self.mysql_backend)


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   462         self.sql(sql)


1906


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   463         self.create_multilink_table_indexes(spec, ml)


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   464 


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   465     def drop_multilink_table_indexes(self, classname, ml):


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   466         l = [


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   467             '%s_%s_l_idx'%(classname, ml),


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   468             '%s_%s_n_idx'%(classname, ml)


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   469         ]


2089


93f03c6714d8
A few big changes in this commit:

Richard Jones <richard@users.sourceforge.net>
parents: 
2082
diff
changeset


   470         table_name = '%s_%s'%(classname, ml)


1906


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   471         for index_name in l:


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   472             if not self.sql_index_exists(table_name, index_name):


f255363e6d97
PostgreSQL backend lands.

Richard Jones <richard@users.sourceforge.net>
parents: 
1873
diff
changeset


   473                 continue


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   474             sql = 'drop index %s on %s'%(index_name, table_name)


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   475             self.sql(sql)


1375


faf93d3fbf2f
added mysql backend

Richard Jones <richard@users.sourceforge.net>
parents: 
diff
changeset


   476 


2077


3e0961d6d44d
Added the "actor" property.

Richard Jones <richard@users.sourceforge.net>
parents: 
2075
diff
changeset


   477     def drop_class_table_key_index(self, cn, key):


3e0961d6d44d
Added the "actor" property.

Richard Jones <richard@users.sourceforge.net>
parents: 
2075
diff
changeset


   478         table_name = '_%s'%cn


3e0961d6d44d
Added the "actor" property.

Richard Jones <richard@users.sourceforge.net>
parents: 
2075
diff
changeset


   479         index_name = '_%s_%s_idx'%(cn, key)


3e0961d6d44d
Added the "actor" property.

Richard Jones <richard@users.sourceforge.net>
parents: 
2075
diff
changeset


   480         if not self.sql_index_exists(table_name, index_name):


3e0961d6d44d
Added the "actor" property.

Richard Jones <richard@users.sourceforge.net>
parents: 
2075
diff
changeset


   481             return


3e0961d6d44d
Added the "actor" property.

Richard Jones <richard@users.sourceforge.net>
parents: 
2075
diff
changeset


   482         sql = 'drop index %s on %s'%(index_name, table_name)


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   483         self.sql(sql)


2077


3e0961d6d44d
Added the "actor" property.

Richard Jones <richard@users.sourceforge.net>
parents: 
2075
diff
changeset


   484 


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   485     # old-skool id generation


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   486     def newid(self, classname):


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   487         ''' Generate a new id for the given class


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   488         '''


2717


ca2ee58c8310
use row locking in MySQL newid() [SF#1034211]

Richard Jones <richard@users.sourceforge.net>
parents: 
2693
diff
changeset


   489         # get the next ID - "FOR UPDATE" will lock the row for us


ca2ee58c8310
use row locking in MySQL newid() [SF#1034211]

Richard Jones <richard@users.sourceforge.net>
parents: 
2693
diff
changeset


   490         sql = 'select num from ids where name=%s FOR UPDATE'%self.arg


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   491         self.sql(sql, (classname, ))


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   492         newid = int(self.cursor.fetchone()[0])


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   493 


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   494         # update the counter


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   495         sql = 'update ids set num=%s where name=%s'%(self.arg, self.arg)


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   496         vals = (int(newid)+1, classname)


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   497         self.sql(sql, vals)


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   498 


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   499         # return as string


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   500         return str(newid)


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   501 


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   502     def setid(self, classname, setid):


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   503         ''' Set the id counter: used during import of database


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   504 


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   505         We add one to make it behave like the seqeunces in postgres.


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   506         '''


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   507         sql = 'update ids set num=%s where name=%s'%(self.arg, self.arg)


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   508         vals = (int(setid)+1, classname)


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   509         self.sql(sql, vals)


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   510 


3310


3518d1ffd940
merge from maint-0-7

Richard Jones <richard@users.sourceforge.net>
parents: 
3216
diff
changeset


   511     def clear(self):


3518d1ffd940
merge from maint-0-7

Richard Jones <richard@users.sourceforge.net>
parents: 
3216
diff
changeset


   512         rdbms_common.Database.clear(self)


3518d1ffd940
merge from maint-0-7

Richard Jones <richard@users.sourceforge.net>
parents: 
3216
diff
changeset


   513 


3518d1ffd940
merge from maint-0-7

Richard Jones <richard@users.sourceforge.net>
parents: 
3216
diff
changeset


   514         # set the id counters to 0 (setid adds one) so we start at 1


3518d1ffd940
merge from maint-0-7

Richard Jones <richard@users.sourceforge.net>
parents: 
3216
diff
changeset


   515         for cn in self.classes.keys():


3518d1ffd940
merge from maint-0-7

Richard Jones <richard@users.sourceforge.net>
parents: 
3216
diff
changeset


   516             self.setid(cn, 0)


3518d1ffd940
merge from maint-0-7

Richard Jones <richard@users.sourceforge.net>
parents: 
3216
diff
changeset


   517 


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   518     def create_class(self, spec):


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   519         rdbms_common.Database.create_class(self, spec)


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   520         sql = 'insert into ids (name, num) values (%s, %s)'


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   521         vals = (spec.classname, 1)


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   522         self.sql(sql, vals)


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   523 


2456


1cd69db95b23
fixed some more mysql 0.6->0.7 upgrade bugs [SF#950410]

Richard Jones <richard@users.sourceforge.net>
parents: 
2431
diff
changeset


   524     def sql_commit(self):


1cd69db95b23
fixed some more mysql 0.6->0.7 upgrade bugs [SF#950410]

Richard Jones <richard@users.sourceforge.net>
parents: 
2431
diff
changeset


   525         ''' Actually commit to the database.


1cd69db95b23
fixed some more mysql 0.6->0.7 upgrade bugs [SF#950410]

Richard Jones <richard@users.sourceforge.net>
parents: 
2431
diff
changeset


   526         '''


3155


57b60bda9473
Python 2.3 minimum version - bye bye roundup.rlog, you had a short life.

Richard Jones <richard@users.sourceforge.net>
parents: 
3147
diff
changeset


   527         logging.getLogger('hyperdb').info('commit')


2456


1cd69db95b23
fixed some more mysql 0.6->0.7 upgrade bugs [SF#950410]

Richard Jones <richard@users.sourceforge.net>
parents: 
2431
diff
changeset


   528         self.conn.commit()


1cd69db95b23
fixed some more mysql 0.6->0.7 upgrade bugs [SF#950410]

Richard Jones <richard@users.sourceforge.net>
parents: 
2431
diff
changeset


   529 


1cd69db95b23
fixed some more mysql 0.6->0.7 upgrade bugs [SF#950410]

Richard Jones <richard@users.sourceforge.net>
parents: 
2431
diff
changeset


   530         # open a new cursor for subsequent work


1cd69db95b23
fixed some more mysql 0.6->0.7 upgrade bugs [SF#950410]

Richard Jones <richard@users.sourceforge.net>
parents: 
2431
diff
changeset


   531         self.cursor = self.conn.cursor()


1cd69db95b23
fixed some more mysql 0.6->0.7 upgrade bugs [SF#950410]

Richard Jones <richard@users.sourceforge.net>
parents: 
2431
diff
changeset


   532 


1cd69db95b23
fixed some more mysql 0.6->0.7 upgrade bugs [SF#950410]

Richard Jones <richard@users.sourceforge.net>
parents: 
2431
diff
changeset


   533         # make sure we're in a new transaction and not autocommitting


3216


27aba1d8fccc
merge from maint-0-8

Richard Jones <richard@users.sourceforge.net>
parents: 
3155
diff
changeset


   534         self.sql("SET AUTOCOMMIT=0")


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   535         self.sql("START TRANSACTION")


2456


1cd69db95b23
fixed some more mysql 0.6->0.7 upgrade bugs [SF#950410]

Richard Jones <richard@users.sourceforge.net>
parents: 
2431
diff
changeset


   536 


3457


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   537     def sql_close(self):


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   538         logging.getLogger('hyperdb').info('close')


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   539         try:


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   540             self.conn.close()


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   541         except MySQLdb.ProgrammingError, message:


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   542             if str(message) != 'closing a closed connection':


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   543                 raise


88f0a5030404
Fix invalid date spec in db tests

Richard Jones <richard@users.sourceforge.net>
parents: 
3455
diff
changeset


   544 


1415


6883852e9b15
mysql backend passes all tests (at last!)

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1375
diff
changeset


   545 class MysqlClass:


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   546     # we're overriding this method for ONE missing bit of functionality.


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   547     # look for "I can't believe it's not a toy RDBMS" below


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   548     def filter(self, search_matches, filterspec, sort=(None,None),


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   549             group=(None,None)):


2005


fc52d57c6c3e
documentation cleanup

Richard Jones <richard@users.sourceforge.net>
parents: 
1988
diff
changeset


   550         '''Return a list of the ids of the active nodes in this class that


fc52d57c6c3e
documentation cleanup

Richard Jones <richard@users.sourceforge.net>
parents: 
1988
diff
changeset


   551         match the 'filter' spec, sorted by the group spec and then the


fc52d57c6c3e
documentation cleanup

Richard Jones <richard@users.sourceforge.net>
parents: 
1988
diff
changeset


   552         sort spec


fc52d57c6c3e
documentation cleanup

Richard Jones <richard@users.sourceforge.net>
parents: 
1988
diff
changeset


   553 


fc52d57c6c3e
documentation cleanup

Richard Jones <richard@users.sourceforge.net>
parents: 
1988
diff
changeset


   554         "filterspec" is {propname: value(s)}


1415


6883852e9b15
mysql backend passes all tests (at last!)

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1375
diff
changeset


   555 


2005


fc52d57c6c3e
documentation cleanup

Richard Jones <richard@users.sourceforge.net>
parents: 
1988
diff
changeset


   556         "sort" and "group" are (dir, prop) where dir is '+', '-' or None


fc52d57c6c3e
documentation cleanup

Richard Jones <richard@users.sourceforge.net>
parents: 
1988
diff
changeset


   557         and prop is a prop name or None


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   558 


2362


10fc45eea226
fix SearchAction use of Class.filter(), and clarify API docs for same

Richard Jones <richard@users.sourceforge.net>
parents: 
2319
diff
changeset


   559         "search_matches" is {nodeid: marker} or None


2005


fc52d57c6c3e
documentation cleanup

Richard Jones <richard@users.sourceforge.net>
parents: 
1988
diff
changeset


   560 


3455


e01bc6d65fa9
fixed documentation of filter()...

Richard Jones <richard@users.sourceforge.net>
parents: 
3421
diff
changeset


   561         The filter must match all properties specificed. If the property


e01bc6d65fa9
fixed documentation of filter()...

Richard Jones <richard@users.sourceforge.net>
parents: 
3421
diff
changeset


   562         value to match is a list:


e01bc6d65fa9
fixed documentation of filter()...

Richard Jones <richard@users.sourceforge.net>
parents: 
3421
diff
changeset


   563 


e01bc6d65fa9
fixed documentation of filter()...

Richard Jones <richard@users.sourceforge.net>
parents: 
3421
diff
changeset


   564         1. String properties must match all elements in the list, and


e01bc6d65fa9
fixed documentation of filter()...

Richard Jones <richard@users.sourceforge.net>
parents: 
3421
diff
changeset


   565         2. Other properties must match any of the elements in the list.


1415


6883852e9b15
mysql backend passes all tests (at last!)

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1375
diff
changeset


   566         '''


2578


7f25486ff85e
fixed RDBMS filter() for no matches from full-text search [SF#990778]

Richard Jones <richard@users.sourceforge.net>
parents: 
2534
diff
changeset


   567         # we can't match anything if search_matches is empty


7f25486ff85e
fixed RDBMS filter() for no matches from full-text search [SF#990778]

Richard Jones <richard@users.sourceforge.net>
parents: 
2534
diff
changeset


   568         if search_matches == {}:


7f25486ff85e
fixed RDBMS filter() for no matches from full-text search [SF#990778]

Richard Jones <richard@users.sourceforge.net>
parents: 
2534
diff
changeset


   569             return []


7f25486ff85e
fixed RDBMS filter() for no matches from full-text search [SF#990778]

Richard Jones <richard@users.sourceforge.net>
parents: 
2534
diff
changeset


   570 


2237


f624fc20f8fe
added capturing of stats

Richard Jones <richard@users.sourceforge.net>
parents: 
2234
diff
changeset


   571         if __debug__:


f624fc20f8fe
added capturing of stats

Richard Jones <richard@users.sourceforge.net>
parents: 
2234
diff
changeset


   572             start_t = time.time()


f624fc20f8fe
added capturing of stats

Richard Jones <richard@users.sourceforge.net>
parents: 
2234
diff
changeset


   573 


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   574         cn = self.classname


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   575 


2379


a2025bdd1491
fix grouping by NULL linked values

Richard Jones <richard@users.sourceforge.net>
parents: 
2362
diff
changeset


   576         # vars to hold the components of the SQL statement


a2025bdd1491
fix grouping by NULL linked values

Richard Jones <richard@users.sourceforge.net>
parents: 
2362
diff
changeset


   577         frum = ['_'+cn] # FROM clauses


a2025bdd1491
fix grouping by NULL linked values

Richard Jones <richard@users.sourceforge.net>
parents: 
2362
diff
changeset


   578         loj = []        # LEFT OUTER JOIN clauses


a2025bdd1491
fix grouping by NULL linked values

Richard Jones <richard@users.sourceforge.net>
parents: 
2362
diff
changeset


   579         where = []      # WHERE clauses


a2025bdd1491
fix grouping by NULL linked values

Richard Jones <richard@users.sourceforge.net>
parents: 
2362
diff
changeset


   580         args = []       # *any* positional arguments


a2025bdd1491
fix grouping by NULL linked values

Richard Jones <richard@users.sourceforge.net>
parents: 
2362
diff
changeset


   581         a = self.db.arg


a2025bdd1491
fix grouping by NULL linked values

Richard Jones <richard@users.sourceforge.net>
parents: 
2362
diff
changeset


   582 


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   583         # figure the WHERE clause from the filterspec


1415


6883852e9b15
mysql backend passes all tests (at last!)

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1375
diff
changeset


   584         props = self.getprops()


2379


a2025bdd1491
fix grouping by NULL linked values

Richard Jones <richard@users.sourceforge.net>
parents: 
2362
diff
changeset


   585         mlfilt = 0      # are we joining with Multilink tables?


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   586         for k, v in filterspec.items():


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   587             propclass = props[k]


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   588             # now do other where clause stuff


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   589             if isinstance(propclass, Multilink):


2256


0b198ed096af
fixes for py2.1 (booleans, sigh)

Richard Jones <richard@users.sourceforge.net>
parents: 
2244
diff
changeset


   590                 mlfilt = 1


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   591                 tn = '%s_%s'%(cn, k)


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   592                 if v in ('-1', ['-1']):


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   593                     # only match rows that have count(linkid)=0 in the


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   594                     # corresponding multilink table)


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   595 


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   596                     # "I can't believe it's not a toy RDBMS"


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   597                     # see, even toy RDBMSes like gadfly and sqlite can do


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   598                     # sub-selects...


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   599                     self.db.sql('select nodeid from %s'%tn)


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   600                     s = ','.join([x[0] for x in self.db.sql_fetchall()])


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   601 


2319


7cf7e3bd1b31
more column uniqueness fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2318
diff
changeset


   602                     where.append('_%s.id not in (%s)'%(cn, s))


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   603                 elif isinstance(v, type([])):


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   604                     frum.append(tn)


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   605                     s = ','.join([a for x in v])


2319


7cf7e3bd1b31
more column uniqueness fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2318
diff
changeset


   606                     where.append('_%s.id=%s.nodeid and %s.linkid in (%s)'%(cn,


7cf7e3bd1b31
more column uniqueness fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2318
diff
changeset


   607                         tn, tn, s))


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   608                     args = args + v


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   609                 else:


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   610                     frum.append(tn)


2319


7cf7e3bd1b31
more column uniqueness fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2318
diff
changeset


   611                     where.append('_%s.id=%s.nodeid and %s.linkid=%s'%(cn, tn,


7cf7e3bd1b31
more column uniqueness fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2318
diff
changeset


   612                         tn, a))


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   613                     args.append(v)


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   614             elif k == 'id':


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   615                 if isinstance(v, type([])):


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   616                     s = ','.join([a for x in v])


2319


7cf7e3bd1b31
more column uniqueness fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2318
diff
changeset


   617                     where.append('_%s.%s in (%s)'%(cn, k, s))


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   618                     args = args + v


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   619                 else:


2319


7cf7e3bd1b31
more column uniqueness fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2318
diff
changeset


   620                     where.append('_%s.%s=%s'%(cn, k, a))


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   621                     args.append(v)


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   622             elif isinstance(propclass, String):


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   623                 if not isinstance(v, type([])):


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   624                     v = [v]


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   625 


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   626                 # Quote the bits in the string that need it and then embed


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   627                 # in a "substring" search. Note - need to quote the '%' so


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   628                 # they make it through the python layer happily


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   629                 v = ['%%'+self.db.sql_stringquote(s)+'%%' for s in v]


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   630 


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   631                 # now add to the where clause


2534


fc6cef8ff0b3
fix MySQL backend too

Richard Jones <richard@users.sourceforge.net>
parents: 
2514
diff
changeset


   632                 where.append('('


3147


dbf80d7db63f
consistent text searching behaviour (AND everywhere) [SF#1101036]

Richard Jones <richard@users.sourceforge.net>
parents: 
3140
diff
changeset


   633                     +' and '.join(["_%s._%s LIKE '%s'"%(cn, k, s) for s in v])


2534


fc6cef8ff0b3
fix MySQL backend too

Richard Jones <richard@users.sourceforge.net>
parents: 
2514
diff
changeset


   634                     +')')


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   635                 # note: args are embedded in the query string now


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   636             elif isinstance(propclass, Link):


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   637                 if isinstance(v, type([])):


2508


8e1c1623710b
rdbms backends not filtering correctly on link=None

Richard Jones <richard@users.sourceforge.net>
parents: 
2456
diff
changeset


   638                     d = {}


8e1c1623710b
rdbms backends not filtering correctly on link=None

Richard Jones <richard@users.sourceforge.net>
parents: 
2456
diff
changeset


   639                     for entry in v:


8e1c1623710b
rdbms backends not filtering correctly on link=None

Richard Jones <richard@users.sourceforge.net>
parents: 
2456
diff
changeset


   640                         if entry == '-1':


8e1c1623710b
rdbms backends not filtering correctly on link=None

Richard Jones <richard@users.sourceforge.net>
parents: 
2456
diff
changeset


   641                             entry = None


8e1c1623710b
rdbms backends not filtering correctly on link=None

Richard Jones <richard@users.sourceforge.net>
parents: 
2456
diff
changeset


   642                         d[entry] = entry


8e1c1623710b
rdbms backends not filtering correctly on link=None

Richard Jones <richard@users.sourceforge.net>
parents: 
2456
diff
changeset


   643                     l = []


8e1c1623710b
rdbms backends not filtering correctly on link=None

Richard Jones <richard@users.sourceforge.net>
parents: 
2456
diff
changeset


   644                     if d.has_key(None) or not d:


8e1c1623710b
rdbms backends not filtering correctly on link=None

Richard Jones <richard@users.sourceforge.net>
parents: 
2456
diff
changeset


   645                         del d[None]


8e1c1623710b
rdbms backends not filtering correctly on link=None

Richard Jones <richard@users.sourceforge.net>
parents: 
2456
diff
changeset


   646                         l.append('_%s._%s is NULL'%(cn, k))


8e1c1623710b
rdbms backends not filtering correctly on link=None

Richard Jones <richard@users.sourceforge.net>
parents: 
2456
diff
changeset


   647                     if d:


8e1c1623710b
rdbms backends not filtering correctly on link=None

Richard Jones <richard@users.sourceforge.net>
parents: 
2456
diff
changeset


   648                         v = d.keys()


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   649                         s = ','.join([a for x in v])


2534


fc6cef8ff0b3
fix MySQL backend too

Richard Jones <richard@users.sourceforge.net>
parents: 
2514
diff
changeset


   650                         l.append('(_%s._%s in (%s))'%(cn, k, s))


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   651                         args = args + v


2534


fc6cef8ff0b3
fix MySQL backend too

Richard Jones <richard@users.sourceforge.net>
parents: 
2514
diff
changeset


   652                     if l:


fc6cef8ff0b3
fix MySQL backend too

Richard Jones <richard@users.sourceforge.net>
parents: 
2514
diff
changeset


   653                         where.append('(' + ' or '.join(l) +')')


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   654                 else:


2508


8e1c1623710b
rdbms backends not filtering correctly on link=None

Richard Jones <richard@users.sourceforge.net>
parents: 
2456
diff
changeset


   655                     if v in ('-1', None):


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   656                         v = None


2319


7cf7e3bd1b31
more column uniqueness fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2318
diff
changeset


   657                         where.append('_%s._%s is NULL'%(cn, k))


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   658                     else:


2319


7cf7e3bd1b31
more column uniqueness fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2318
diff
changeset


   659                         where.append('_%s._%s=%s'%(cn, k, a))


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   660                         args.append(v)


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   661             elif isinstance(propclass, Date):


2256


0b198ed096af
fixes for py2.1 (booleans, sigh)

Richard Jones <richard@users.sourceforge.net>
parents: 
2244
diff
changeset


   662                 dc = self.db.hyperdb_to_sql_value[hyperdb.Date]


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   663                 if isinstance(v, type([])):


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   664                     s = ','.join([a for x in v])


2319


7cf7e3bd1b31
more column uniqueness fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2318
diff
changeset


   665                     where.append('_%s._%s in (%s)'%(cn, k, s))


2256


0b198ed096af
fixes for py2.1 (booleans, sigh)

Richard Jones <richard@users.sourceforge.net>
parents: 
2244
diff
changeset


   666                     args = args + [dc(date.Date(x)) for x in v]


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   667                 else:


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   668                     try:


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   669                         # Try to filter on range of dates


3383


c1c67c62b699
applied patch [SF#236087]

Richard Jones <richard@users.sourceforge.net>
parents: 
3310
diff
changeset


   670                         date_rng = propclass.range_from_raw (v, self.db)


2256


0b198ed096af
fixes for py2.1 (booleans, sigh)

Richard Jones <richard@users.sourceforge.net>
parents: 
2244
diff
changeset


   671                         if date_rng.from_value:


2319


7cf7e3bd1b31
more column uniqueness fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2318
diff
changeset


   672                             where.append('_%s._%s >= %s'%(cn, k, a))


2256


0b198ed096af
fixes for py2.1 (booleans, sigh)

Richard Jones <richard@users.sourceforge.net>
parents: 
2244
diff
changeset


   673                             args.append(dc(date_rng.from_value))


0b198ed096af
fixes for py2.1 (booleans, sigh)

Richard Jones <richard@users.sourceforge.net>
parents: 
2244
diff
changeset


   674                         if date_rng.to_value:


2319


7cf7e3bd1b31
more column uniqueness fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2318
diff
changeset


   675                             where.append('_%s._%s <= %s'%(cn, k, a))


2256


0b198ed096af
fixes for py2.1 (booleans, sigh)

Richard Jones <richard@users.sourceforge.net>
parents: 
2244
diff
changeset


   676                             args.append(dc(date_rng.to_value))


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   677                     except ValueError:


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   678                         # If range creation fails - ignore that search parameter


2679


b3f0b7b9d20d
for MySQL connection, password argument is called 'passwd'.

Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 
2634
diff
changeset


   679                         pass


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   680             elif isinstance(propclass, Interval):


2217


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   681                 # filter using the __<prop>_int__ column


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   682                 if isinstance(v, type([])):


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   683                     s = ','.join([a for x in v])


2319


7cf7e3bd1b31
more column uniqueness fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2318
diff
changeset


   684                     where.append('_%s.__%s_int__ in (%s)'%(cn, k, s))


2217


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   685                     args = args + [date.Interval(x).as_seconds() for x in v]


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   686                 else:


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   687                     try:


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   688                         # Try to filter on range of intervals


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   689                         date_rng = Range(v, date.Interval)


2217


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   690                         if date_rng.from_value:


2319


7cf7e3bd1b31
more column uniqueness fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2318
diff
changeset


   691                             where.append('_%s.__%s_int__ >= %s'%(cn, k, a))


2217


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   692                             args.append(date_rng.from_value.as_seconds())


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   693                         if date_rng.to_value:


2319


7cf7e3bd1b31
more column uniqueness fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2318
diff
changeset


   694                             where.append('_%s.__%s_int__ <= %s'%(cn, k, a))


2217


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   695                             args.append(date_rng.to_value.as_seconds())


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   696                     except ValueError:


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   697                         # If range creation fails - ignore that search parameter


2679


b3f0b7b9d20d
for MySQL connection, password argument is called 'passwd'.

Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 
2634
diff
changeset


   698                         pass


1415


6883852e9b15
mysql backend passes all tests (at last!)

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1375
diff
changeset


   699             else:


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   700                 if isinstance(v, type([])):


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   701                     s = ','.join([a for x in v])


2319


7cf7e3bd1b31
more column uniqueness fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2318
diff
changeset


   702                     where.append('_%s._%s in (%s)'%(cn, k, s))


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   703                     args = args + v


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   704                 else:


2319


7cf7e3bd1b31
more column uniqueness fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2318
diff
changeset


   705                     where.append('_%s._%s=%s'%(cn, k, a))


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   706                     args.append(v)


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   707 


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   708         # don't match retired nodes


2318


fa2f7ba34399
merge from maint-0-7

Richard Jones <richard@users.sourceforge.net>
parents: 
2256
diff
changeset


   709         where.append('_%s.__retired__ <> 1'%cn)


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   710 


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   711         # add results of full text search


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   712         if search_matches is not None:


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   713             v = search_matches.keys()


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   714             s = ','.join([a for x in v])


2319


7cf7e3bd1b31
more column uniqueness fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2318
diff
changeset


   715             where.append('_%s.id in (%s)'%(cn, s))


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   716             args = args + v


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   717 


2720


15d945dff53d
add sanity check for sort and group on same property [SF#1033477]

Richard Jones <richard@users.sourceforge.net>
parents: 
2717
diff
changeset


   718         # sanity check: sorting *and* grouping on the same property?


15d945dff53d
add sanity check for sort and group on same property [SF#1033477]

Richard Jones <richard@users.sourceforge.net>
parents: 
2717
diff
changeset


   719         if group[1] == sort[1]:


15d945dff53d
add sanity check for sort and group on same property [SF#1033477]

Richard Jones <richard@users.sourceforge.net>
parents: 
2717
diff
changeset


   720             sort = (None, None)


15d945dff53d
add sanity check for sort and group on same property [SF#1033477]

Richard Jones <richard@users.sourceforge.net>
parents: 
2717
diff
changeset


   721 


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   722         # "grouping" is just the first-order sorting in the SQL fetch


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   723         orderby = []


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   724         ordercols = []


2217


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   725         mlsort = []


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   726         for sortby in group, sort:


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   727             sdir, prop = sortby


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   728             if sdir and prop:


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   729                 if isinstance(props[prop], Multilink):


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   730                     mlsort.append(sortby)


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   731                     continue


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   732                 elif isinstance(props[prop], Interval):


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   733                     # use the int column for sorting


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   734                     o = '__'+prop+'_int__'


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   735                     ordercols.append(o)


2318


fa2f7ba34399
merge from maint-0-7

Richard Jones <richard@users.sourceforge.net>
parents: 
2256
diff
changeset


   736                 elif isinstance(props[prop], Link):


fa2f7ba34399
merge from maint-0-7

Richard Jones <richard@users.sourceforge.net>
parents: 
2256
diff
changeset


   737                     # determine whether the linked Class has an order property


fa2f7ba34399
merge from maint-0-7

Richard Jones <richard@users.sourceforge.net>
parents: 
2256
diff
changeset


   738                     lcn = props[prop].classname


fa2f7ba34399
merge from maint-0-7

Richard Jones <richard@users.sourceforge.net>
parents: 
2256
diff
changeset


   739                     link = self.db.classes[lcn]


2379


a2025bdd1491
fix grouping by NULL linked values

Richard Jones <richard@users.sourceforge.net>
parents: 
2362
diff
changeset


   740                     o = '_%s._%s'%(cn, prop)


3476


1142dafe0d7f
added setorderprop() and setlabelprop() to Class (lots of patches)

Richard Jones <richard@users.sourceforge.net>
parents: 
3458
diff
changeset


   741                     op = link.orderprop ()


1142dafe0d7f
added setorderprop() and setlabelprop() to Class (lots of patches)

Richard Jones <richard@users.sourceforge.net>
parents: 
3458
diff
changeset


   742                     if op != 'id':


2318


fa2f7ba34399
merge from maint-0-7

Richard Jones <richard@users.sourceforge.net>
parents: 
2256
diff
changeset


   743                         tn = '_' + lcn


2379


a2025bdd1491
fix grouping by NULL linked values

Richard Jones <richard@users.sourceforge.net>
parents: 
2362
diff
changeset


   744                         loj.append('LEFT OUTER JOIN %s on %s=%s.id'%(tn,


a2025bdd1491
fix grouping by NULL linked values

Richard Jones <richard@users.sourceforge.net>
parents: 
2362
diff
changeset


   745                             o, tn))


3476


1142dafe0d7f
added setorderprop() and setlabelprop() to Class (lots of patches)

Richard Jones <richard@users.sourceforge.net>
parents: 
3458
diff
changeset


   746                         o = tn + '._%s'%op


1142dafe0d7f
added setorderprop() and setlabelprop() to Class (lots of patches)

Richard Jones <richard@users.sourceforge.net>
parents: 
3458
diff
changeset


   747                     ordercols.append(o)


2217


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   748                 elif prop == 'id':


2319


7cf7e3bd1b31
more column uniqueness fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2318
diff
changeset


   749                     o = '_%s.id'%cn


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   750                 else:


2319


7cf7e3bd1b31
more column uniqueness fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2318
diff
changeset


   751                     o = '_%s._%s'%(cn, prop)


2217


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   752                     ordercols.append(o)


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   753                 if sdir == '-':


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   754                     o += ' desc'


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   755                 orderby.append(o)


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   756 


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   757         # construct the SQL


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   758         frum = ','.join(frum)


1415


6883852e9b15
mysql backend passes all tests (at last!)

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1375
diff
changeset


   759         if where:


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   760             where = ' where ' + (' and '.join(where))


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   761         else:


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   762             where = ''


2240


ad4b717e12b9
Small optimisation to only use "select distinct(id) ..."...

Richard Jones <richard@users.sourceforge.net>
parents: 
2237
diff
changeset


   763         if mlfilt:


ad4b717e12b9
Small optimisation to only use "select distinct(id) ..."...

Richard Jones <richard@users.sourceforge.net>
parents: 
2237
diff
changeset


   764             # we're joining tables on the id, so we will get dupes if we


ad4b717e12b9
Small optimisation to only use "select distinct(id) ..."...

Richard Jones <richard@users.sourceforge.net>
parents: 
2237
diff
changeset


   765             # don't distinct()


2318


fa2f7ba34399
merge from maint-0-7

Richard Jones <richard@users.sourceforge.net>
parents: 
2256
diff
changeset


   766             cols = ['distinct(_%s.id)'%cn]


2240


ad4b717e12b9
Small optimisation to only use "select distinct(id) ..."...

Richard Jones <richard@users.sourceforge.net>
parents: 
2237
diff
changeset


   767         else:


2318


fa2f7ba34399
merge from maint-0-7

Richard Jones <richard@users.sourceforge.net>
parents: 
2256
diff
changeset


   768             cols = ['_%s.id'%cn]


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   769         if orderby:


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   770             cols = cols + ordercols


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   771             order = ' order by %s'%(','.join(orderby))


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   772         else:


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   773             order = ''


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   774         cols = ','.join(cols)


2379


a2025bdd1491
fix grouping by NULL linked values

Richard Jones <richard@users.sourceforge.net>
parents: 
2362
diff
changeset


   775         loj = ' '.join(loj)


a2025bdd1491
fix grouping by NULL linked values

Richard Jones <richard@users.sourceforge.net>
parents: 
2362
diff
changeset


   776         sql = 'select %s from %s %s %s%s'%(cols, frum, loj, where, order)


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   777         args = tuple(args)


2514


091711fb2f8c
Initial logging integration: replace all debug prints with logging calls...

Richard Jones <richard@users.sourceforge.net>
parents: 
2508
diff
changeset


   778         self.db.sql(sql, args)


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   779         l = self.db.cursor.fetchall()


1415


6883852e9b15
mysql backend passes all tests (at last!)

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1375
diff
changeset


   780 


1839


06f5b36b201b
Fix a couple of failures in mysql backend unit tests.

Richard Jones <richard@users.sourceforge.net>
parents: 
1836
diff
changeset


   781         # return the IDs (the first column)


2098


18addf2a8596
Implemented proper datatypes in mysql and postgresql backends...

Richard Jones <richard@users.sourceforge.net>
parents: 
2093
diff
changeset


   782         # XXX numeric ids


2217


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   783         l = [str(row[0]) for row in l]


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   784 


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   785         if not mlsort:


2237


f624fc20f8fe
added capturing of stats

Richard Jones <richard@users.sourceforge.net>
parents: 
2234
diff
changeset


   786             if __debug__:


f624fc20f8fe
added capturing of stats

Richard Jones <richard@users.sourceforge.net>
parents: 
2234
diff
changeset


   787                 self.db.stats['filtering'] += (time.time() - start_t)


2217


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   788             return l


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   789 


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   790         # ergh. someone wants to sort by a multilink.


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   791         r = []


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   792         for id in l:


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   793             m = []


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   794             for ml in mlsort:


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   795                 m.append(self.get(id, ml[1]))


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   796             r.append((id, m))


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   797         i = 0


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   798         for sortby in mlsort:


2234


70d21059aa18
fix nested scope bug in multilink sorting in rdbms filtering

Richard Jones <richard@users.sourceforge.net>
parents: 
2217
diff
changeset


   799             def sortfun(a, b, dir=sortby[i], i=i):


2217


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   800                 if dir == '-':


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   801                     return cmp(b[1][i], a[1][i])


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   802                 else:


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   803                     return cmp(a[1][i], b[1][i])


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   804             r.sort(sortfun)


98d3bf8ffb19
store Intervals as two columns (and other fixes

Richard Jones <richard@users.sourceforge.net>
parents: 
2166
diff
changeset


   805             i += 1


2237


f624fc20f8fe
added capturing of stats

Richard Jones <richard@users.sourceforge.net>
parents: 
2234
diff
changeset


   806         r = [i[0] for i in r]


f624fc20f8fe
added capturing of stats

Richard Jones <richard@users.sourceforge.net>
parents: 
2234
diff
changeset


   807 


f624fc20f8fe
added capturing of stats

Richard Jones <richard@users.sourceforge.net>
parents: 
2234
diff
changeset


   808         if __debug__:


f624fc20f8fe
added capturing of stats

Richard Jones <richard@users.sourceforge.net>
parents: 
2234
diff
changeset


   809             self.db.stats['filtering'] += (time.time() - start_t)


f624fc20f8fe
added capturing of stats

Richard Jones <richard@users.sourceforge.net>
parents: 
2234
diff
changeset


   810 


f624fc20f8fe
added capturing of stats

Richard Jones <richard@users.sourceforge.net>
parents: 
2234
diff
changeset


   811         return r


1415


6883852e9b15
mysql backend passes all tests (at last!)

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1375
diff
changeset


   812 


6883852e9b15
mysql backend passes all tests (at last!)

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1375
diff
changeset


   813 class Class(MysqlClass, rdbms_common.Class):


6883852e9b15
mysql backend passes all tests (at last!)

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1375
diff
changeset


   814     pass


6883852e9b15
mysql backend passes all tests (at last!)

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1375
diff
changeset


   815 class IssueClass(MysqlClass, rdbms_common.IssueClass):


6883852e9b15
mysql backend passes all tests (at last!)

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1375
diff
changeset


   816     pass


6883852e9b15
mysql backend passes all tests (at last!)

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1375
diff
changeset


   817 class FileClass(MysqlClass, rdbms_common.FileClass):


6883852e9b15
mysql backend passes all tests (at last!)

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1375
diff
changeset


   818     pass


6883852e9b15
mysql backend passes all tests (at last!)

Andrey Lebedev <kedder@users.sourceforge.net>
parents: 
1375
diff
changeset


   819 


2679


b3f0b7b9d20d
for MySQL connection, password argument is called 'passwd'.

Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 
2634
diff
changeset


   820 # vim: set et sts=4 sw=4 :
author	Richard Jones <richard@users.sourceforge.net>
date	Fri, 20 Jan 2006 02:40:56 +0000
parents	931dc7ed25c7
children	602bb26a9485