Commit Graph

172 Commits

Author SHA1 Message Date
Jörn Friedrich Dreyer 05fa55f2eb always return int 2013-07-29 02:17:09 +02:00
Bart Visscher 084cf0c202 Merge pull request #2221 from owncloud/doctrine
OC6: Implement Doctrine as the backend for OC_DB
2013-07-18 14:24:27 -07:00
Thomas Mueller 24283425a6 fixing UNIX_TIMESTAMP() for mssql 2013-07-17 13:18:46 +02:00
Bart Visscher 5549c77ec5 Merge branch 'master' into doctrine
Conflicts:
	3rdparty
	lib/db.php
	lib/setup.php
	tests/lib/db.php
	tests/lib/dbschema.php
2013-07-13 12:01:14 +02:00
Thomas Müller 02d2e41e04 Merge pull request #3954 from owncloud/update_insertifnotexist_and_test
fix insertIfNotExist return value, update doc and corresponding test
2013-07-08 07:17:45 -07:00
Jörn Friedrich Dreyer 212ea0508d update comment 2013-07-05 15:39:57 +02:00
Jörn Friedrich Dreyer 00987feda1 fix insertIfNotExist return value, update doc and corresponding test 2013-07-05 14:05:42 +02:00
Thomas Müller c777026506 Merge pull request #3775 from owncloud/test_fixes_for_dbschema
use executeAudited, add table name to assert message, skip schema changi...
2013-07-01 14:38:28 -07:00
Thomas Müller bf901eb52f Merge pull request #3793 from owncloud/remove_unnecessary_exception_catch_block
remove unnecessary try catch blocks
2013-07-01 14:37:09 -07:00
Thomas Mueller 66e1eaac93 isError should detect a PEAR_Error even if the backend is PDO.
This can happen on errors during schema migration - which is always done with MDB2
2013-06-28 20:16:01 +02:00
Jörn Friedrich Dreyer e62eb2e8d1 correctly handle error results of PDO and MDB2 backends 2013-06-28 20:16:01 +02:00
Bart Visscher b1a2ddd149 Merge pull request #3799 from owncloud/fix_pdo_statement_wrapper_numrows_on_modification
Fix pdo statement wrapper numrows on modification
2013-06-28 07:15:38 -07:00
Bart Visscher b04e09a901 Move DoctrineStatementWrapper to its own file 2013-06-28 11:48:38 +02:00
Bart Visscher 6145e61718 Remove deadcode 2013-06-28 11:42:23 +02:00
Thomas Mueller 10951f9bd5 adding PHPDoc 2013-06-27 23:34:36 +02:00
Jörn Friedrich Dreyer 45c897acf3 one if less 2013-06-27 13:13:49 +02:00
Bart Visscher a9ee15cf40 Use Doctrine platform to add limit and offset to query 2013-06-26 20:48:01 +02:00
Jörn Friedrich Dreyer 7273b43cd5 manuall calculate unix_timestamp for oracle 2013-06-25 09:52:04 +02:00
Bart Visscher 9fa4b78ba4 Use Doctrines Oracle sequence suffix 2013-06-24 22:38:19 +02:00
Bart Visscher 159efa8bd4 OCI doesn't have a queryString 2013-06-24 22:38:19 +02:00
Bart Visscher 6300b95896 UNIX_TIMESTAMP replace for Oracle 2013-06-24 22:38:19 +02:00
Bart Visscher dca8c1cbc1 Fixes connecting to Oracle without port set 2013-06-24 22:38:19 +02:00
Jörn Friedrich Dreyer 643c8d3088 make PDOStatementWrapper return number of updated rows on INSERT, UPDATE or DELETE queries, introduces isManipulation() to guess type of query 2013-06-24 16:29:58 +02:00
Bart Visscher 377e9a8677 Merge branch 'master' into doctrine 2013-06-24 08:27:25 +02:00
Jörn Friedrich Dreyer 372f261fe3 remove unnecessary exception handling 2013-06-20 10:50:53 +02:00
Jörn Friedrich Dreyer dcdabac04d oracle does not need sequence suffix, manually set database name to allow fetching db schema, don't shutdown db - we are using utf8 to connect 2013-06-14 12:06:29 +02:00
Jörn Friedrich Dreyer f7dc07602b minor cleanup for exception handling 2013-06-12 15:48:22 +02:00
Jörn Friedrich Dreyer 86c5243be5 remove duplicate logging from db.php, now happens in entrypoints 2013-06-10 14:03:12 +02:00
Jörn Friedrich Dreyer c0bdbd9d81 introduce and use executeAudited in db.php 2013-06-10 12:56:45 +02:00
Jörn Friedrich Dreyer cbd5eb9a1a use to_char only for oracle, whitespace 2013-05-22 13:59:07 +02:00
Jörn Friedrich Dreyer eceb3c8ed5 add debug output 2013-05-22 13:59:07 +02:00
Bart Visscher bc9792910a Merge branch 'master' into doctrine
Conflicts:
	3rdparty
	lib/MDB2/Driver/sqlite3.php
	lib/db.php
2013-04-25 18:16:09 +02:00
Bart Visscher 142b020d38 Remove wrong limit parameter from count query in compatibility function 2013-04-06 17:58:47 +02:00
Brice Maron 63804f4153 Change logQuery from define() to OC::Config 2013-03-30 22:36:55 +01:00
Brice Maron 2b8cf4959a Log Queries when we add a log query flag 2013-03-30 17:40:46 +01:00
Thomas Tanghus 5b66b317b1 And removing an irrelevant comment ;) 2013-03-26 01:01:38 +01:00
Thomas Tanghus 5f53145eb0 Double quotes to backticks 2013-03-26 01:00:15 +01:00
Thomas Tanghus 9d618005b6 Missing backticks. Thx @Raydiation :) 2013-03-26 00:24:08 +01:00
Thomas Tanghus 5e81016392 D'oh, why concatenate static strings. 2013-03-26 00:21:57 +01:00
Thomas Tanghus 07236800a7 Quote key for SQLite. 2013-03-26 00:19:23 +01:00
Thomas Tanghus 1c3f5ba6ef Properly prepare insertIfNotExist queries. 2013-03-25 23:59:34 +01:00
Thomas Mueller 28d2379c43 initial fix for MSSQL 2013-03-19 19:17:40 +01:00
Thomas Mueller 6f13a35513 documentation added and trying to fix minor code issues 2013-03-19 18:52:54 +01:00
Bart Visscher ee57ddd0b7 Rewrite query for numRows function for SELECT queries 2013-03-17 14:32:14 +01:00
Bart Visscher 427242cf32 Use the correct property for connection object 2013-03-17 14:32:01 +01:00
Bart Visscher ed642d1038 Merge branch 'master' into doctrine 2013-03-17 13:25:28 +01:00
Thomas Mueller ec16853112 enable UTF-8 charset on mssql
disable MDB2_PORTABILITY_EMPTY_TO_NULL for mssql to allow insert of empty string to no null fields
2013-03-12 15:39:44 +01:00
Bart Visscher 34e4e490b8 Fix mssql connection parameters and correct driver for pgsql 2013-03-10 11:40:08 +01:00
Bart Visscher 7af774cc98 Merge branch 'master' into doctrine
Conflicts:
	lib/db.php
2013-03-10 11:30:33 +01:00
Bart Visscher d7528f06df Disable query cache for Sqlite 2013-02-27 22:32:39 +01:00