Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Database layer #399

Merged
merged 95 commits into from May 17, 2013
Merged

Database layer #399

merged 95 commits into from May 17, 2013

Conversation

norv
Copy link
Contributor

@norv norv commented May 14, 2013

Implements #398

eurich
eurich reviewed May 14, 2013
View reviewed changes
sources/subs/Util.class.php

static function htmltrim($string)
{
global $smcFunc, $modSettings;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$smcFunc isn't used here, coud be removed..same applies for most of the other static functions

norv added 29 commits May 14, 2013 22:37
@norv
Add quick 'n dirty Util class, legacy string functions from $smcFunc.
f27d830 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Quick ->elk_ replacement.
7e23d66 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Refactor db layer. (add db classes, add init per type)
0d2391f 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Add database subs general file, and mysql class. Initialize in the cl…
5038a7e 
…ass...

Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Add postresql class with quick init.
398762a 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Add SQLite class and quick initialization.
f95ced7 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Quick fix for a database instance during shutdown.
0146c5d 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Add base class for database classes. Adapt Mysql driver.
b24855f 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Adapted postgresql legacy subs file. Now it's a mere skeleton :P
91914c2 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Adapted Sqlite subs legacy file, to forward to the class implementation.
5f0e8b5 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Name updates to elk.
1aa4ffb 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Name updates. -> elk.
11ca359 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
More updates of function names. (legacy functions, but potentially us…
e63f6fa 
…ed for compat).

Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Another batch of names updates for legacy db functions.
ec136ac 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Names updates for legacy sqlite functions.
b6735df 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Remove SQlite dependencies.
84fc6d1 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Remove elk_ prefix in init method name (for methods there is no need)
20b9768 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Simplify names, for database classes methods.
c09ac27 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
More names simplifications for database methods.
3bea609 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Db error() and error_backtrace(), simplify names for methods.
6b19a55 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Remove useless prefixes, insert(), insert_id()
2f5c0c7 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Sqlite methods, typos and updates.
12e8dd5 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Names updates for methods of db classes.
d0a6264 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Names updates for db methods. (last, hopefully)
380f7ec 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Bit of security is good for us.
3cecd51 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Fix session write. First use of new methods. :)
cb83ff6 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Add a few missing methods to adapters. Update Session to the db layer.
c21ee78 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Add DbSearch class for MySQL.
86ddc69 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Update DbSearch classes for Postgres and SQLite.
839a41b 
Signed-off-by: Norv <a.w.norv@gmail.com>
norv added 3 commits May 14, 2013 22:45
@norv
Make sure DbTable is available...
9cafec1 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Remove db_extend('packages'). A call to db_table() will be enough for…
f4a04a2 
… it to be used.

Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Refactor the package log usage into a log kept by DbTable.
81c636c 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Copy link
Contributor Author

norv commented May 14, 2013

Overview of changes from SMF: https://github.com/elkarte/Elkarte/wiki/Database-layer

norv added 20 commits May 15, 2013 01:31
@norv
Fixes of the version method, let it be get_server_version() if that's…
104e83b 
… what it is.

Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Fixes for versions and a few other small stuff.
74b07ae 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
fetch_assoc() fixes.
dd16b60 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
fetch_row() fixes and update of implementations in the Db classes.
975d006 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
free_result() fixes and update of implementation of db classes.
855e267 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
insert(), insert_id(), insert_sql() fixes and updates.
73422a7 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
num_rows() fixes and update.
4067b03 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
select_db() and other fixes and updates.
bc6a7d8 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Add last_error()
fcdc621 
Signed-off-by: Norv <a.w.norv@gmail.com>

Conflicts:
	sources/database/Db-mysql.class.php
	sources/database/Db.class.php

Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
several methods corrected and completed
b74059e 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Several functions, few updates along the rest of core files.
042b578 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
The rest of methods implemented
ca15dfa 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Replace and remove list_tables, table_sql and server_info (rarely use…
e61afba 
…d stuff)

Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Remove db_insert_sql (rarely used)
0cfeb2d 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Remove backup stuff (rarely used), fix list_ables
773055e 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Remove DbExtra files.
434491c 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Oops. Remove extra file (former class got committed) and fix DbTable …
b4356d5 
…access.

Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Remove db_data_seek and db_title
60d1b04 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Remove escape_wildcard_string, server_info, select_db
a48ebac 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Remove db_transaction (from $smcFunc)
16f55e3 
Signed-off-by: Norv <a.w.norv@gmail.com>
@norv
Copy link
Contributor Author

norv commented May 16, 2013

Update:

  • db_extend() should no longer be necessary at all
  • the database classes implement everything that was in $smcFunc (and the lone Util class keeps the rest). They should be stable
  • replaced the functions calls to 'packages', 'extra', or 'search' former $smcFunc, and removed compatibility for them
  • started to remove a few of the $smcFunc from core layer

So, this refactoring is in the stage: replace the rest of the calls, all through the codebase, from $smcFunc to the new methods. (them bugs excepted and that.)

I haz a question. Merge now, or do more of them replacements?
Until now, I'd say that only rarely used functions were replaced. The widely used query() and such, are still as $smcFunc, and files weren't touched - mostly.

norv added a commit that referenced this pull request May 17, 2013
@norv
Merge pull request #399 from norv/database
d6c6a46 
Database layer
@norv norv merged commit d6c6a46 into elkarte:master May 17, 2013
@norv
Copy link
Contributor Author

norv commented May 17, 2013

After this step:

  • we have no more backwards compatibility for a number of (rather rarely used) $smcFunc. We still have for most of core db functions, and for the small utility functions.
  • up to you when you want us to make the rest of replacements. For now, things should work both ways. So for newer code from this point, I'd hope we can make with calls through the 'new' api.
  • there are redundancies introduced in code by this PR, in particular in the initialization mechanism. (some slightly weird code in database subs, and of course the $smcFunc itself: it exists now only to redirect to the database objects methods). They're to be removed when we're certain a better way works for everything.
  • this merge should allow us to update /tools and other external applications.

@norv
Copy link
Contributor Author

norv commented May 17, 2013

And an important bit:
This PR has removed SQLite dependencies from Elk core. In installer script, maintenance, and a few other.
norv@84fc6d1
(If there are problems with it, it's that commit that did it.)
Further discussion: http://www.elkarte.net/index.php?topic=361.0

@norv norv mentioned this pull request May 17, 2013
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.0 Beta
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@norv @eurich