Menu
▾
▴
rdfapi-php-svn — rap subversion commit mails
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(19) |
Jul
(6) |
Aug
(65) |
Sep
(4) |
Oct
(5) |
Nov
(8) |
Dec
(2) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(1) |
Feb
(9) |
Mar
(1) |
Apr
|
May
(8) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <cw...@us...> - 2007-06-19 17:04:47
|
Revision: 450
http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=450&view=rev
Author: cweiske
Date: 2007-06-19 10:04:46 -0700 (Tue, 19 Jun 2007)
Log Message:
-----------
Fix exception when no variables can be returned -> return empty array
Modified Paths:
--------------
trunk/rdfapi-php/api/sparql/SparqlEngineDb/SqlGenerator.php
trunk/rdfapi-php/test/config.php.dist
Modified: trunk/rdfapi-php/api/sparql/SparqlEngineDb/SqlGenerator.php
===================================================================
--- trunk/rdfapi-php/api/sparql/SparqlEngineDb/SqlGenerator.php 2007-06-19 16:13:07 UTC (rev 449)
+++ trunk/rdfapi-php/api/sparql/SparqlEngineDb/SqlGenerator.php 2007-06-19 17:04:46 UTC (rev 450)
@@ -241,10 +241,13 @@
}
foreach ($arSelect as $nUnionCount => $arSelectPart) {
$arSelectPart = self::removeNull($arSelectPart);
- if (count($arSelectPart) == 0) {
- throw new SparqlEngineDb_SqlGeneratorException('No variable that could be returned.');
+ if (count($arSelectPart) == 0
+ || (count($arSelectPart) == 1 && $arSelectPart[0] == '')) {
+ //test "test-1-07" suggests we return no rows in this case
+ //throw new SparqlEngineDb_SqlGeneratorException('No variable that could be returned.');
+ } else {
+ $arStrSelect[$nUnionCount] = strtoupper($strSelectType) . ' ' . implode(', ' , $arSelectPart);
}
- $arStrSelect[$nUnionCount] = strtoupper($strSelectType) . ' ' . implode(', ' , $arSelectPart);
}
break;
@@ -259,7 +262,7 @@
}
$arSqls = array();
- foreach ($arSelect as $nUnionCount => $arSelectPart) {
+ foreach ($arStrSelect as $nUnionCount => $arSelectPart) {
$arSqls[] = array(
'select' => $arStrSelect[$nUnionCount],
'from' => ' FROM ' . implode(' ' , self::removeNull($arFrom[$nUnionCount])),
Modified: trunk/rdfapi-php/test/config.php.dist
===================================================================
--- trunk/rdfapi-php/test/config.php.dist 2007-06-19 16:13:07 UTC (rev 449)
+++ trunk/rdfapi-php/test/config.php.dist 2007-06-19 17:04:46 UTC (rev 450)
@@ -18,5 +18,8 @@
'password' => ''
);
+//enable this to get more informatin about failing unit tests
+//$GLOBALS['debugTests'] = true;
+
define('LOG', false);
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cw...@us...> - 2007-06-19 16:13:11
|
Revision: 449
http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=449&view=rev
Author: cweiske
Date: 2007-06-19 09:13:07 -0700 (Tue, 19 Jun 2007)
Log Message:
-----------
Add debugTest variable
Modified Paths:
--------------
trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php
Modified: trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php 2007-06-19 15:48:52 UTC (rev 448)
+++ trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php 2007-06-19 16:13:07 UTC (rev 449)
@@ -9,7 +9,9 @@
require_once RDFAPI_INCLUDE_DIR . 'sparql/SparqlParser.php';
require_once RDFAPI_INCLUDE_DIR . 'sparql/SparqlEngine.php';
require_once RDFAPI_INCLUDE_DIR . 'dataset/NamedGraphMem.php';
-require_once 'Console/Color.php';
+if (isset($GLOBALS['debugTests'])) {
+ require_once 'Console/Color.php';
+}
class testSparqlDbTests extends UnitTestCase
{
@@ -77,24 +79,30 @@
$bOk = false;
$t = null;
//an exception is an error
- var_dump($e->getMessage());
+ if (isset($GLOBALS['debugTests'])) {
+ var_dump($e->getMessage());
+ }
$this->assertTrue(false);
}
-/*
+
if (!$bOk) {
- echo Console_Color::convert('%RTest failed: ' . $title . "%n\n");
- if ($e != null) {
- echo get_class($e) . ': ' . $e->getMessage() . "\n";
+ if (!isset($GLOBALS['debugTests'])) {
+ echo ' ' . $title . "\n";
+ } else {
+ echo Console_Color::convert('%RTest failed: ' . $title . "%n\n");
+ if ($e != null) {
+ echo get_class($e) . ': ' . $e->getMessage() . "\n";
+ }
+ echo 'Query string: ' . $qs . "\n";
+ echo Console_Color::convert('%p');
+ var_dump($result);
+ echo Console_Color::convert('%n');
+ echo Console_Color::convert('%r');
+ var_dump($t);
+ echo Console_Color::convert('%n');
+ //var_dump($q);
+ die();
}
- echo 'Query string: ' . $qs . "\n";
- echo Console_Color::convert('%p');
- var_dump($result);
- echo Console_Color::convert('%n');
- echo Console_Color::convert('%r');
- var_dump($t);
- echo Console_Color::convert('%n');
-//var_dump($q);
-die();
}
/**/
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cw...@us...> - 2007-06-19 15:48:57
|
Revision: 448
http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=448&view=rev
Author: cweiske
Date: 2007-06-19 08:48:52 -0700 (Tue, 19 Jun 2007)
Log Message:
-----------
Add ORDER BY dateTime support
Modified Paths:
--------------
trunk/rdfapi-php/api/sparql/SparqlEngineDb/TypeSorter.php
trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php
trunk/rdfapi-php/test/unit/Sparql/cases.php
Added Paths:
-----------
trunk/rdfapi-php/test/unit/Sparql/data/data-sort-datetime.n3
trunk/rdfapi-php/test/unit/Sparql/query/query-sort-datetime.rq
trunk/rdfapi-php/test/unit/Sparql/result/sort-datetime.res
Modified: trunk/rdfapi-php/api/sparql/SparqlEngineDb/TypeSorter.php
===================================================================
--- trunk/rdfapi-php/api/sparql/SparqlEngineDb/TypeSorter.php 2007-06-13 16:26:58 UTC (rev 447)
+++ trunk/rdfapi-php/api/sparql/SparqlEngineDb/TypeSorter.php 2007-06-19 15:48:52 UTC (rev 448)
@@ -26,7 +26,10 @@
* @var array
*/
public static $arCastTypes = array(
- 'http://www.w3.org/2001/XMLSchema#integer' => 'SIGNED INTEGER'
+ 'http://www.w3.org/2001/XMLSchema#integer' => 'SIGNED INTEGER',
+ //yes, this does not work with multiple time zones.
+ 'http://www.w3.org/2001/XMLSchema#dateTime' => 'CHAR',
+ 'http://www.w3.org/2001/XMLSchema#date' => 'CHAR',
);
Modified: trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php 2007-06-13 16:26:58 UTC (rev 447)
+++ trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php 2007-06-19 15:48:52 UTC (rev 448)
@@ -9,7 +9,7 @@
require_once RDFAPI_INCLUDE_DIR . 'sparql/SparqlParser.php';
require_once RDFAPI_INCLUDE_DIR . 'sparql/SparqlEngine.php';
require_once RDFAPI_INCLUDE_DIR . 'dataset/NamedGraphMem.php';
-//require_once 'Console/Color.php';
+require_once 'Console/Color.php';
class testSparqlDbTests extends UnitTestCase
{
@@ -76,6 +76,9 @@
} catch (Exception $e) {
$bOk = false;
$t = null;
+ //an exception is an error
+ var_dump($e->getMessage());
+ $this->assertTrue(false);
}
/*
if (!$bOk) {
Modified: trunk/rdfapi-php/test/unit/Sparql/cases.php
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/cases.php 2007-06-13 16:26:58 UTC (rev 447)
+++ trunk/rdfapi-php/test/unit/Sparql/cases.php 2007-06-19 15:48:52 UTC (rev 448)
@@ -22,7 +22,7 @@
'tests' => 'sparql_limitOffset_tests',
'checkfunc' => 'resultCheckSort'
),
- 'filter' => array(
+ 'filter' => array(//'deact'=>1,
'title' => 'filter tests',
'tests' => 'sparql_filter_tests',
'checkfunc' => 'resultCheck'
@@ -86,6 +86,7 @@
$_SESSION['sparql_sort_tests'] = array(
+
1 => array('data' => 'data-sort-4.n3',
'query' => "query-sort-5",
'result' => "sort5") ,
@@ -118,6 +119,9 @@
'query' => "query-sort-4",
'result' => "sort8") ,
+ 9 => array('data' => "data-sort-datetime.n3",
+ 'query' => "query-sort-datetime",
+ 'result' => "sort-datetime") ,
);
Added: trunk/rdfapi-php/test/unit/Sparql/data/data-sort-datetime.n3
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/data/data-sort-datetime.n3 (rev 0)
+++ trunk/rdfapi-php/test/unit/Sparql/data/data-sort-datetime.n3 2007-06-19 15:48:52 UTC (rev 448)
@@ -0,0 +1,6 @@
+@prefix dc: <http://purl.org/dc/elements/1.1/> .
+
+_:a dc:created "2004-12-31T18:01:00-05:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
+_:b dc:created "2004-01-31T18:01:00-05:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
+_:c dc:created "2007-03-12T17:02:00-05:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
+_:d dc:created "2007-03-12T17:01:00-05:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
Added: trunk/rdfapi-php/test/unit/Sparql/query/query-sort-datetime.rq
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/query/query-sort-datetime.rq (rev 0)
+++ trunk/rdfapi-php/test/unit/Sparql/query/query-sort-datetime.rq 2007-06-19 15:48:52 UTC (rev 448)
@@ -0,0 +1,5 @@
+PREFIX dc: <http://purl.org/dc/elements/1.1/>
+
+SELECT ?created
+WHERE { ?x dc:created ?created }
+ORDER BY ASC(?created)
Added: trunk/rdfapi-php/test/unit/Sparql/result/sort-datetime.res
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/result/sort-datetime.res (rev 0)
+++ trunk/rdfapi-php/test/unit/Sparql/result/sort-datetime.res 2007-06-19 15:48:52 UTC (rev 448)
@@ -0,0 +1,19 @@
+$result = array();
+$res1 = new Literal("2004-12-31T18:01:00-05:00");
+$res2 = new Literal("2004-01-31T18:01:00-05:00");
+$res3 = new Literal("2007-03-12T17:02:00-05:00");
+$res4 = new Literal("2007-03-12T17:01:00-05:00");
+
+$res1->setDatatype("http://www.w3.org/2001/XMLSchema#dateTime");
+$res2->setDatatype("http://www.w3.org/2001/XMLSchema#dateTime");
+$res3->setDatatype("http://www.w3.org/2001/XMLSchema#dateTime");
+$res4->setDatatype("http://www.w3.org/2001/XMLSchema#dateTime");
+
+
+
+$result = array(
+ array('?created' => $res2),
+ array('?created' => $res1),
+ array('?created' => $res4),
+ array('?created' => $res3),
+);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <se...@us...> - 2007-06-13 16:27:00
|
Revision: 447
http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=447&view=rev
Author: seebi
Date: 2007-06-13 09:26:58 -0700 (Wed, 13 Jun 2007)
Log Message:
-----------
mailinglist test 2
Modified Paths:
--------------
trunk/rdfapi-php/test/Readme.txt
Modified: trunk/rdfapi-php/test/Readme.txt
===================================================================
--- trunk/rdfapi-php/test/Readme.txt 2007-06-13 16:20:53 UTC (rev 446)
+++ trunk/rdfapi-php/test/Readme.txt 2007-06-13 16:26:58 UTC (rev 447)
@@ -11,3 +11,4 @@
Chris, 8/21/2004
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
