From 870b4ac8f9fdb84f871794666b6d3da6c2d738ca Mon Sep 17 00:00:00 2001 From: Gunar Schirner Date: Mon, 19 Mar 2018 15:54:08 -0400 Subject: [PATCH 1/2] changed call to loadTable to load individual table (instead of all tables). I presume the parameters to loadTable have changed at some point --- Dataface/DB.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dataface/DB.php b/Dataface/DB.php index dbd6af3a..23b2a119 100644 --- a/Dataface/DB.php +++ b/Dataface/DB.php @@ -673,7 +673,7 @@ function getTableDependencies($sql, $lang=null){ if ( preg_match('/^dataface__view_(.*)_[a-z0-9]{32}$/', $table, $matches) ){ $tables[$tid] = $table = $matches[1]; } - $tobj =& Dataface_Table::loadTable($table,null,true); + $tobj =& Dataface_Table::loadTable($table); if ( is_a($tobj, 'Dataface_Table') and isset($tobj->_atts['__dependencies__']) ){ $deps = array_map('trim', explode(',', $tobj->_atts['__dependencies__'])); $tables = array_merge($tables, $deps); From b2a83d86ca911671c56e62ee9c8a39cdf0be1a97 Mon Sep 17 00:00:00 2001 From: Gunar Schirner Date: Mon, 19 Mar 2018 15:55:18 -0400 Subject: [PATCH 2/2] changed view name to include original table name to enable table lookup in DB:getTableDependencies --- Dataface/Table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dataface/Table.php b/Dataface/Table.php index 36940819..790335c4 100644 --- a/Dataface/Table.php +++ b/Dataface/Table.php @@ -1828,7 +1828,7 @@ function getProxyView(){ return null; } $sqlKey = md5($sql); - $viewName = 'dataface__view_'.md5($this->tablename.'_'.$sqlKey); + $viewName = 'dataface__view_'.$this->tablename.'_'.$sqlKey; if ( isset($this->_proxyViews[$viewName]) and $this->_proxyViews[$viewName]) return $viewName; else if ( isset($this->_proxyViews[$viewName]) and !$this->_proxyViews[$viewName]) return null;