Author: phd
Date: 2010-10-08 20:06:47 -0600 (Fri, 08 Oct 2010)
New Revision: 4250
Added:
SQLObject/trunk/sqlobject/tests/test_string_id.py
Removed:
SQLObject/trunk/sqlobject/tests/test_string_id.py
SQLObject/trunk/sqlobject/tests/test_stringid.py
Log:
Merged revision 4247 from branch 0.12: removed test_string_id.py;
renamed test_stringid.py to test_string_id.py; added tests.
Deleted: SQLObject/trunk/sqlobject/tests/test_string_id.py
===================================================================
--- SQLObject/trunk/sqlobject/tests/test_string_id.py 2010-10-09 02:05:07 UTC (rev 4249)
+++ SQLObject/trunk/sqlobject/tests/test_string_id.py 2010-10-09 02:06:47 UTC (rev 4250)
@@ -1,17 +0,0 @@
-from sqlobject import *
-from sqlobject.tests.dbtest import *
-
-class TestStringID(SQLObject):
- class sqlmeta(sqlmeta):
- idType = str
- idName = 'test_id_here'
- name = StringCol(length=100)
-
-def test_string_id():
- conn = getConnection()
- TestStringID.setConnection(conn)
- TestStringID.dropTable(ifExists=True)
- assert not conn.tableExists(TestStringID.sqlmeta.table)
- TestStringID.createTable()
- TestStringID(id="TestStringID", name="TestStringID name")
- assert len(list(TestStringID.selectBy(id='TestStringID'))) == 1
Copied: SQLObject/trunk/sqlobject/tests/test_string_id.py (from rev 4249, SQLObject/branches/0.12/sqlobject/tests/test_string_id.py)
===================================================================
--- SQLObject/trunk/sqlobject/tests/test_string_id.py (rev 0)
+++ SQLObject/trunk/sqlobject/tests/test_string_id.py 2010-10-09 02:06:47 UTC (rev 4250)
@@ -0,0 +1,76 @@
+from sqlobject import *
+from sqlobject.tests.dbtest import *
+
+########################################
+## String ID test
+########################################
+
+class SOStringID(SQLObject):
+
+ class sqlmeta(sqlmeta):
+ table = 'so_string_id'
+ idType = str
+ val = StringCol(alternateID=True)
+
+ mysqlCreate = """
+ CREATE TABLE IF NOT EXISTS so_string_id (
+ id VARCHAR(50) PRIMARY KEY,
+ val TEXT
+ )
+ """
+
+ postgresCreate = """
+ CREATE TABLE so_string_id (
+ id VARCHAR(50) PRIMARY KEY,
+ val TEXT
+ )
+ """
+
+ sybaseCreate = """
+ CREATE TABLE so_string_id (
+ id VARCHAR(50) UNIQUE,
+ val VARCHAR(50) NULL
+ )
+ """
+
+ firebirdCreate = """
+ CREATE TABLE so_string_id (
+ id VARCHAR(50) NOT NULL PRIMARY KEY,
+ val BLOB SUB_TYPE TEXT
+ )
+ """
+
+ mssqlCreate = """
+ CREATE TABLE so_string_id (
+ id VARCHAR(50) PRIMARY KEY,
+ val varchar(4000)
+ )
+ """
+
+ sqliteCreate = postgresCreate
+
+ mysqlDrop = """
+ DROP TABLE IF EXISTS so_string_id
+ """
+
+ postgresDrop = """
+ DROP TABLE so_string_id
+ """
+
+ sqliteDrop = postgresDrop
+ firebirdDrop = postgresDrop
+ mssqlDrop = postgresDrop
+
+def test_stringID():
+ setupClass(SOStringID)
+ t1 = SOStringID(id='hey', val='whatever')
+ t2 = SOStringID.byVal('whatever')
+ assert t1 == t2
+ assert t1.val == t2.val
+ assert t1.val == 'whatever'
+
+ t1 = SOStringID(id='you', val='nowhere')
+ t2 = SOStringID.get('you')
+ assert t1 == t2
+ assert t1.val == t2.val
+ assert t1.val == 'nowhere'
Deleted: SQLObject/trunk/sqlobject/tests/test_stringid.py
===================================================================
--- SQLObject/trunk/sqlobject/tests/test_stringid.py 2010-10-09 02:05:07 UTC (rev 4249)
+++ SQLObject/trunk/sqlobject/tests/test_stringid.py 2010-10-09 02:06:47 UTC (rev 4250)
@@ -1,71 +0,0 @@
-from sqlobject import *
-from sqlobject.tests.dbtest import *
-
-########################################
-## String ID test
-########################################
-
-class SOStringID(SQLObject):
-
- class sqlmeta(sqlmeta):
- table = 'so_string_id'
- idType = str
- val = StringCol(alternateID=True)
-
- mysqlCreate = """
- CREATE TABLE IF NOT EXISTS so_string_id (
- id VARCHAR(50) PRIMARY KEY,
- val TEXT
- )
- """
-
- postgresCreate = """
- CREATE TABLE so_string_id (
- id VARCHAR(50) PRIMARY KEY,
- val TEXT
- )
- """
-
- sybaseCreate = """
- CREATE TABLE so_string_id (
- id VARCHAR(50) UNIQUE,
- val VARCHAR(50) NULL
- )
- """
-
- firebirdCreate = """
- CREATE TABLE so_string_id (
- id VARCHAR(50) NOT NULL PRIMARY KEY,
- val BLOB SUB_TYPE TEXT
- )
- """
-
- mssqlCreate = """
- CREATE TABLE so_string_id (
- id VARCHAR(50) PRIMARY KEY,
- val varchar(4000)
- )
- """
-
- sqliteCreate = postgresCreate
-
- mysqlDrop = """
- DROP TABLE IF EXISTS so_string_id
- """
-
- postgresDrop = """
- DROP TABLE so_string_id
- """
-
- sqliteDrop = postgresDrop
- firebirdDrop = postgresDrop
- mssqlDrop = postgresDrop
-
-def test_stringID():
- setupClass(SOStringID)
- t = SOStringID(id='hey', val='whatever')
- t2 = SOStringID.byVal('whatever')
- assert t == t2
- t3 = SOStringID(id='you', val='nowhere')
- t4 = SOStringID.get('you')
- assert t3 == t4
|
