remove unused option QUERY_LIMIT

diff --git a/ipf/orm.php b/ipf/orm.php
index 797f7935923c860c503c86d5b5455a5763440a67..5f5211933633194b1b183da1ce75c97b6c6a0b65 100644 (file)
--- a/ipf/orm.php
+++ b/ipf/orm.php
@@ -111,7 +111,6 @@ final class IPF_ORM {
 
     const ATTR_PORTABILITY          = 106;
     const ATTR_COLL_KEY             = 108;
-    const ATTR_QUERY_LIMIT          = 109;
     const ATTR_DEFAULT_TABLE_TYPE   = 112;
     const ATTR_DEF_TEXT_LENGTH      = 113;
     const ATTR_DEF_VARCHAR_LENGTH   = 114;
@@ -140,11 +139,6 @@ final class IPF_ORM {
     const ATTR_SINGULARIZE_IMPORT       = 163;
     const ATTR_USE_DQL_CALLBACKS        = 164;
 
-    const LIMIT_ROWS       = 1;
-    const QUERY_LIMIT_ROWS = 1;
-    const LIMIT_RECORDS       = 2;
-    const QUERY_LIMIT_RECORDS = 2;
-
     const FETCH_IMMEDIATE       = 0;
     const FETCH_BATCH           = 1;
     const FETCH_OFFSET          = 3;

diff --git a/ipf/orm/configurable.php b/ipf/orm/configurable.php
index 98bf3a17a59890caf32aea3814a4a5f14068d3dc..0c6661461561a74551bc8602092dd5311457e4e7 100644 (file)
--- a/ipf/orm/configurable.php
+++ b/ipf/orm/configurable.php
@@ -62,7 +62,6 @@ abstract class IPF_ORM_Configurable extends IPF_ORM_Locator_Injectable
                     }
                 }
                 break;
-            case IPF_ORM::ATTR_QUERY_LIMIT:
             case IPF_ORM::ATTR_QUOTE_IDENTIFIER:
             case IPF_ORM::ATTR_PORTABILITY:
             case IPF_ORM::ATTR_DEFAULT_TABLE_TYPE:

diff --git a/ipf/orm/manager.php b/ipf/orm/manager.php
index b32b49dfbe640b377ce20bef87e4cf584234c48f..f78e88f8d7ee1fd274cd252de7f8f53c2a761d93 100644 (file)
--- a/ipf/orm/manager.php
+++ b/ipf/orm/manager.php
@@ -25,7 +25,6 @@ class IPF_ORM_Manager extends IPF_ORM_Configurable implements Countable, Iterato
                         IPF_ORM::ATTR_QUERY_CACHE              => null,
                         IPF_ORM::ATTR_LOAD_REFERENCES          => true,
                         IPF_ORM::ATTR_THROW_EXCEPTIONS         => true,
-                        IPF_ORM::ATTR_QUERY_LIMIT              => IPF_ORM::LIMIT_RECORDS,
                         IPF_ORM::ATTR_IDXNAME_FORMAT           => "%s_idx",
                         IPF_ORM::ATTR_SEQNAME_FORMAT           => "%s_seq",
                         IPF_ORM::ATTR_TBLNAME_FORMAT           => "%s",

diff --git a/ipf/orm/query.php b/ipf/orm/query.php
index b087a6daca3d1928819995d19ccaee2be9b09d9b..c0cad6251c481b24e33e0877b39d6379770cb65b 100644 (file)
--- a/ipf/orm/query.php
+++ b/ipf/orm/query.php
@@ -766,8 +766,7 @@ class IPF_ORM_Query extends IPF_ORM_Query_Abstract implements Countable, Seriali
         $table = $map['table'];
         $rootAlias = key($this->_queryComponents);
 
-        if ( ! empty($this->_sqlParts['limit']) && $this->_needsSubquery &&
-                $table->getAttribute(IPF_ORM::ATTR_QUERY_LIMIT) == IPF_ORM::LIMIT_RECORDS) {
+        if (!empty($this->_sqlParts['limit']) && $this->_needsSubquery) {
             $needsSubQuery = true;
         }