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.

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

SQL Azure updates. #5293

Closed
wants to merge 2 commits into from
Closed

Conversation

pmorrisarctg
Copy link
Contributor

  • Can now install on MS SQL
  • Will create a SQL Server DB if one does not exist
  • Can run the CMS and Admin on SQL Server

- Can now install on MS SQL
- Will create a SQL Server DB if one does not exist
- Can run the CMS and Admin on SQL Server
@pmorrisarctg
Copy link
Contributor Author

The original pull request that had merge issues due to other developers fixing issues in the same file is here. #3751 That request has merge issues. This one should not.

@@ -275,7 +331,7 @@ public function processLimit($query, $limit, $offset = 0)
$rowNumberText = ', ROW_NUMBER() OVER (' . $orderBy . ') AS RowNumber FROM ';

$query = preg_replace('/\sFROM\s/i', $rowNumberText, $query, 1);
$query = 'SELECT * FROM (' . $query . ') _myResults WHERE RowNumber BETWEEN ' . $start . ' AND ' . $end;
//$query = 'SELECT * FROM (' . $query . ') _myResults WHERE RowNumber BETWEEN ' . $start . ' AND ' . $end;
Copy link
Contributor

Choose a reason for hiding this comment

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

Instead of commenting the line you should remove it - please

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Completed. Thank you.

Patrick

From: Brian Teeman [mailto:notifications@github.com]
Sent: Tuesday, December 02, 2014 5:43 PM
To: joomla/joomla-cms
Cc: pmorrisarctg
Subject: Re: [joomla-cms] SQL Azure updates. (#5293)

In libraries/joomla/database/query/sqlsrv.php:

@@ -275,7 +331,7 @@ public function processLimit($query, $limit, $offset = 0)
$rowNumberText = ', ROW_NUMBER() OVER (' . $orderBy . ') AS RowNumber FROM ';

         $query = preg_replace('/\sFROM\s/i', $rowNumberText, $query, 1);
  •        $query = 'SELECT \* FROM (' . $query . ') _myResults WHERE RowNumber BETWEEN ' . $start . ' AND ' . $end;
    
  •        //$query = 'SELECT \* FROM (' . $query . ') _myResults WHERE RowNumber BETWEEN ' . $start . ' AND ' . $end;
    

Instead of commenting the line you should remove it - please


Reply to this email directly or view it on GitHub https://github.com/joomla/joomla-cms/pull/5293/files#r21202134 . https://github.com/notifications/beacon/ACJs9yneWYmXlb7x688INlqZLf1KUzhoks5nTkXvgaJpZM4DDU1G.gif

@wilsonge
Copy link
Contributor

wilsonge commented Dec 3, 2014

Can you deal with the code style issues (several places where you're using spaces for indents instead of tabs plus a small number of other minor issues)

@pmorrisarctg
Copy link
Contributor Author

Absolutely. Will do so and re-commit.

@wilsonge
Copy link
Contributor

wilsonge commented Dec 3, 2014

You're a star! Thanks :)

@Bakual
Copy link
Contributor

Bakual commented Dec 3, 2014

Fixed the codestyle issues and merged into staging. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants