diff options
| author | christophe.boulain <> | 2008-12-03 14:22:03 +0000 |
|---|---|---|
| committer | christophe.boulain <> | 2008-12-03 14:22:03 +0000 |
| commit | 6228873cf9d6471463d2413e7dfd7447f759baf2 (patch) | |
| tree | 496a0e658330c39d4caa35602ba9f783b6f24f9c /framework/Data/Common | |
| parent | e8f239fea7351b248302a593a8e5eaa2a88c3e80 (diff) | |
Merge from trunk
Diffstat (limited to 'framework/Data/Common')
21 files changed, 3 insertions, 22 deletions
diff --git a/framework/Data/Common/IbmDb2/TIbmColumnMetaData.php b/framework/Data/Common/IbmDb2/TIbmColumnMetaData.php index ee87a374..3b7001ab 100644 --- a/framework/Data/Common/IbmDb2/TIbmColumnMetaData.php +++ b/framework/Data/Common/IbmDb2/TIbmColumnMetaData.php @@ -154,4 +154,3 @@ class TIbmColumnMetaData extends TComponent }
-?> diff --git a/framework/Data/Common/IbmDb2/TIbmMetaData.php b/framework/Data/Common/IbmDb2/TIbmMetaData.php index 059ef2d5..496bb12f 100644 --- a/framework/Data/Common/IbmDb2/TIbmMetaData.php +++ b/framework/Data/Common/IbmDb2/TIbmMetaData.php @@ -110,4 +110,3 @@ class TIbmMetaData extends TDbMetaDataCommon }
-?> diff --git a/framework/Data/Common/IbmDb2/TIbmMetaDataInspector.php b/framework/Data/Common/IbmDb2/TIbmMetaDataInspector.php index cfb4803d..a37fad6e 100644 --- a/framework/Data/Common/IbmDb2/TIbmMetaDataInspector.php +++ b/framework/Data/Common/IbmDb2/TIbmMetaDataInspector.php @@ -110,4 +110,3 @@ class TIbmMetaDataInspector extends TDbMetaDataInspector return new TIbmMetaData($table,$columns,$pks);
}
}
-?> diff --git a/framework/Data/Common/Mssql/TMssqlCommandBuilder.php b/framework/Data/Common/Mssql/TMssqlCommandBuilder.php index 75d98198..1a0ad4ce 100644 --- a/framework/Data/Common/Mssql/TMssqlCommandBuilder.php +++ b/framework/Data/Common/Mssql/TMssqlCommandBuilder.php @@ -170,4 +170,3 @@ class TMssqlCommandBuilder extends TDbCommandBuilder }
}
-?> diff --git a/framework/Data/Common/Mssql/TMssqlMetaData.php b/framework/Data/Common/Mssql/TMssqlMetaData.php index faa94e69..8309e4ec 100644 --- a/framework/Data/Common/Mssql/TMssqlMetaData.php +++ b/framework/Data/Common/Mssql/TMssqlMetaData.php @@ -232,4 +232,3 @@ EOD; } } -?> diff --git a/framework/Data/Common/Mssql/TMssqlTableColumn.php b/framework/Data/Common/Mssql/TMssqlTableColumn.php index 5f41f429..8a291b52 100644 --- a/framework/Data/Common/Mssql/TMssqlTableColumn.php +++ b/framework/Data/Common/Mssql/TMssqlTableColumn.php @@ -62,4 +62,3 @@ class TMssqlTableColumn extends TDbTableColumn }
}
-?> diff --git a/framework/Data/Common/Mssql/TMssqlTableInfo.php b/framework/Data/Common/Mssql/TMssqlTableInfo.php index 3a2ae033..356c6f26 100644 --- a/framework/Data/Common/Mssql/TMssqlTableInfo.php +++ b/framework/Data/Common/Mssql/TMssqlTableInfo.php @@ -62,4 +62,3 @@ class TMssqlTableInfo extends TDbTableInfo }
}
-?> diff --git a/framework/Data/Common/Mysql/TMysqlCommandBuilder.php b/framework/Data/Common/Mysql/TMysqlCommandBuilder.php index b296a82d..3326851f 100644 --- a/framework/Data/Common/Mysql/TMysqlCommandBuilder.php +++ b/framework/Data/Common/Mysql/TMysqlCommandBuilder.php @@ -24,4 +24,3 @@ class TMysqlCommandBuilder extends TDbCommandBuilder {
}
-?> diff --git a/framework/Data/Common/Mysql/TMysqlMetaData.php b/framework/Data/Common/Mysql/TMysqlMetaData.php index aaebd8dc..75f7a7cf 100644 --- a/framework/Data/Common/Mysql/TMysqlMetaData.php +++ b/framework/Data/Common/Mysql/TMysqlMetaData.php @@ -246,7 +246,9 @@ class TMysqlMetaData extends TDbMetaData if($row['Key_name']==='PRIMARY')
$primary[] = $row['Column_name'];
}
- if($this->getServerVersion() > 5)
+ // MySQL version was increased to >=5.1.21 instead of 5.x + // due to a MySQL bug (http://bugs.mysql.com/bug.php?id=19588) + if($this->getServerVersion() >= 5.121)
$foreign = $this->getForeignConstraints($schemaName,$tableName);
else
$foreign = $this->findForeignConstraints($schemaName,$tableName);
@@ -352,4 +354,3 @@ EOD; }
}
-?> diff --git a/framework/Data/Common/Mysql/TMysqlTableColumn.php b/framework/Data/Common/Mysql/TMysqlTableColumn.php index 99b4333a..5f4351a7 100644 --- a/framework/Data/Common/Mysql/TMysqlTableColumn.php +++ b/framework/Data/Common/Mysql/TMysqlTableColumn.php @@ -70,4 +70,3 @@ class TMysqlTableColumn extends TDbTableColumn }
}
-?> diff --git a/framework/Data/Common/Pgsql/TPgsqlCommandBuilder.php b/framework/Data/Common/Pgsql/TPgsqlCommandBuilder.php index 460da46a..4cae8b89 100644 --- a/framework/Data/Common/Pgsql/TPgsqlCommandBuilder.php +++ b/framework/Data/Common/Pgsql/TPgsqlCommandBuilder.php @@ -67,4 +67,3 @@ class TPgsqlCommandBuilder extends TDbCommandBuilder }
-?> diff --git a/framework/Data/Common/Pgsql/TPgsqlMetaData.php b/framework/Data/Common/Pgsql/TPgsqlMetaData.php index 45d55086..a2243531 100644 --- a/framework/Data/Common/Pgsql/TPgsqlMetaData.php +++ b/framework/Data/Common/Pgsql/TPgsqlMetaData.php @@ -390,4 +390,3 @@ EOD; }
}
-?> diff --git a/framework/Data/Common/Pgsql/TPgsqlTableColumn.php b/framework/Data/Common/Pgsql/TPgsqlTableColumn.php index 7ec2312a..562e2c56 100644 --- a/framework/Data/Common/Pgsql/TPgsqlTableColumn.php +++ b/framework/Data/Common/Pgsql/TPgsqlTableColumn.php @@ -47,4 +47,3 @@ class TPgsqlTableColumn extends TDbTableColumn }
}
-?> diff --git a/framework/Data/Common/Pgsql/TPgsqlTableInfo.php b/framework/Data/Common/Pgsql/TPgsqlTableInfo.php index 2a3a8461..2447c141 100644 --- a/framework/Data/Common/Pgsql/TPgsqlTableInfo.php +++ b/framework/Data/Common/Pgsql/TPgsqlTableInfo.php @@ -56,4 +56,3 @@ class TPgsqlTableInfo extends TDbTableInfo }
}
-?> diff --git a/framework/Data/Common/Sqlite/TSqliteCommandBuilder.php b/framework/Data/Common/Sqlite/TSqliteCommandBuilder.php index c02ed76d..c60e17a3 100644 --- a/framework/Data/Common/Sqlite/TSqliteCommandBuilder.php +++ b/framework/Data/Common/Sqlite/TSqliteCommandBuilder.php @@ -45,4 +45,3 @@ class TSqliteCommandBuilder extends TDbCommandBuilder }
}
-?> diff --git a/framework/Data/Common/Sqlite/TSqliteMetaData.php b/framework/Data/Common/Sqlite/TSqliteMetaData.php index c562c930..010a2148 100644 --- a/framework/Data/Common/Sqlite/TSqliteMetaData.php +++ b/framework/Data/Common/Sqlite/TSqliteMetaData.php @@ -178,4 +178,3 @@ CREATE TABLE bar );
*/
-?> diff --git a/framework/Data/Common/Sqlite/TSqliteTableColumn.php b/framework/Data/Common/Sqlite/TSqliteTableColumn.php index 3c9100ab..4e79de6d 100644 --- a/framework/Data/Common/Sqlite/TSqliteTableColumn.php +++ b/framework/Data/Common/Sqlite/TSqliteTableColumn.php @@ -62,4 +62,3 @@ class TSqliteTableColumn extends TDbTableColumn }
}
-?> diff --git a/framework/Data/Common/Sqlite/TSqliteTableInfo.php b/framework/Data/Common/Sqlite/TSqliteTableInfo.php index 95c3fe02..b729a593 100644 --- a/framework/Data/Common/Sqlite/TSqliteTableInfo.php +++ b/framework/Data/Common/Sqlite/TSqliteTableInfo.php @@ -45,4 +45,3 @@ class TSqliteTableInfo extends TDbTableInfo }
}
-?> diff --git a/framework/Data/Common/TDbMetaData.php b/framework/Data/Common/TDbMetaData.php index c0f10d41..bcdf0e46 100644 --- a/framework/Data/Common/TDbMetaData.php +++ b/framework/Data/Common/TDbMetaData.php @@ -121,4 +121,3 @@ abstract class TDbMetaData extends TComponent }
}
-?> diff --git a/framework/Data/Common/TDbTableColumn.php b/framework/Data/Common/TDbTableColumn.php index b3d603ae..3bb9454b 100644 --- a/framework/Data/Common/TDbTableColumn.php +++ b/framework/Data/Common/TDbTableColumn.php @@ -197,4 +197,3 @@ class TDbTableColumn extends TComponent }
}
-?> diff --git a/framework/Data/Common/TDbTableInfo.php b/framework/Data/Common/TDbTableInfo.php index 87af2234..e2aae3d0 100644 --- a/framework/Data/Common/TDbTableInfo.php +++ b/framework/Data/Common/TDbTableInfo.php @@ -156,4 +156,3 @@ class TDbTableInfo extends TComponent }
}
-?> |