wbond / flourish / changeset / 16d99e48403c

wbond / flourish (http://flourishlib.com/)

Flourish is a PHP unframework — a general-purpose, object-oriented library. It's architecture is modular and thus not strictly MVC. It focuses on being secure, broadly compatible, portable, well documented and easy to use.

Clone this repository (size: 2.3 MB): HTTPS / SSH

$ hg clone http://bitbucket.org/wbond/flourish/

$ hg clone ssh://hg@bitbucket.org/wbond/flourish/

commit 729:	16d99e48403c
parent 728:	7d1ef15048ed
branch:	trunk

[svn r730] Fixed ticket #346 - fORMOrdering was creating incorrect SQL statements for columns in unique constraints with three or more columns. Fixed a bug with detecting unique constraints in fSchema for SQL Server, and fixed a bug in loading fActiveRecord objects with only some of the columns in a multi-column primary key.

Changed (Δ9.6 KB):

raw changeset »

classes/fActiveRecord.php (3 lines added, 2 lines removed)

classes/fORMOrdering.php (4 lines added, 3 lines removed)

classes/fSchema.php (3 lines added, 2 lines removed)

tests/classes/fActiveRecord/fActiveRecordTest.php (1 lines added, 0 lines removed)

tests/classes/fORMOrdering/fORMOrderingTest.php (122 lines added, 0 lines removed)

tests/database/setup-extended.mssql.sql (15 lines added, 0 lines removed)

tests/database/setup-extended.mysql.sql (16 lines added, 0 lines removed)

tests/database/setup-extended.oracle.sql (15 lines added, 0 lines removed)

tests/database/setup-extended.postgresql.sql (15 lines added, 0 lines removed)

tests/database/setup-extended.sqlite.sql (15 lines added, 0 lines removed)

tests/database/teardown-extended.mssql.sql (1 lines added, 0 lines removed)

tests/database/teardown-extended.mysql.sql (1 lines added, 1 lines removed)

tests/database/teardown-extended.oracle.sql (1 lines added, 0 lines removed)

tests/database/teardown-extended.postgresql.sql (1 lines added, 0 lines removed)

tests/database/teardown-extended.sqlite.sql (1 lines added, 0 lines removed)

Up to file-list classes/fActiveRecord.php:

  * @package    Flourish
  * @link       http://flourishlib.com/fActiveRecord
+ *
- * @version    1.0.0b49
+ * @version    1.0.0b50
  * @changes    1.0.0b50  Fixed a bug with trying to load by a multi-column primary key where one of the columns was not specified [wb, 2009-11-13]
  * @changes    1.0.0b49  Fixed a bug affecting where conditions with columns that are not null but have a default value [wb, 2009-11-03]
  * @changes    1.0.0b48  Updated code for the new fORMDatabase and fORMSchema APIs [wb, 2009-10-28]
  * @changes    1.0.0b47  Changed `::associate{RelatedRecords}()`, `::link{RelatedRecords}()` and `::populate{RelatedRecords}()` to allow for method chaining [wb, 2009-10-22]
@@ -1051,7 +1052,7 @@ abstract class fActiveRecord
+				}
+			}
-			$wrong_keys = is_array($key) && array_diff(array_keys($key), $pk_columns);
+			$wrong_keys = is_array($key) && (count($key) != count($pk_columns) || array_diff(array_keys($key), $pk_columns));
 			$wrong_type = !is_array($key) && (sizeof($pk_columns) != 1 || !is_scalar($key));
 			// If we didn't find a UNIQUE key and primary key doesn't look right we fail

Up to file-list classes/fORMOrdering.php:

 * @package    Flourish
 * @link       http://flourishlib.com/fORMOrdering
 * 
 * @version    1.0.0b14
 * @version    1.0.0b15
 * @changes    1.0.0b15  Fixed a bug with ordering columns that are part of a multi-column unique constraint [wb, 2009-11-13]
 * @changes    1.0.0b14  Fixed a bug affecting where conditions with columns that are not null but have a default value [wb, 2009-11-03]
 * @changes    1.0.0b13  Updated code for the new fORMDatabase and fORMSchema APIs [wb, 2009-10-28]
 * @changes    1.0.0b12  Changed SQL statements to use value placeholders, identifier escaping and schema support [wb, 2009-10-22]

			$conditions[] = fORMDatabase::makeCondition($schema, $table, $other_column, '=', $value);
		}
		
		$params[0] .= join(', ', $conditions);
		$params[0] .= join(' AND ', $conditions);
		
		return $params;
	}

			$conditions[] = fORMDatabase::makeCondition($schema, $table, $other_column, '=', $value);
		}
		
		$params[0] .= join(', ', $conditions);
		$params[0] .= join(' AND ', $conditions);
		
		return $params;
	}

Up to file-list classes/fSchema.php:

  * @package    Flourish
  * @link       http://flourishlib.com/fSchema
+ *
- * @version    1.0.0b27
+ * @version    1.0.0b28
  * @changes    1.0.0b28  Fixed a bug with detecting some multi-column unique constraints in SQL Server databases [wb, 2009-11-13]
  * @changes    1.0.0b27  Added a parameter to ::enableCaching() to provide a key token that will allow cached values to be shared between multiple databases with the same schema [wb, 2009-10-28]
  * @changes    1.0.0b26  Added the placeholder element to the output of ::getColumnInfo(), added support for PostgreSQL, MSSQL and Oracle "schemas", added support for parsing quoted SQLite identifiers [wb, 2009-10-22]
  * @changes    1.0.0b25  One-to-one relationships utilizing the primary key as a foreign key are now properly detected [wb, 2009-09-22]
@@ -562,7 +563,7 @@ class fSchema
+		}
 		if (isset($temp)) {
-			if ($last_type == 'foreign') {
+			if ($last_type == 'foreign' || $last_type == 'unique') {
 				if (!isset($keys[$last_table][$last_type])) {
 					$keys[$last_table][$last_type] = array();
+				}

Up to file-list tests/classes/fActiveRecord/fActiveRecordTest.php:

@@ -10,6 +10,7 @@ class UserDetail extends fActiveRecord {
 class RecordDeal extends fActiveRecord { }
 class RecordLabel extends fActiveRecord { }
 class FavoriteAlbum extends fActiveRecord { }
 class YearFavoriteAlbum extends fActiveRecord { }
 class InvalidTable extends fActiveRecord { }
 class fActiveRecordTest extends PHPUnit_Framework_TestSuite

Up to file-list tests/classes/fORMOrdering/fORMOrderingTest.php:

@@ -9,6 +9,7 @@ class Song extends fActiveRecord { }
 class UserDetail extends fActiveRecord { }
 class RecordLabel extends fActiveRecord { }
 class FavoriteAlbum extends fActiveRecord { }
 class YearFavoriteAlbum extends fActiveRecord { }
 class InvalidTable extends fActiveRecord { }
 class TopAlbum extends fActiveRecord { }
@@ -25,6 +26,7 @@ class fORMOrderingTest extends PHPUnit_F
 		fORMDatabase::attach($this->sharedFixture);
 		fORMOrdering::configureOrderingColumn('TopAlbum', 'position');
 		fORMOrdering::configureOrderingColumn('FavoriteAlbum', 'position');
 		fORMOrdering::configureOrderingColumn('YearFavoriteAlbum', 'position');
+	}
@@ -311,6 +313,126 @@ class fORMOrderingTest extends PHPUnit_F
+	}
 	static public function reorderThreeColumnProvider()
+	{
 		$output = array();
 		// Original order
 		//$output[] = array('will@flourishlib.com', 2009, 1, 2, array(2, 1, 3, 7, 4));
 		$output[] = array('will@flourishlib.com', 2009, 1, 1, array(1, 2, 3, 7, 4));
 		$output[] = array('will@flourishlib.com', 2009, 2, 2, array(1, 2, 3, 7, 4));
 		$output[] = array('will@flourishlib.com', 2009, 4, 4, array(2, 1, 3, 4, 7));
 		$output[] = array('will@flourishlib.com', 2009, 7, 5, array(2, 1, 3, 4, 7));
 		$output[] = array('will@flourishlib.com', 2009, 2, 5, array(1, 3, 7, 4, 2));
 		$output[] = array('will@flourishlib.com', 2009, 1, 5, array(2, 3, 7, 4, 1));
 		return $output;
+	}
 	/**
 	 * @dataProvider reorderThreeColumnProvider
 	 */
 	public function testReorderThreeColumn($email, $year, $album_id, $end_position, $resulting_order)
+	{
 		$favorite_album = new YearFavoriteAlbum(array('email' => $email, 'year' => $year, 'album_id' => $album_id));
 		$favorite_album->setPosition($end_position);
 		$favorite_album->store();
 		$expected_result = array();
 		foreach ($resulting_order as $index => $album_id) {
 			$expected_result[] = array(
 				'email'    => $email,
 				'position' => $index+1,
 				'album_id' => $album_id
 			);
+		}
 		$actual_result = $this->sharedFixture->translatedQuery("SELECT email, position, album_id FROM year_favorite_albums WHERE email = %s ORDER BY position ASC", $email)->fetchAllRows();
 		$this->assertEquals($expected_result, $actual_result);
+	}
 	static public function addThreeColumnProvider()
+	{
 		$output = array();
 		// Original order
 		//$output[] = array('will@flourishlib.com', 2009, 6, 1, array(2, 1, 3, 7, 4));
 		$output[] = array('will@flourishlib.com', 2009, 6, 1, array(6, 2, 1, 3, 7, 4));
 		$output[] = array('will@flourishlib.com', 2009, 6, 2, array(2, 6, 1, 3, 7, 4));
 		$output[] = array('will@flourishlib.com', 2009, 6, 3, array(2, 1, 6, 3, 7, 4));
 		$output[] = array('will@flourishlib.com', 2009, 6, 4, array(2, 1, 3, 6, 7, 4));
 		$output[] = array('will@flourishlib.com', 2009, 6, 5, array(2, 1, 3, 7, 6, 4));
 		$output[] = array('will@flourishlib.com', 2009, 6, 6, array(2, 1, 3, 7, 4, 6));
 		$output[] = array('will@flourishlib.com', 2009, 6, NULL, array(2, 1, 3, 7, 4, 6));
 		$output[] = array('will@flourishlib.com', 2009, 6, 9, array(2, 1, 3, 7, 4, 6));
 		return $output;
+	}
 	/**
 	 * @dataProvider addThreeColumnProvider
 	 */
 	public function testAddThreeColumn($email, $year, $album_id, $position, $resulting_order)
+	{
 		$favorite_album = new YearFavoriteAlbum();
 		$favorite_album->setAlbumId($album_id);
 		$favorite_album->setEmail($email);
 		$favorite_album->setPosition($position);
 		$favorite_album->setYear($year);
 		$favorite_album->store();
 		$expected_result = array();
 		foreach ($resulting_order as $index => $album_id) {
 			$expected_result[] = array(
 				'email'    => $email,
 				'position' => $index+1,
 				'album_id' => $album_id
 			);
+		}
 		$actual_result = $this->sharedFixture->translatedQuery("SELECT email, position, album_id FROM year_favorite_albums WHERE email = %s ORDER BY position ASC", $email)->fetchAllRows();
 		$this->assertEquals($expected_result, $actual_result);
+	}
 	static public function deleteThreeColumnProvider()
+	{
 		$output = array();
 		// Original order
 		//$output[] = array('will@flourishlib.com', 2009, 1, array(2, 1, 3, 7, 4));
 		$output[] = array('will@flourishlib.com', 2009, 2, array(1, 3, 7, 4));
 		$output[] = array('will@flourishlib.com', 2009, 1, array(2, 3, 7, 4));
 		$output[] = array('will@flourishlib.com', 2009, 3, array(2, 1, 7, 4));
 		$output[] = array('will@flourishlib.com', 2009, 7, array(2, 1, 3, 4));
 		$output[] = array('will@flourishlib.com', 2009, 4, array(2, 1, 3, 7));
 		return $output;
+	}
 	/**
 	 * @dataProvider deleteThreeColumnProvider
 	 */
 	public function testDeleteThreeColumn($email, $year, $album_id, $resulting_order)
+	{
 		$favorite_album = new YearFavoriteAlbum(array('email' => $email, 'year' => $year, 'album_id' => $album_id));
 		$favorite_album->delete();
 		$expected_result = array();
 		foreach ($resulting_order as $index => $album_id) {
 			$expected_result[] = array(
 				'email'    => $email,
 				'position' => $index+1,
 				'album_id' => $album_id
 			);
+		}
 		$actual_result = $this->sharedFixture->translatedQuery("SELECT email, position, album_id FROM year_favorite_albums WHERE email = %s ORDER BY position ASC", $email)->fetchAllRows();
 		$this->assertEquals($expected_result, $actual_result);
+	}
 	static public function inspectProvider()
+	{
 		$output = array();

Up to file-list tests/database/setup-extended.mssql.sql:

@@ -21,6 +21,15 @@ CREATE TABLE favorite_albums (
 	PRIMARY KEY (email, album_id)
 );
 CREATE TABLE year_favorite_albums (
 	email VARCHAR(200) NOT NULL REFERENCES users(email_address) ON UPDATE CASCADE ON DELETE CASCADE,
 	year INTEGER NOT NULL,
 	album_id INTEGER NOT NULL REFERENCES albums(album_id) ON DELETE CASCADE,
 	position INTEGER NOT NULL,
 	UNIQUE (email, year, position),
 	PRIMARY KEY (email, year, album_id)
 );
 CREATE TABLE top_albums (
 	top_album_id INTEGER IDENTITY(1,1) PRIMARY KEY,
 	album_id INTEGER NOT NULL UNIQUE REFERENCES albums(album_id) ON DELETE CASCADE,
@@ -63,6 +72,12 @@ INSERT INTO favorite_albums (email, albu
 INSERT INTO favorite_albums (email, album_id, position) VALUES ('will@flourishlib.com', 7, 4);
 INSERT INTO favorite_albums (email, album_id, position) VALUES ('will@flourishlib.com', 4, 5);
 INSERT INTO year_favorite_albums (email, year, album_id, position) VALUES ('will@flourishlib.com', 2009, 2, 1);
 INSERT INTO year_favorite_albums (email, year, album_id, position) VALUES ('will@flourishlib.com', 2009, 1, 2);
 INSERT INTO year_favorite_albums (email, year, album_id, position) VALUES ('will@flourishlib.com', 2009, 3, 3);
 INSERT INTO year_favorite_albums (email, year, album_id, position) VALUES ('will@flourishlib.com', 2009, 7, 4);
 INSERT INTO year_favorite_albums (email, year, album_id, position) VALUES ('will@flourishlib.com', 2009, 4, 5);
 INSERT INTO favorite_albums (email, album_id, position) VALUES ('john@smith.com', 2, 1);
 INSERT INTO events (title, start_date, end_date) VALUES ('First Event',   '2008-01-01', '2008-01-01');

Up to file-list tests/database/setup-extended.mysql.sql:

@@ -24,6 +24,16 @@ CREATE TABLE favorite_albums (
 	PRIMARY KEY (email, album_id)
 )ENGINE=InnoDB;
 CREATE TABLE year_favorite_albums (
 	email VARCHAR(200) NOT NULL,
 	year INTEGER NOT NULL,
 	album_id INTEGER NOT NULL REFERENCES albums(album_id) ON DELETE CASCADE,
 	position INTEGER NOT NULL,
 	UNIQUE (email, year, position),
 	FOREIGN KEY (email) REFERENCES users(email_address) ON UPDATE CASCADE ON DELETE CASCADE,
 	PRIMARY KEY (email, year, album_id)
 )ENGINE=InnoDB;
 CREATE TABLE top_albums (
 	top_album_id INTEGER PRIMARY KEY AUTO_INCREMENT,
 	album_id INTEGER NOT NULL UNIQUE,
@@ -67,6 +77,12 @@ INSERT INTO favorite_albums (email, albu
 INSERT INTO favorite_albums (email, album_id, position) VALUES ('will@flourishlib.com', 7, 4);
 INSERT INTO favorite_albums (email, album_id, position) VALUES ('will@flourishlib.com', 4, 5);
 INSERT INTO year_favorite_albums (email, year, album_id, position) VALUES ('will@flourishlib.com', 2009, 2, 1);
 INSERT INTO year_favorite_albums (email, year, album_id, position) VALUES ('will@flourishlib.com', 2009, 1, 2);
 INSERT INTO year_favorite_albums (email, year, album_id, position) VALUES ('will@flourishlib.com', 2009, 3, 3);
 INSERT INTO year_favorite_albums (email, year, album_id, position) VALUES ('will@flourishlib.com', 2009, 7, 4);
 INSERT INTO year_favorite_albums (email, year, album_id, position) VALUES ('will@flourishlib.com', 2009, 4, 5);
 INSERT INTO favorite_albums (email, album_id, position) VALUES ('john@smith.com', 2, 1);
 INSERT INTO events (title, start_date, end_date) VALUES ('First Event',   '2008-01-01', '2008-01-01');

Up to file-list tests/database/setup-extended.oracle.sql:

@@ -21,6 +21,15 @@ CREATE TABLE favorite_albums (
 	PRIMARY KEY (email, album_id)
 );
 CREATE TABLE year_favorite_albums (
 	email VARCHAR(200) NOT NULL REFERENCES users(email_address) ON DELETE CASCADE,
 	year INTEGER NOT NULL,
 	album_id INTEGER NOT NULL REFERENCES albums(album_id) ON DELETE CASCADE,
 	position INTEGER NOT NULL,
 	UNIQUE (email, year, position),
 	PRIMARY KEY (email, year, album_id)
 );
 CREATE TABLE top_albums (
 	top_album_id INTEGER PRIMARY KEY,
 	album_id INTEGER NOT NULL UNIQUE REFERENCES albums(album_id) ON DELETE CASCADE,
@@ -87,6 +96,12 @@ INSERT INTO favorite_albums (email, albu
 INSERT INTO favorite_albums (email, album_id, position) VALUES ('will@flourishlib.com', 7, 4);
 INSERT INTO favorite_albums (email, album_id, position) VALUES ('will@flourishlib.com', 4, 5);
 INSERT INTO year_favorite_albums (email, year, album_id, position) VALUES ('will@flourishlib.com', 2009, 2, 1);
 INSERT INTO year_favorite_albums (email, year, album_id, position) VALUES ('will@flourishlib.com', 2009, 1, 2);
 INSERT INTO year_favorite_albums (email, year, album_id, position) VALUES ('will@flourishlib.com', 2009, 3, 3);
 INSERT INTO year_favorite_albums (email, year, album_id, position) VALUES ('will@flourishlib.com', 2009, 7, 4);
 INSERT INTO year_favorite_albums (email, year, album_id, position) VALUES ('will@flourishlib.com', 2009, 4, 5);
 INSERT INTO favorite_albums (email, album_id, position) VALUES ('john@smith.com', 2, 1);
 INSERT INTO events (title, start_date, end_date) VALUES ('First Event',   '2008-01-01', '2008-01-01');

Up to file-list tests/database/setup-extended.postgresql.sql:

@@ -21,6 +21,15 @@ CREATE TABLE favorite_albums (
 	PRIMARY KEY (email, album_id)
 );
 CREATE TABLE year_favorite_albums (
 	email VARCHAR(200) NOT NULL REFERENCES users(email_address) ON UPDATE CASCADE ON DELETE CASCADE,
 	year INTEGER NOT NULL,
 	album_id INTEGER NOT NULL REFERENCES albums(album_id) ON DELETE CASCADE,
 	position INTEGER NOT NULL,
 	UNIQUE (email, year, position),
 	PRIMARY KEY (email, year, album_id)
 );
 CREATE TABLE top_albums (
 	top_album_id SERIAL PRIMARY KEY,
 	album_id INTEGER NOT NULL UNIQUE REFERENCES albums(album_id) ON DELETE CASCADE,
@@ -63,6 +72,12 @@ INSERT INTO favorite_albums (email, albu
 INSERT INTO favorite_albums (email, album_id, position) VALUES ('will@flourishlib.com', 7, 4);
 INSERT INTO favorite_albums (email, album_id, position) VALUES ('will@flourishlib.com', 4, 5);
 INSERT INTO year_favorite_albums (email, year, album_id, position) VALUES ('will@flourishlib.com', 2009, 2, 1);
 INSERT INTO year_favorite_albums (email, year, album_id, position) VALUES ('will@flourishlib.com', 2009, 1, 2);
 INSERT INTO year_favorite_albums (email, year, album_id, position) VALUES ('will@flourishlib.com', 2009, 3, 3);
 INSERT INTO year_favorite_albums (email, year, album_id, position) VALUES ('will@flourishlib.com', 2009, 7, 4);
 INSERT INTO year_favorite_albums (email, year, album_id, position) VALUES ('will@flourishlib.com', 2009, 4, 5);
 INSERT INTO favorite_albums (email, album_id, position) VALUES ('john@smith.com', 2, 1);
 INSERT INTO events (title, start_date, end_date) VALUES ('First Event',   '2008-01-01', '2008-01-01');

Up to file-list tests/database/setup-extended.sqlite.sql:

@@ -21,6 +21,15 @@ CREATE TABLE favorite_albums (
 	PRIMARY KEY (email, album_id)
 );
 CREATE TABLE year_favorite_albums (
 	email VARCHAR(200) NOT NULL REFERENCES users(email_address) ON UPDATE CASCADE ON DELETE CASCADE,
 	year integer NOT NULL,
 	album_id INTEGER NOT NULL REFERENCES albums(album_id) ON DELETE CASCADE,
 	position INTEGER NOT NULL,
 	UNIQUE (email, year, position),
 	PRIMARY KEY (email, year, album_id)
 );
 CREATE TABLE top_albums (
 	top_album_id INTEGER PRIMARY KEY AUTOINCREMENT,
 	album_id INTEGER NOT NULL UNIQUE REFERENCES albums(album_id) ON DELETE CASCADE,
@@ -63,6 +72,12 @@ INSERT INTO favorite_albums (email, albu
 INSERT INTO favorite_albums (email, album_id, position) VALUES ('will@flourishlib.com', 7, 4);
 INSERT INTO favorite_albums (email, album_id, position) VALUES ('will@flourishlib.com', 4, 5);
 INSERT INTO year_favorite_albums (email, year, album_id, position) VALUES ('will@flourishlib.com', 2009, 2, 1);
 INSERT INTO year_favorite_albums (email, year, album_id, position) VALUES ('will@flourishlib.com', 2009, 1, 2);
 INSERT INTO year_favorite_albums (email, year, album_id, position) VALUES ('will@flourishlib.com', 2009, 3, 3);
 INSERT INTO year_favorite_albums (email, year, album_id, position) VALUES ('will@flourishlib.com', 2009, 7, 4);
 INSERT INTO year_favorite_albums (email, year, album_id, position) VALUES ('will@flourishlib.com', 2009, 4, 5);
 INSERT INTO favorite_albums (email, album_id, position) VALUES ('john@smith.com', 2, 1);
 INSERT INTO events (title, start_date, end_date) VALUES ('First Event',   '2008-01-01', '2008-01-01');

Up to file-list tests/database/teardown-extended.mssql.sql:

 DROP TABLE events;
 DROP TABLE invalid_tables;
 DROP TABLE top_albums;
 DROP TABLE year_favorite_albums;
 DROP TABLE favorite_albums;
 DROP TABLE record_deals;
 DROP TABLE record_labels;

Up to file-list tests/database/teardown-extended.mysql.sql:

DROP TABLE IF EXISTS events, invalid_tables, top_albums, favorite_albums, record_deals, record_labels, user_details;

DROP TABLE IF EXISTS events, invalid_tables, top_albums, year_favorite_albums, favorite_albums, record_deals, record_labels, user_details;

Up to file-list tests/database/teardown-extended.oracle.sql:

@@ -3,6 +3,7 @@ DROP SEQUENCE events_event_id_seq;
 DROP TABLE invalid_tables PURGE;
 DROP TABLE top_albums PURGE;
 DROP SEQUENCE top_albums_top_album_id_seq;
 DROP TABLE year_favorite_albums PURGE;
 DROP TABLE favorite_albums PURGE;
 DROP TABLE record_deals PURGE;
 DROP TABLE record_labels PURGE;

Up to file-list tests/database/teardown-extended.postgresql.sql:

 DROP TABLE events;
 DROP TABLE invalid_tables;
 DROP TABLE top_albums;
 DROP TABLE year_favorite_albums;
 DROP TABLE favorite_albums;
 DROP TABLE record_deals;
 DROP TABLE record_labels;

Up to file-list tests/database/teardown-extended.sqlite.sql:

 DROP TABLE events;
 DROP TABLE invalid_tables;
 DROP TABLE top_albums;
 DROP TABLE year_favorite_albums;
 DROP TABLE favorite_albums;
 DROP TABLE record_deals;
 DROP TABLE record_labels;

10	10	* @package Flourish
11	11	* @link http://flourishlib.com/fORMOrdering
12	12	*
13		* @version 1.0.0b14
	13	* @version 1.0.0b15
	14	* @changes 1.0.0b15 Fixed a bug with ordering columns that are part of a multi-column unique constraint [wb, 2009-11-13]
14	15	* @changes 1.0.0b14 Fixed a bug affecting where conditions with columns that are not null but have a default value [wb, 2009-11-03]
15	16	* @changes 1.0.0b13 Updated code for the new fORMDatabase and fORMSchema APIs [wb, 2009-10-28]
16	17	* @changes 1.0.0b12 Changed SQL statements to use value placeholders, identifier escaping and schema support [wb, 2009-10-22]
…	…	@@ -156,7 +157,7 @@ class fORMOrdering
156	157	$conditions[] = fORMDatabase::makeCondition($schema, $table, $other_column, '=', $value);
157	158	}
158	159
159		$params[0] .= join(', ', $conditions);
	160	$params[0] .= join(' AND ', $conditions);
160	161
161	162	return $params;
162	163	}
…	…	@@ -191,7 +192,7 @@ class fORMOrdering
191	192	$conditions[] = fORMDatabase::makeCondition($schema, $table, $other_column, '=', $value);
192	193	}
193	194
194		$params[0] .= join(', ', $conditions);
	195	$params[0] .= join(' AND ', $conditions);
195	196
196	197	return $params;
197	198	}