[Phpmyadmin-devel] Refactoring insert-edit

List overview All Threads
Download

newer

older

[Phpmyadmin-devel] GSoC:...

[Phpmyadmin-devel] Build failed in...

Thilina Buddika Abeyrathna

13 May 2012 13 May '12

3:12 a.m.

Hi Marc, when I'm writing functions for columns of insertForm I need to pass all the following parameters to the functions. $field, $backup_field, $field_name_appendix, $unnullify_trigger, $tabindex, $tabindex_for_value, $idindex, $data So function signature is very long which is somewhat ugly, Is it ok to have a global parameter array for insert_edit.lib.php file. Does this break the refactoring? -- Regards. Thilina Buddika Abeyrathna, Department of Computer Engineering, Faculty Of Engineering, University of Peradeniya, Sri Lanka.

Attachments:

attachment.html (text/html — 885 bytes)

Show replies by date

Marc Delisle

13 May 13 May

5:53 a.m.

Le 2012-05-13 03:12, Thilina Buddika Abeyrathna a écrit :

...

Hi Thilina, I think it's clearer if we see all the parameters in the signature. See "Split function definitions onto several lines" in [0]. [0] http://pear.php.net/manual/en/standards.funcdef.php -- Marc Delisle http://infomarc.info

Thilina Buddika Abeyrathna

6:08 a.m.

On Sun, May 13, 2012 at 3:23 PM, Marc Delisle <marc(a)infomarc.info> wrote:

...

Le 2012-05-13 03:12, Thilina Buddika Abeyrathna a écrit :

Hi Marc, when I'm writing functions for columns of insertForm I need to pass all

the

following parameters to the functions. $field, $backup_field, $field_name_appendix, $unnullify_trigger,

$tabindex,

$tabindex_for_value, $idindex, $data So function signature is very long which is somewhat ugly, Is it ok to

have

a global parameter array for insert_edit.lib.php file. Does this break

the

refactoring?

Hi Thilina, I think it's clearer if we see all the parameters in the signature. See "Split function definitions onto several lines" in [0]. [0] http://pear.php.net/manual/en/standards.funcdef.php

Thank you very much Marc, -- Regards. Thilina Buddika Abeyrathna, Department of Computer Engineering, Faculty Of Engineering, University of Peradeniya, Sri Lanka.

Madhura Jayaratne

8:07 a.m.

On Sun, May 13, 2012 at 12:42 PM, Thilina Buddika Abeyrathna < thilinaabeyrathna(a)gmail.com> wrote:

...

Whenever you encounter a long list of parameters, I think it is a good idea to evaluate whether your method is doing too much inside it, whether it is possible to logically break your function into few smaller ones, each requiring only few parameters. Secondly if the parameters logically fit together you can introduce parameter objects that would encapsulate the parameters as Poitr pointed out in some other thread. If non of the above applies I agree with Marc as it would make things clearer. -- Thanks and Regards, Madhura Jayaratne

Thilina Buddika Abeyrathna

14 May 14 May

8:50 a.m.

On Sun, May 13, 2012 at 5:37 PM, Madhura Jayaratne <madhura.cj(a)gmail.com>wrote;wrote:

...

On Sun, May 13, 2012 at 12:42 PM, Thilina Buddika Abeyrathna < thilinaabeyrathna(a)gmail.com> wrote:

Hi Marc, There are HTML code block from line 438 in the tbl_change.php file(after my last commit [0]). It doesn't mix with much PHP tags. It is somewhat readable. Do I need to implement several functions to render this HTML block. Can you give me a suggestion.. [0] - https://github.com/thilinaa/phpmyadmin/commit/9d6c38daf6a98d915a34391bddb98… -- Regards. Thilina Buddika Abeyrathna, Department of Computer Engineering, Faculty Of Engineering, University of Peradeniya, Sri Lanka.

Marc Delisle

12:39 p.m.

Le 2012-05-14 08:50, Thilina Buddika Abeyrathna a écrit :

...

Hi Thilina, The code generating the actions_panel fieldset would benefit from being refactored into one or more functions. The reason is that it's difficult to understand quickly such a long code block. It could become $html_output = PMA_getActionsPanel(...); ----------- By the way, did you consider using a class? Have a look at libraries/Partition.class.php. Then, the calling script uses this syntax: $partition_names = PMA_Partition::getPartitionNames($db, $table); The benefit is that you don't have to bother about function name clashing. -- Marc Delisle http://infomarc.info

Thilina Buddika Abeyrathna

12:53 p.m.

On Mon, May 14, 2012 at 10:09 PM, Marc Delisle <marc(a)infomarc.info> wrote:

...

Le 2012-05-14 08:50, Thilina Buddika Abeyrathna a écrit :

Hi Marc, There are HTML code block from line 438 in the tbl_change.php file(after

last commit [0]). It doesn't mix with much PHP tags. It is somewhat readable. Do I need to implement several functions to render this HTML block. Can

you

give me a suggestion.. [0] -

https://github.com/thilinaa/phpmyadmin/commit/9d6c38daf6a98d915a34391bddb98… Hi Thilina, The code generating the actions_panel fieldset would benefit from being refactored into one or more functions. The reason is that it's difficult to understand quickly such a long code block. It could become $html_output = PMA_getActionsPanel(...); Thank you for your reply Marc. I'll do like this

...

----------- By the way, did you consider using a class? Have a look at libraries/Partition.class.php. Then, the calling script uses this syntax: $partition_names = PMA_Partition::getPartitionNames($db, $table); The benefit is that you don't have to bother about function name clashing. Thanks Marc. I'll look at that.

-- Regards. Thilina Buddika Abeyrathna, Department of Computer Engineering, Faculty Of Engineering, University of Peradeniya, Sri Lanka.

Thilina Buddika Abeyrathna

16 May 16 May

8:37 a.m.

On Mon, May 14, 2012 at 10:23 PM, Thilina Buddika Abeyrathna < thilinaabeyrathna(a)gmail.com> wrote:

...

On Mon, May 14, 2012 at 10:09 PM, Marc Delisle <marc(a)infomarc.info> wrote:

Le 2012-05-14 08:50, Thilina Buddika Abeyrathna a écrit :

Hi Marc, There are HTML code block from line 438 in the tbl_change.php

file(after my

last commit [0]). It doesn't mix with much PHP tags. It is somewhat readable. Do I need to implement several functions to render this HTML block. Can

you

give me a suggestion.. [0] -

Hi Marc, Now tbl_change.php script is somewhat readable and maintainable. Still there is a long if condition in this script. but it is not a very complex control statement . So do I need to implement a function to separate that if condition too. -- Regards. Thilina Buddika Abeyrathna, Department of Computer Engineering, Faculty Of Engineering, University of Peradeniya, Sri Lanka.

Marc Delisle

8:45 a.m.

Le 2012-05-16 08:37, Thilina Buddika Abeyrathna a écrit :

...

On Mon, May 14, 2012 at 10:23 PM, Thilina Buddika Abeyrathna < thilinaabeyrathna(a)gmail.com> wrote:

On Mon, May 14, 2012 at 10:09 PM, Marc Delisle <marc(a)infomarc.info> wrote:

Le 2012-05-14 08:50, Thilina Buddika Abeyrathna a écrit :

Hi Marc, There are HTML code block from line 438 in the tbl_change.php

file(after my

last commit [0]). It doesn't mix with much PHP tags. It is somewhat readable. Do I need to implement several functions to render this HTML block. Can

you

give me a suggestion.. [0] -

Ok. Don't forget this bug, when following this scenario: 1. Browse a table 2. Click the checkbox for two rows 3. At the botton, click the With selected...change link -- Marc Delisle http://infomarc.info

Thilina Buddika Abeyrathna

8:50 a.m.

On Wed, May 16, 2012 at 6:15 PM, Marc Delisle <marc(a)infomarc.info> wrote:

...

Le 2012-05-16 08:37, Thilina Buddika Abeyrathna a écrit :

On Mon, May 14, 2012 at 10:23 PM, Thilina Buddika Abeyrathna < thilinaabeyrathna(a)gmail.com> wrote: > > > On Mon, May 14, 2012 at 10:09 PM, Marc Delisle <marc(a)infomarc.info>

wrote:

> >> Le 2012-05-14 08:50, Thilina Buddika Abeyrathna a écrit : >>> Hi Marc, >>> There are HTML code block from line 438 in the tbl_change.php >> file(after my >>> last commit [0]). It doesn't mix with much PHP tags. It is somewhat >>> readable. >>> Do I need to implement several functions to render this HTML block.

Can

>> you >>> give me a suggestion.. >>> >>> [0] - >>> >>

https://github.com/thilinaa/phpmyadmin/commit/9d6c38daf6a98d915a34391bddb98…

>> >> Hi Thilina, >> The code generating the actions_panel fieldset would benefit from being >> refactored into one or more functions. The reason is that it's

difficult

>> to understand quickly such a long code block. >> >> It could become >> $html_output = PMA_getActionsPanel(...); >> >> Thank you for your reply Marc. I'll do like this > > >> ----------- >> >> By the way, did you consider using a class? Have a look at >> libraries/Partition.class.php. Then, the calling script uses this

syntax:

>> >> $partition_names = PMA_Partition::getPartitionNames($db, $table); >> >> The benefit is that you don't have to bother about function name

clashing.

Thanks Marc. I'll look at that.

Ok. Don't forget this bug, when following this scenario: 1. Browse a table 2. Click the checkbox for two rows 3. At the botton, click the With selected...change link

Ok Marc. -- Regards. Thilina Buddika Abeyrathna, Department of Computer Engineering, Faculty Of Engineering, University of Peradeniya, Sri Lanka.

Thilina Buddika Abeyrathna

2:55 p.m.

On Wed, May 16, 2012 at 6:20 PM, Thilina Buddika Abeyrathna < thilinaabeyrathna(a)gmail.com> wrote:

...

On Wed, May 16, 2012 at 6:15 PM, Marc Delisle <marc(a)infomarc.info> wrote:

Le 2012-05-16 08:37, Thilina Buddika Abeyrathna a écrit :

On Mon, May 14, 2012 at 10:23 PM, Thilina Buddika Abeyrathna < thilinaabeyrathna(a)gmail.com> wrote: > > > On Mon, May 14, 2012 at 10:09 PM, Marc Delisle <marc(a)infomarc.info>

wrote:

Can

>> you >>> give me a suggestion.. >>> >>> [0] - >>> >>

https://github.com/thilinaa/phpmyadmin/commit/9d6c38daf6a98d915a34391bddb98…

>> >> Hi Thilina, >> The code generating the actions_panel fieldset would benefit from

being

>> refactored into one or more functions. The reason is that it's

difficult

syntax:

>> >> $partition_names = PMA_Partition::getPartitionNames($db, $table); >> >> The benefit is that you don't have to bother about function name

clashing.

> > Thanks Marc. I'll look at that.

Hi Marc, Now tbl_change.php script is somewhat readable and maintainable. Still there is a long if condition in this script. but it is not a very

complex

control statement . So do I need to implement a function to separate

that

if condition too.

Ok. Don't forget this bug, when following this scenario: 1. Browse a table 2. Click the checkbox for two rows 3. At the botton, click the With selected...change link

Fixed.

...

Ok Marc.

-- Regards. Thilina Buddika Abeyrathna, Department of Computer Engineering, Faculty Of Engineering, University of Peradeniya, Sri Lanka.

Marc Delisle

17 May 17 May

12:31 p.m.

Le 2012-05-16 14:55, Thilina Buddika Abeyrathna a écrit :

...

>> Ok. Don't forget this bug, when following this scenario: >> >> 1. Browse a table >> 2. Click the checkbox for two rows >> 3. At the botton, click the With selected...change link > > > Fixed.

Thilina, still having a bug with this scenario. You fixed the part where the rows were not displayed for editing, however, now that they are displayed, I try to change data and click Go. An INSERT statement is wrongly generated. -- Marc Delisle http://infomarc.info

Thilina Buddika Abeyrathna

10:49 p.m.

On Thu, May 17, 2012 at 10:01 PM, Marc Delisle <marc(a)infomarc.info> wrote:

...

Le 2012-05-16 14:55, Thilina Buddika Abeyrathna a écrit :

>> Ok. Don't forget this bug, when following this scenario: >> >> 1. Browse a table >> 2. Click the checkbox for two rows >> 3. At the botton, click the With selected...change link > > > Fixed.

Ok Marc, I'll fix that. -- Regards. Thilina Buddika Abeyrathna, Department of Computer Engineering, Faculty Of Engineering, University of Peradeniya, Sri Lanka.

Thilina Buddika Abeyrathna

21 May 21 May

11:41 a.m.

Hi Marc, In tbl_replace.php I don't see any usage of $me_fields variable. So I'm going to remove the declaration and I'll change the all variable names $me_* to $multi_edit_*. Is it OK? -- Regards. Thilina Buddika Abeyrathna, Department of Computer Engineering, Faculty Of Engineering, University of Peradeniya, Sri Lanka.

Marc Delisle

11:47 a.m.

Le 2012-05-21 11:41, Thilina Buddika Abeyrathna a écrit :

...

Hi Marc, In tbl_replace.php I don't see any usage of $me_fields variable. So I'm going to remove the declaration and I'll change the all variable names $me_* to $multi_edit_*. Is it OK?

Hi Thilina, If you have access to command-line git, try this: git grep '$me_fields' and you'll see that libraries/tbl_replace_fields.inc.php is using these variables (other scripts are also using them). -- Marc Delisle http://infomarc.info

Thilina Buddika Abeyrathna

11:50 a.m.

On Mon, May 21, 2012 at 9:17 PM, Marc Delisle <marc(a)infomarc.info> wrote:

...

Le 2012-05-21 11:41, Thilina Buddika Abeyrathna a écrit :

Hi Marc, In tbl_replace.php I don't see any usage of $me_fields variable. So I'm going to remove the declaration and I'll change the all variable names $me_* to $multi_edit_*. Is it OK?

And is it ok to changing variable name like above. -- Regards. Thilina Buddika Abeyrathna, Department of Computer Engineering, Faculty Of Engineering, University of Peradeniya, Sri Lanka.

Marc Delisle

12:24 p.m.

Le 2012-05-21 11:50, Thilina Buddika Abeyrathna a écrit :

...

On Mon, May 21, 2012 at 9:17 PM, Marc Delisle <marc(a)infomarc.info> wrote:

Le 2012-05-21 11:41, Thilina Buddika Abeyrathna a écrit :

Hi Marc, In tbl_replace.php I don't see any usage of $me_fields variable. So I'm going to remove the declaration and I'll change the all variable names $me_* to $multi_edit_*. Is it OK?

And is it ok to changing variable name like above.

Yes, this is good refactoring. Of course, you know I'm allergic to using the term "field" when it refers to a table's column. -- Marc Delisle http://infomarc.info

Thilina Buddika Abeyrathna

12:47 p.m.

On Mon, May 21, 2012 at 9:54 PM, Marc Delisle <marc(a)infomarc.info> wrote:

...

Le 2012-05-21 11:50, Thilina Buddika Abeyrathna a écrit :

On Mon, May 21, 2012 at 9:17 PM, Marc Delisle <marc(a)infomarc.info>

wrote:

Le 2012-05-21 11:41, Thilina Buddika Abeyrathna a écrit :

Hi Marc, In tbl_replace.php I don't see any usage of $me_fields variable. So I'm going to remove the declaration and I'll change the all variable names $me_* to $multi_edit_*. Is it OK?

And is it ok to changing variable name like above.

Yes, this is good refactoring. Of course, you know I'm allergic to using the term "field" when it refers to a table's column.

Ok Marc. :) -- Regards. Thilina Buddika Abeyrathna, Department of Computer Engineering, Faculty Of Engineering, University of Peradeniya, Sri Lanka.

Marc Delisle

1:02 p.m.

Le 2012-05-21 12:47, Thilina Buddika Abeyrathna a écrit :

...

On Mon, May 21, 2012 at 9:54 PM, Marc Delisle <marc(a)infomarc.info> wrote:

Le 2012-05-21 11:50, Thilina Buddika Abeyrathna a écrit :

On Mon, May 21, 2012 at 9:17 PM, Marc Delisle <marc(a)infomarc.info>

wrote:

Le 2012-05-21 11:41, Thilina Buddika Abeyrathna a écrit : > Hi Marc, > In tbl_replace.php I don't see any usage of $me_fields variable. So I'm > going to remove the declaration and I'll change the all variable names > $me_* to $multi_edit_*. > Is it OK? Hi Thilina, If you have access to command-line git, try this: git grep '$me_fields' and you'll see that libraries/tbl_replace_fields.inc.php is using these variables (other scripts are also using them). I just realize that Marc. Sorry for the mistake.

And is it ok to changing variable name like above.

Yes, this is good refactoring. Of course, you know I'm allergic to using the term "field" when it refers to a table's column.

Ok Marc. :)

By the way, I prefer that you finish your work on tbl_change before working on tbl_replace. I wish to merge your work soon, but there are still things to improve or fix: - the multi-row edit bug - the $vrow and $vresult variables -- Marc Delisle http://infomarc.info

Thilina Buddika Abeyrathna

2:46 p.m.

On Mon, May 21, 2012 at 10:32 PM, Marc Delisle <marc(a)infomarc.info> wrote:

...

Le 2012-05-21 12:47, Thilina Buddika Abeyrathna a écrit :

On Mon, May 21, 2012 at 9:54 PM, Marc Delisle <marc(a)infomarc.info>

wrote:

> Le 2012-05-21 11:50, Thilina Buddika Abeyrathna a écrit : >> On Mon, May 21, 2012 at 9:17 PM, Marc Delisle <marc(a)infomarc.info> > wrote: >> >>> Le 2012-05-21 11:41, Thilina Buddika Abeyrathna a écrit : >>>> Hi Marc, >>>> In tbl_replace.php I don't see any usage of $me_fields variable. So

I'm

>>>> going to remove the declaration and I'll change the all variable

names

>>>> $me_* to $multi_edit_*. >>>> Is it OK? >>> >>> Hi Thilina, >>> If you have access to command-line git, try this: >>> >>> git grep '$me_fields' >>> >>> and you'll see that libraries/tbl_replace_fields.inc.php is using

these

> variables (other scripts are also using them). > > I just realize that Marc. Sorry for the mistake. And is it ok to changing variable name like above.

Yes, this is good refactoring. Of course, you know I'm allergic to using the term "field" when it refers to a table's column.

Ok Marc. :)

Hi Marc, I'm trying to fix the multi-row edit bug. But still I couldn't find the place which is wrong that I have done when refactoring. -- Regards. Thilina Buddika Abeyrathna, Department of Computer Engineering, Faculty Of Engineering, University of Peradeniya, Sri Lanka.

Marc Delisle

3:08 p.m.

Le 2012-05-21 14:46, Thilina Buddika Abeyrathna a écrit :

...

On Mon, May 21, 2012 at 10:32 PM, Marc Delisle <marc(a)infomarc.info> wrote:

Le 2012-05-21 12:47, Thilina Buddika Abeyrathna a écrit :

On Mon, May 21, 2012 at 9:54 PM, Marc Delisle <marc(a)infomarc.info>

wrote:

I'm

>>>> going to remove the declaration and I'll change the all variable

names

these

>> variables (other scripts are also using them). >> >> I just realize that Marc. Sorry for the mistake. > And is it ok to changing variable name like above. Yes, this is good refactoring. Of course, you know I'm allergic to using the term "field" when it refers to a table's column.

Ok Marc. :)

Hi Marc, I'm trying to fix the multi-row edit bug. But still I couldn't find the place which is wrong that I have done when refactoring.

You can find which commit produced the bug, with git bisect. The current upstream master does not have this bug. -- Marc Delisle http://infomarc.info

Thilina Buddika Abeyrathna

22 May 22 May

9:44 p.m.

On Tue, May 22, 2012 at 12:38 AM, Marc Delisle <marc(a)infomarc.info> wrote:

...

Le 2012-05-21 14:46, Thilina Buddika Abeyrathna a écrit :

On Mon, May 21, 2012 at 10:32 PM, Marc Delisle <marc(a)infomarc.info>

wrote:

> Le 2012-05-21 12:47, Thilina Buddika Abeyrathna a écrit : >> On Mon, May 21, 2012 at 9:54 PM, Marc Delisle <marc(a)infomarc.info> > wrote: >> >>> Le 2012-05-21 11:50, Thilina Buddika Abeyrathna a écrit : >>>> On Mon, May 21, 2012 at 9:17 PM, Marc Delisle <marc(a)infomarc.info> >>> wrote: >>>> >>>>> Le 2012-05-21 11:41, Thilina Buddika Abeyrathna a écrit : >>>>>> Hi Marc, >>>>>> In tbl_replace.php I don't see any usage of $me_fields variable. So > I'm >>>>>> going to remove the declaration and I'll change the all variable > names >>>>>> $me_* to $multi_edit_*. >>>>>> Is it OK? >>>>> >>>>> Hi Thilina, >>>>> If you have access to command-line git, try this: >>>>> >>>>> git grep '$me_fields' >>>>> >>>>> and you'll see that libraries/tbl_replace_fields.inc.php is using > these >>>>> variables (other scripts are also using them). >>>>> >>>>> I just realize that Marc. Sorry for the mistake. >>>> And is it ok to changing variable name like above. >>> >>> Yes, this is good refactoring. Of course, you know I'm allergic to

using

> the term "field" when it refers to a table's column. Ok Marc. :)

Hi Marc, I'm trying to fix the multi-row edit bug. But still I couldn't find the place which is wrong that I have done when refactoring.

You can find which commit produced the bug, with git bisect. The current upstream master does not have this bug.

Hi Marc, I fixed the issue. But when I commit, I used the following scenario, 1. git status -> two modified files 2. git add [2 files] 3. git commit -m " " ->(2 file changed, ......) 4. git push origin master -> it says everything up-to-date :( Am I missed something ? -- Regards. Thilina Buddika Abeyrathna, Department of Computer Engineering, Faculty Of Engineering, University of Peradeniya, Sri Lanka.

Rouslan Placella

9:47 p.m.

On 23/05/12 02:44, Thilina Buddika Abeyrathna wrote:

...

On Tue, May 22, 2012 at 12:38 AM, Marc Delisle<marc(a)infomarc.info> wrote:

Le 2012-05-21 14:46, Thilina Buddika Abeyrathna a écrit :

On Mon, May 21, 2012 at 10:32 PM, Marc Delisle<marc(a)infomarc.info>

wrote:

> Le 2012-05-21 12:47, Thilina Buddika Abeyrathna a écrit : >> On Mon, May 21, 2012 at 9:54 PM, Marc Delisle<marc(a)infomarc.info> > wrote: >> >>> Le 2012-05-21 11:50, Thilina Buddika Abeyrathna a écrit : >>>> On Mon, May 21, 2012 at 9:17 PM, Marc Delisle<marc(a)infomarc.info> >>> wrote: >>>> >>>>> Le 2012-05-21 11:41, Thilina Buddika Abeyrathna a écrit : >>>>>> Hi Marc, >>>>>> In tbl_replace.php I don't see any usage of $me_fields variable. So > I'm >>>>>> going to remove the declaration and I'll change the all variable > names >>>>>> $me_* to $multi_edit_*. >>>>>> Is it OK? >>>>> >>>>> Hi Thilina, >>>>> If you have access to command-line git, try this: >>>>> >>>>> git grep '$me_fields' >>>>> >>>>> and you'll see that libraries/tbl_replace_fields.inc.php is using > these >>>>> variables (other scripts are also using them). >>>>> >>>>> I just realize that Marc. Sorry for the mistake. >>>> And is it ok to changing variable name like above. >>> >>> Yes, this is good refactoring. Of course, you know I'm allergic to

using

>> the term "field" when it refers to a table's column. > > > Ok Marc. :) By the way, I prefer that you finish your work on tbl_change before working on tbl_replace. I wish to merge your work soon, but there are still things to improve or fix: - the multi-row edit bug - the $vrow and $vresult variables

Hi Marc, I'm trying to fix the multi-row edit bug. But still I couldn't find the place which is wrong that I have done when refactoring.

You can find which commit produced the bug, with git bisect. The current upstream master does not have this bug.

Maybe you're missing 'git checkout master' before committing? If 'git branch' says that you're on another branch, you can push like this 'git push origin anotherbranch:master' Bye, Rouslan

Thilina Buddika Abeyrathna

10:26 p.m.

On Wed, May 23, 2012 at 7:17 AM, Rouslan Placella <rouslan(a)placella.com>wrote;wrote:

...

On 23/05/12 02:44, Thilina Buddika Abeyrathna wrote:

On Tue, May 22, 2012 at 12:38 AM, Marc Delisle<marc(a)infomarc.info>

wrote:

> Le 2012-05-21 14:46, Thilina Buddika Abeyrathna a écrit : >> On Mon, May 21, 2012 at 10:32 PM, Marc Delisle<marc(a)infomarc.info> > wrote: >> >>> Le 2012-05-21 12:47, Thilina Buddika Abeyrathna a écrit : >>>> On Mon, May 21, 2012 at 9:54 PM, Marc Delisle<marc(a)infomarc.info> >>> wrote: >>>> >>>>> Le 2012-05-21 11:50, Thilina Buddika Abeyrathna a écrit : >>>>>> On Mon, May 21, 2012 at 9:17 PM, Marc Delisle<marc(a)infomarc.info> >>>>> wrote: >>>>>> >>>>>>> Le 2012-05-21 11:41, Thilina Buddika Abeyrathna a écrit : >>>>>>>> Hi Marc, >>>>>>>> In tbl_replace.php I don't see any usage of $me_fields variable.

>>> I'm >>>>>>>> going to remove the declaration and I'll change the all variable >>> names >>>>>>>> $me_* to $multi_edit_*. >>>>>>>> Is it OK? >>>>>>> >>>>>>> Hi Thilina, >>>>>>> If you have access to command-line git, try this: >>>>>>> >>>>>>> git grep '$me_fields' >>>>>>> >>>>>>> and you'll see that libraries/tbl_replace_fields.inc.php is using >>> these >>>>>>> variables (other scripts are also using them). >>>>>>> >>>>>>> I just realize that Marc. Sorry for the mistake. >>>>>> And is it ok to changing variable name like above. >>>>> >>>>> Yes, this is good refactoring. Of course, you know I'm allergic to > using >>>>> the term "field" when it refers to a table's column. >>>> >>>> >>>> Ok Marc. :) >>> >>> By the way, I prefer that you finish your work on tbl_change before >>> working on tbl_replace. >>> >>> I wish to merge your work soon, but there are still things to improve

> fix: > > - the multi-row edit bug > - the $vrow and $vresult variables Hi Marc, I'm trying to fix the multi-row edit bug. But still I couldn't find the place which is wrong that I have done when refactoring.

You can find which commit produced the bug, with git bisect. The current upstream master does not have this bug.

Maybe you're missing 'git checkout master' before committing? If 'git branch' says that you're on another branch, you can push like this 'git push origin anotherbranch:master' Bye, Rouslan

Hi Rouslan, $ git branch * (no branch) master -- Regards. Thilina Buddika Abeyrathna, Department of Computer Engineering, Faculty Of Engineering, University of Peradeniya, Sri Lanka.

Marc Delisle

23 May 23 May

6:40 a.m.

Le 2012-05-22 22:26, Thilina Buddika Abeyrathna a écrit :

...

On Wed, May 23, 2012 at 7:17 AM, Rouslan Placella <rouslan(a)placella.com>wrote;wrote:

On 23/05/12 02:44, Thilina Buddika Abeyrathna wrote:

On Tue, May 22, 2012 at 12:38 AM, Marc Delisle<marc(a)infomarc.info>

wrote:

>> fix: >> >> - the multi-row edit bug >> - the $vrow and $vresult variables > > > Hi Marc, > I'm trying to fix the multi-row edit bug. But still I couldn't find the > place which is wrong that I have done when refactoring. You can find which commit produced the bug, with git bisect. The current upstream master does not have this bug.

Maybe you're missing 'git checkout master' before committing? If 'git branch' says that you're on another branch, you can push like this 'git push origin anotherbranch:master' Bye, Rouslan

Hi Rouslan, $ git branch * (no branch) master

This means that you are currently not on any branch. -- Marc Delisle http://infomarc.info

Thilina Buddika Abeyrathna

6:44 a.m.

On Wed, May 23, 2012 at 4:10 PM, Marc Delisle <marc(a)infomarc.info> wrote:

...

Le 2012-05-22 22:26, Thilina Buddika Abeyrathna a écrit :

On Wed, May 23, 2012 at 7:17 AM, Rouslan Placella <rouslan(a)placella.com wrote:

On 23/05/12 02:44, Thilina Buddika Abeyrathna wrote:

On Tue, May 22, 2012 at 12:38 AM, Marc Delisle<marc(a)infomarc.info>

wrote: > >> Le 2012-05-21 14:46, Thilina Buddika Abeyrathna a écrit : >>> On Mon, May 21, 2012 at 10:32 PM, Marc Delisle<marc(a)infomarc.info> >> wrote: >>> >>>> Le 2012-05-21 12:47, Thilina Buddika Abeyrathna a écrit : >>>>> On Mon, May 21, 2012 at 9:54 PM, Marc Delisle<marc(a)infomarc.info> >>>> wrote: >>>>> >>>>>> Le 2012-05-21 11:50, Thilina Buddika Abeyrathna a écrit : >>>>>>> On Mon, May 21, 2012 at 9:17 PM, Marc Delisle<marc(a)infomarc.info

>>>>>>> wrote: >>>>>>>> >>>>>>>>> Le 2012-05-21 11:41, Thilina Buddika Abeyrathna a écrit : >>>>>>>>>> Hi Marc, >>>>>>>>>> In tbl_replace.php I don't see any usage of $me_fields

variable.

> So >>>>> I'm >>>>>>>>>> going to remove the declaration and I'll change the all

variable

>>>>> names >>>>>>>>>> $me_* to $multi_edit_*. >>>>>>>>>> Is it OK? >>>>>>>>> >>>>>>>>> Hi Thilina, >>>>>>>>> If you have access to command-line git, try this: >>>>>>>>> >>>>>>>>> git grep '$me_fields' >>>>>>>>> >>>>>>>>> and you'll see that libraries/tbl_replace_fields.inc.php is

using

>>>>> these >>>>>>>>> variables (other scripts are also using them). >>>>>>>>> >>>>>>>>> I just realize that Marc. Sorry for the mistake. >>>>>>>> And is it ok to changing variable name like above. >>>>>>> >>>>>>> Yes, this is good refactoring. Of course, you know I'm allergic to >>> using >>>>>>> the term "field" when it refers to a table's column. >>>>>> >>>>>> >>>>>> Ok Marc. :) >>>>> >>>>> By the way, I prefer that you finish your work on tbl_change before >>>>> working on tbl_replace. >>>>> >>>>> I wish to merge your work soon, but there are still things to

improve

> or >>>>> fix: >>>>> >>>>> - the multi-row edit bug >>>>> - the $vrow and $vresult variables >>>> >>>> >>>> Hi Marc, >>>> I'm trying to fix the multi-row edit bug. But still I couldn't find

the

>>>> place which is wrong that I have done when refactoring. >>> >>> You can find which commit produced the bug, with git bisect. The

current

> upstream master does not have this bug. Hi Marc, I fixed the issue. But when I commit, I used the following scenario, 1. git status -> two modified files 2. git add [2 files] 3. git commit -m " " ->(2 file changed, ......) 4. git push origin master -> it says everything up-to-date :( Am I missed something ?

Maybe you're missing 'git checkout master' before committing? If 'git branch' says that you're on another branch, you can push like this 'git push origin anotherbranch:master' Bye, Rouslan

Hi Rouslan, $ git branch * (no branch) master

This means that you are currently not on any branch.

So how to push my changes. (Now I'm in the master, I ran 'git checkout master' ) -- Regards. Thilina Buddika Abeyrathna, Department of Computer Engineering, Faculty Of Engineering, University of Peradeniya, Sri Lanka.

Marc Delisle

6:51 a.m.

Le 2012-05-23 06:44, Thilina Buddika Abeyrathna a écrit :

...

On Wed, May 23, 2012 at 4:10 PM, Marc Delisle <marc(a)infomarc.info> wrote:

Le 2012-05-22 22:26, Thilina Buddika Abeyrathna a écrit :

On Wed, May 23, 2012 at 7:17 AM, Rouslan Placella <rouslan(a)placella.com wrote:

On 23/05/12 02:44, Thilina Buddika Abeyrathna wrote: > On Tue, May 22, 2012 at 12:38 AM, Marc Delisle<marc(a)infomarc.info> wrote: > >> Le 2012-05-21 14:46, Thilina Buddika Abeyrathna a écrit : >>> On Mon, May 21, 2012 at 10:32 PM, Marc Delisle<marc(a)infomarc.info> >> wrote: >>> >>>> Le 2012-05-21 12:47, Thilina Buddika Abeyrathna a écrit : >>>>> On Mon, May 21, 2012 at 9:54 PM, Marc Delisle<marc(a)infomarc.info> >>>> wrote: >>>>> >>>>>> Le 2012-05-21 11:50, Thilina Buddika Abeyrathna a écrit : >>>>>>> On Mon, May 21, 2012 at 9:17 PM, Marc Delisle<marc(a)infomarc.info

>>>>>>> wrote: >>>>>>>> >>>>>>>>> Le 2012-05-21 11:41, Thilina Buddika Abeyrathna a écrit : >>>>>>>>>> Hi Marc, >>>>>>>>>> In tbl_replace.php I don't see any usage of $me_fields

variable.

> So >>>>> I'm >>>>>>>>>> going to remove the declaration and I'll change the all

variable

using

improve

> or >>>>> fix: >>>>> >>>>> - the multi-row edit bug >>>>> - the $vrow and $vresult variables >>>> >>>> >>>> Hi Marc, >>>> I'm trying to fix the multi-row edit bug. But still I couldn't find

the

>>>> place which is wrong that I have done when refactoring. >>> >>> You can find which commit produced the bug, with git bisect. The

current

>> upstream master does not have this bug. > > > Hi Marc, > I fixed the issue. But when I commit, I used the following scenario, > 1. git status -> two modified files > 2. git add [2 files] > 3. git commit -m " " ->(2 file changed, ......) > 4. git push origin master -> it says everything up-to-date :( > Am I missed something ? Maybe you're missing 'git checkout master' before committing? If 'git branch' says that you're on another branch, you can push like this 'git push origin anotherbranch:master' Bye, Rouslan

Hi Rouslan, $ git branch * (no branch) master

This means that you are currently not on any branch.

So how to push my changes. (Now I'm in the master, I ran 'git checkout master' )

Now that you are in your master branch, what's the output of git status -- Marc Delisle http://infomarc.info

Thilina Buddika Abeyrathna

6:57 a.m.

On Wed, May 23, 2012 at 4:21 PM, Marc Delisle <marc(a)infomarc.info> wrote:

...

Le 2012-05-23 06:44, Thilina Buddika Abeyrathna a écrit :

On Wed, May 23, 2012 at 4:10 PM, Marc Delisle <marc(a)infomarc.info>

wrote:

> Le 2012-05-22 22:26, Thilina Buddika Abeyrathna a écrit : >> On Wed, May 23, 2012 at 7:17 AM, Rouslan Placella <

rouslan(a)placella.com

> wrote: > >> On 23/05/12 02:44, Thilina Buddika Abeyrathna wrote: >>> On Tue, May 22, 2012 at 12:38 AM, Marc Delisle<marc(a)infomarc.info> >> wrote: >>> >>>> Le 2012-05-21 14:46, Thilina Buddika Abeyrathna a écrit : >>>>> On Mon, May 21, 2012 at 10:32 PM, Marc Delisle<marc(a)infomarc.info> >>>> wrote: >>>>> >>>>>> Le 2012-05-21 12:47, Thilina Buddika Abeyrathna a écrit : >>>>>>> On Mon, May 21, 2012 at 9:54 PM, Marc Delisle<marc(a)infomarc.info

>>>>>>> wrote: >>>>>>>> >>>>>>>>> Le 2012-05-21 11:50, Thilina Buddika Abeyrathna a écrit : >>>>>>>>>> On Mon, May 21, 2012 at 9:17 PM, Marc Delisle<

marc(a)infomarc.info

>> >>>>>>>>> wrote: >>>>>>>>>> >>>>>>>>>>> Le 2012-05-21 11:41, Thilina Buddika Abeyrathna a écrit : >>>>>>>>>>>> Hi Marc, >>>>>>>>>>>> In tbl_replace.php I don't see any usage of $me_fields > variable. >>> So >>>>>>> I'm >>>>>>>>>>>> going to remove the declaration and I'll change the all > variable >>>>>>> names >>>>>>>>>>>> $me_* to $multi_edit_*. >>>>>>>>>>>> Is it OK? >>>>>>>>>>> >>>>>>>>>>> Hi Thilina, >>>>>>>>>>> If you have access to command-line git, try this: >>>>>>>>>>> >>>>>>>>>>> git grep '$me_fields' >>>>>>>>>>> >>>>>>>>>>> and you'll see that libraries/tbl_replace_fields.inc.php is > using >>>>>>> these >>>>>>>>>>> variables (other scripts are also using them). >>>>>>>>>>> >>>>>>>>>>> I just realize that Marc. Sorry for the mistake. >>>>>>>>>> And is it ok to changing variable name like above. >>>>>>>>> >>>>>>>>> Yes, this is good refactoring. Of course, you know I'm allergic

>>>>> using >>>>>>>>> the term "field" when it refers to a table's column. >>>>>>>> >>>>>>>> >>>>>>>> Ok Marc. :) >>>>>>> >>>>>>> By the way, I prefer that you finish your work on tbl_change

before

>>>>> working on tbl_replace. >>>>> >>>>> I wish to merge your work soon, but there are still things to

improve

> or >>>>> fix: >>>>> >>>>> - the multi-row edit bug >>>>> - the $vrow and $vresult variables >>>> >>>> >>>> Hi Marc, >>>> I'm trying to fix the multi-row edit bug. But still I couldn't find

the

>>>> place which is wrong that I have done when refactoring. >>> >>> You can find which commit produced the bug, with git bisect. The

current

>>> upstream master does not have this bug. >> >> >> Hi Marc, >> I fixed the issue. But when I commit, I used the following scenario, >> 1. git status -> two modified files >> 2. git add [2 files] >> 3. git commit -m " " ->(2 file changed, ......) >> 4. git push origin master -> it says everything up-to-date :( >> Am I missed something ? > > Maybe you're missing 'git checkout master' before committing? > If 'git branch' says that you're on another branch, you can push like > this 'git push origin anotherbranch:master' > > Bye, > Rouslan Hi Rouslan, $ git branch * (no branch) master

This means that you are currently not on any branch.

So how to push my changes. (Now I'm in the master, I ran 'git checkout master' )

Now that you are in your master branch, what's the output of git status As I mentioned in previous email earlier I ran 'git commit' and then push.

But it said everything up-to-date. After I ran git status. Then no any modified files. (Now I have done some changes in insert_edit.lib.php and tbl_replace.php files) -- Regards. Thilina Buddika Abeyrathna, Department of Computer Engineering, Faculty Of Engineering, University of Peradeniya, Sri Lanka.

Marc Delisle

8:09 a.m.

Le 2012-05-23 06:57, Thilina Buddika Abeyrathna a écrit :

...

On Wed, May 23, 2012 at 4:21 PM, Marc Delisle <marc(a)infomarc.info> wrote:

Le 2012-05-23 06:44, Thilina Buddika Abeyrathna a écrit :

On Wed, May 23, 2012 at 4:10 PM, Marc Delisle <marc(a)infomarc.info>

wrote:

> Le 2012-05-22 22:26, Thilina Buddika Abeyrathna a écrit : >> On Wed, May 23, 2012 at 7:17 AM, Rouslan Placella <

rouslan(a)placella.com

>>>>>>> wrote: >>>>>>>> >>>>>>>>> Le 2012-05-21 11:50, Thilina Buddika Abeyrathna a écrit : >>>>>>>>>> On Mon, May 21, 2012 at 9:17 PM, Marc Delisle<

marc(a)infomarc.info

>>>>> using >>>>>>>>> the term "field" when it refers to a table's column. >>>>>>>> >>>>>>>> >>>>>>>> Ok Marc. :) >>>>>>> >>>>>>> By the way, I prefer that you finish your work on tbl_change

before

>>>>>> working on tbl_replace. >>>>>> >>>>>> I wish to merge your work soon, but there are still things to improve >> or >>>>>> fix: >>>>>> >>>>>> - the multi-row edit bug >>>>>> - the $vrow and $vresult variables >>>>> >>>>> >>>>> Hi Marc, >>>>> I'm trying to fix the multi-row edit bug. But still I couldn't find the >>>>> place which is wrong that I have done when refactoring. >>>> >>>> You can find which commit produced the bug, with git bisect. The current >>>> upstream master does not have this bug. >>> >>> >>> Hi Marc, >>> I fixed the issue. But when I commit, I used the following scenario, >>> 1. git status -> two modified files >>> 2. git add [2 files] >>> 3. git commit -m " " ->(2 file changed, ......) >>> 4. git push origin master -> it says everything up-to-date :( >>> Am I missed something ? >> >> Maybe you're missing 'git checkout master' before committing? >> If 'git branch' says that you're on another branch, you can push like >> this 'git push origin anotherbranch:master' >> >> Bye, >> Rouslan > > > Hi Rouslan, > > $ git branch > * (no branch) > master This means that you are currently not on any branch.

So how to push my changes. (Now I'm in the master, I ran 'git checkout master' )

Now that you are in your master branch, what's the output of git status As I mentioned in previous email earlier I ran 'git commit' and then push.

But it said everything up-to-date. After I ran git status. Then no any modified files. (Now I have done some changes in insert_edit.lib.php and tbl_replace.php files)

There are no recent commits that were pushed here: https://github.com/thilinaa/phpmyadmin/commits/master -- Marc Delisle http://infomarc.info

Thilina Buddika Abeyrathna

9:49 a.m.

On Wed, May 23, 2012 at 5:39 PM, Marc Delisle <marc(a)infomarc.info> wrote:

...

Le 2012-05-23 06:57, Thilina Buddika Abeyrathna a écrit :

On Wed, May 23, 2012 at 4:21 PM, Marc Delisle <marc(a)infomarc.info>

wrote:

> Le 2012-05-23 06:44, Thilina Buddika Abeyrathna a écrit : >> On Wed, May 23, 2012 at 4:10 PM, Marc Delisle <marc(a)infomarc.info> > wrote: >> >>> Le 2012-05-22 22:26, Thilina Buddika Abeyrathna a écrit : >>>> On Wed, May 23, 2012 at 7:17 AM, Rouslan Placella < > rouslan(a)placella.com >>>> wrote: >>>> >>>>> On 23/05/12 02:44, Thilina Buddika Abeyrathna wrote: >>>>>> On Tue, May 22, 2012 at 12:38 AM, Marc Delisle<marc(a)infomarc.info> >>>>> wrote: >>>>>> >>>>>>> Le 2012-05-21 14:46, Thilina Buddika Abeyrathna a écrit : >>>>>>>> On Mon, May 21, 2012 at 10:32 PM, Marc Delisle<

marc(a)infomarc.info>

>>>>>>> wrote: >>>>>>>> >>>>>>>>> Le 2012-05-21 12:47, Thilina Buddika Abeyrathna a écrit : >>>>>>>>>> On Mon, May 21, 2012 at 9:54 PM, Marc Delisle<

marc(a)infomarc.info

>> >>>>>>>>> wrote: >>>>>>>>>> >>>>>>>>>>> Le 2012-05-21 11:50, Thilina Buddika Abeyrathna a écrit : >>>>>>>>>>>> On Mon, May 21, 2012 at 9:17 PM, Marc Delisle< > marc(a)infomarc.info >>>> >>>>>>>>>>> wrote: >>>>>>>>>>>> >>>>>>>>>>>>> Le 2012-05-21 11:41, Thilina Buddika Abeyrathna a écrit : >>>>>>>>>>>>>> Hi Marc, >>>>>>>>>>>>>> In tbl_replace.php I don't see any usage of $me_fields >>> variable. >>>>> So >>>>>>>>> I'm >>>>>>>>>>>>>> going to remove the declaration and I'll change the all >>> variable >>>>>>>>> names >>>>>>>>>>>>>> $me_* to $multi_edit_*. >>>>>>>>>>>>>> Is it OK? >>>>>>>>>>>>> >>>>>>>>>>>>> Hi Thilina, >>>>>>>>>>>>> If you have access to command-line git, try this: >>>>>>>>>>>>> >>>>>>>>>>>>> git grep '$me_fields' >>>>>>>>>>>>> >>>>>>>>>>>>> and you'll see that libraries/tbl_replace_fields.inc.php is >>> using >>>>>>>>> these >>>>>>>>>>>>> variables (other scripts are also using them). >>>>>>>>>>>>> >>>>>>>>>>>>> I just realize that Marc. Sorry for the mistake. >>>>>>>>>>>> And is it ok to changing variable name like above. >>>>>>>>>>> >>>>>>>>>>> Yes, this is good refactoring. Of course, you know I'm

allergic

> to >>>>>>> using >>>>>>>>>>> the term "field" when it refers to a table's column. >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> Ok Marc. :) >>>>>>>>> >>>>>>>>> By the way, I prefer that you finish your work on tbl_change > before >>>>>>>>> working on tbl_replace. >>>>>>>>> >>>>>>>>> I wish to merge your work soon, but there are still things to >>> improve >>>>> or >>>>>>>>> fix: >>>>>>>>> >>>>>>>>> - the multi-row edit bug >>>>>>>>> - the $vrow and $vresult variables >>>>>>>> >>>>>>>> >>>>>>>> Hi Marc, >>>>>>>> I'm trying to fix the multi-row edit bug. But still I couldn't

find

>>> the >>>>>>>> place which is wrong that I have done when refactoring. >>>>>>> >>>>>>> You can find which commit produced the bug, with git bisect. The >>> current >>>>>>> upstream master does not have this bug. >>>>>> >>>>>> >>>>>> Hi Marc, >>>>>> I fixed the issue. But when I commit, I used the following

scenario,

>>>>>> 1. git status -> two modified files >>>>>> 2. git add [2 files] >>>>>> 3. git commit -m " " ->(2 file changed, ......) >>>>>> 4. git push origin master -> it says everything up-to-date :( >>>>>> Am I missed something ? >>>>> >>>>> Maybe you're missing 'git checkout master' before committing? >>>>> If 'git branch' says that you're on another branch, you can push

>>>>> this 'git push origin anotherbranch:master' >>>>> >>>>> Bye, >>>>> Rouslan >>>> >>>> >>>> Hi Rouslan, >>>> >>>> $ git branch >>>> * (no branch) >>>> master >>> >>> This means that you are currently not on any branch. >> >> >> So how to push my changes. (Now I'm in the master, I ran 'git checkout >> master' ) > > Now that you are in your master branch, what's the output of > > git status > > As I mentioned in previous email earlier I ran 'git commit' and then

push.

But it said everything up-to-date. After I ran git status. Then no any modified files. (Now I have done some changes in insert_edit.lib.php and tbl_replace.php files)

There are no recent commits that were pushed here: https://github.com/thilinaa/phpmyadmin/commits/master

Hi Marc. I committed the changes. And also I Implemented some functions for tbl_replace.php -- Regards. Thilina Buddika Abeyrathna, Department of Computer Engineering, Faculty Of Engineering, University of Peradeniya, Sri Lanka.

Marc Delisle

12:46 p.m.

Le 2012-05-23 09:49, Thilina Buddika Abeyrathna a écrit :

...

Hi Marc. I committed the changes. And also I Implemented some functions for tbl_replace.php

Hi Thilina, I have merged your tree to upstream master, but please have a look at my comment for a new bug [0]. [0] https://github.com/thilinaa/phpmyadmin/commit/b52448fe34c63fb64b7c9f5c61085… -- Marc Delisle http://infomarc.info

Thilina Buddika Abeyrathna

12:52 p.m.

On Wed, May 23, 2012 at 10:16 PM, Marc Delisle <marc(a)infomarc.info> wrote:

...

Le 2012-05-23 09:49, Thilina Buddika Abeyrathna a écrit :

Hi Marc. I committed the changes. And also I Implemented some functions for tbl_replace.php

Hi Thilina, I have merged your tree to upstream master, but please have a look at my comment for a new bug [0]. [0] https://github.com/thilinaa/phpmyadmin/commit/b52448fe34c63fb64b7c9f5c61085…

Ok Marc, I'll look at that bug. -- Regards. Thilina Buddika Abeyrathna, Department of Computer Engineering, Faculty Of Engineering, University of Peradeniya, Sri Lanka.

4447

days inactive

4457

days old

developers@phpmyadmin.net

Manage subscription

31 comments

4 participants

tags (0)

participants (4)

Madhura Jayaratne
Marc Delisle
Rouslan Placella
Thilina Buddika Abeyrathna