Organizing file locations

darkain · Nov 7, 2018 · 08b3af4 · 08b3af4
1 parent b0b8613
commit 08b3af4
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -44,8 +44,8 @@ Engine | Class | Support | Info
 [NULL](https://en.wikipedia.org/wiki/Null_device) | [pudlNull](https://github.com/darkain/pudl/blob/master/null/pudlNull.php) | *Officially Supported* | Essentially /dev/null the database
 [Microsoft SQL](https://www.microsoft.com/en-us/sql-server/) | [pudlSqlSrv](https://github.com/darkain/pudl/blob/master/mssql/pudlSqlSrv.php) <br> [pudlMsSql](https://github.com/darkain/pudl/blob/master/mssql/pudlMsSql.php) | *Experimental Support* | Both modern [php-sqlsrv](http://php.net/manual/en/book.sqlsrv.php) and legacy [php-mssql](http://php.net/manual/en/book.mssql.php) available
 [SQLite](https://www.sqlite.org/index.html) | [pudlSqlite](https://github.com/darkain/pudl/blob/master/sqlite/pudlSqlite.php) | *Experimental Support* | Uses the [php-sqlite3](http://php.net/manual/en/book.sqlite3.php) driver
-[ODBC](https://en.wikipedia.org/wiki/Open_Database_Connectivity) | [pudlOdbc](https://github.com/darkain/pudl/blob/master/sql/pudlOdbc.php) | *Experimental Support* | Uses the [php-odbc](http://php.net/manual/en/book.uodbc.php) driver
-[Actian PSQL](http://www.pervasive.com/database/Home/Products/PSQLv11.aspx) | [pudlOdbc](https://github.com/darkain/pudl/blob/master/sql/pudlOdbc.php) | *Experimental Support* | Supported through ODBC
+[ODBC](https://en.wikipedia.org/wiki/Open_Database_Connectivity) | [pudlOdbc](https://github.com/darkain/pudl/blob/master/odbc/pudlOdbc.php) | *Experimental Support* | Uses the [php-odbc](http://php.net/manual/en/book.uodbc.php) driver
+[Actian PSQL](http://www.pervasive.com/database/Home/Products/PSQLv11.aspx) | [pudlOdbc](https://github.com/darkain/pudl/blob/master/odbc/pudlOdbc.php) | *Experimental Support* | Supported through ODBC
 [PostgreSQL](https://www.postgresql.org) | [pudlPgSql](https://github.com/darkain/pudl/blob/master/pgsql/pudlPgSql.php) | *Experimental Support* | Uses the [php-pgsql](http://php.net/manual/en/book.pgsql.php) driver
 [PDO](http://php.net/manual/en/book.pdo.php) | [pudlPdo](https://github.com/darkain/pudl/blob/master/pdo/pudlPdo.php) | *Experimental Support* | Uses the [php-pdo](http://php.net/manual/en/book.pdo.php) driver
 Shell | [pudlShell](https://github.com/darkain/pudl/blob/master/sql/pudlShell.php) | *Experimental Hack* | Custom JSON proxy interface over shell commands

diff --git a/sql/pudlOdbc.php → odbc/pudlOdbc.php b/sql/pudlOdbc.php → odbc/pudlOdbc.php
diff --git a/sql/pudlOdbcResult.php → odbc/pudlOdbcResult.php b/sql/pudlOdbcResult.php → odbc/pudlOdbcResult.php
diff --git a/pudlInclude.inc.php b/pudlInclude.inc.php
@@ -21,8 +21,8 @@
 //INTERNAL USAGE RESULT SETS
 ////////////////////////////////////////////////////////////////////////////////
 require_once(is_owner(__DIR__.'/pudlResult.php'));
-require_once(is_owner(__DIR__.'/traits/pudlStringResult.php'));
-require_once(is_owner(__DIR__.'/traits/pudlCacheResult.php'));
+require_once(is_owner(__DIR__.'/sql/pudlStringResult.php'));
+require_once(is_owner(__DIR__.'/sql/pudlCacheResult.php'));
 
 
 

diff --git a/traits/pudlCacheResult.php → sql/pudlCacheResult.php b/traits/pudlCacheResult.php → sql/pudlCacheResult.php
diff --git a/traits/pudlStringResult.php → sql/pudlStringResult.php b/traits/pudlStringResult.php → sql/pudlStringResult.php
diff --git a/test/cli.php b/test/cli.php
@@ -58,7 +58,7 @@ function exception_error_handler($errno, $errstr, $errfile, $errline ) {
 require_once(__DIR__.'/../null/pudlFakeResult.php');
 require_once(__DIR__.'/../pdo/pudlPdo.php');
 require_once(__DIR__.'/../pgsql/pudlPgSql.php');
-require_once(__DIR__.'/../sql/pudlOdbc.php');
+require_once(__DIR__.'/../odbc/pudlOdbc.php');
 require_once(__DIR__.'/../sql/pudlShell.php');
 require_once(__DIR__.'/../sql/pudlWeb.php');
 require_once(__DIR__.'/../sqlite/pudlSqlite.php');

diff --git a/traits/pudlInternal.php b/traits/pudlInternal.php
@@ -66,7 +66,7 @@ protected static function _engine($type) {
 
 			// ODBC_ FUNCTIONS
 			case 'ODBC':
-				return '/sql/pudlOdbc.php';
+				return '/odbc/pudlOdbc.php';
 			break;