Skip to content

Commit 2b3b058

Browse files
committed
tidy up the scripts with Perl::Tidy
- SQL::Abstract::Util - SQL::Abstract
1 parent 05c7a7e commit 2b3b058

File tree

2 files changed

+102
-86
lines changed

2 files changed

+102
-86
lines changed

lib/CellBIS/SQL/Abstract.pm

Lines changed: 66 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -15,40 +15,43 @@ has 'db_type';
1515
# For Query Insert :
1616
# ------------------------------------------------------------------------
1717
sub insert {
18-
my $self = shift;
18+
my $self = shift;
1919
my $arg_len = scalar @_;
20-
my $data = '';
20+
my $data = '';
2121
my ($table_name, $column, $col_val, $type);
2222
if ($arg_len == 3) {
2323
($table_name, $column, $col_val) = @_;
2424
}
2525
if ($arg_len >= 4) {
2626
($table_name, $column, $col_val, $type) = @_;
2727
}
28-
my @table_field = @{$column};
29-
my @table_data = @{$col_val};
28+
my @table_field = @{$column};
29+
my @table_data = @{$col_val};
3030
my @get_data_value = ();
31-
my $field_col = join ', ', @table_field;
32-
my $value_col = '';
33-
31+
my $field_col = join ', ', @table_field;
32+
my $value_col = '';
33+
3434
if ((scalar @table_field) == (scalar @table_data)) {
35-
35+
3636
if ($type && $type eq 'no-pre-st') {
37-
$value_col = join ', ', $self->QueryUtil->replace_data_value_insert_no_pre_st(\@table_data);
37+
$value_col = join ', ',
38+
$self->QueryUtil->replace_data_value_insert_no_pre_st(\@table_data);
3839
}
3940
elsif ($type && $type eq 'pre-st') {
40-
@get_data_value = $self->QueryUtil->replace_data_value_insert(\@table_data);
41+
@get_data_value
42+
= $self->QueryUtil->replace_data_value_insert(\@table_data);
4143
$value_col = join ', ', @get_data_value;
4244
}
4345
else {
44-
$value_col = join ', ', $self->QueryUtil->replace_data_value_insert_no_pre_st(\@table_data);
46+
$value_col = join ', ',
47+
$self->QueryUtil->replace_data_value_insert_no_pre_st(\@table_data);
4548
}
46-
49+
4750
$field_col = trim($field_col);
4851
$value_col = trim($value_col);
4952
$value_col =~ s/\,$//g;
5053
$value_col =~ s/\s\,//g;
51-
54+
5255
$data = "INSERT INTO $table_name($field_col) VALUES($value_col)";
5356
}
5457
return $data;
@@ -57,44 +60,44 @@ sub insert {
5760
# For Query Update :
5861
# ------------------------------------------------------------------------
5962
sub update {
60-
my $self = shift;
63+
my $self = shift;
6164
my $arg_len = scalar @_;
6265
my ($table_name, $column, $value, $clause, $type);
6366
my $data = '';
64-
67+
6568
($table_name, $column, $value, $clause) = @_ if $arg_len == 4;
6669
($table_name, $column, $value, $clause, $type) = @_ if $arg_len >= 5;
67-
68-
my @table_field = @{$column};
70+
71+
my @table_field = @{$column};
6972
my $field_change = '';
7073
my $where_clause = '';
71-
74+
7275
if ($type && $type eq 'no-pre-st') {
7376
my @get_value = $self->QueryUtil->col_with_val($column, $value);
7477
$field_change = join ', ', @get_value;
75-
78+
7679
if (exists $clause->{where}) {
7780
$where_clause = $self->QueryUtil->create_clause($clause);
78-
$data = "UPDATE $table_name \nSET $field_change \n$where_clause";
81+
$data = "UPDATE $table_name \nSET $field_change \n$where_clause";
7982
}
80-
83+
8184
}
8285
elsif ($type && $type eq 'pre-st') {
8386
$field_change = join '=?, ', @table_field;
8487
$field_change .= '=?';
85-
88+
8689
if (exists $clause->{where}) {
8790
$where_clause = $self->QueryUtil->create_clause($clause);
88-
$data = "UPDATE $table_name \nSET $field_change \n$where_clause";
91+
$data = "UPDATE $table_name \nSET $field_change \n$where_clause";
8992
}
9093
}
9194
else {
9295
my @get_value = $self->QueryUtil->col_with_val($column, $value);
9396
$field_change = join ', ', @get_value;
94-
97+
9598
if (exists $clause->{where}) {
9699
$where_clause = $self->QueryUtil->create_clause($clause);
97-
$data = "UPDATE $table_name \nSET $field_change \n$where_clause";
100+
$data = "UPDATE $table_name \nSET $field_change \n$where_clause";
98101
}
99102
}
100103
return $data;
@@ -106,8 +109,9 @@ sub delete {
106109
my $self = shift;
107110
my ($table_name, $clause) = @_;
108111
my $data = '';
109-
112+
110113
if (ref($clause) eq "HASH") {
114+
111115
# my $size_clause = scalar keys %{$clause};
112116
if (exists $clause->{where}) {
113117
my $where_clause = $self->QueryUtil->create_clause($clause);
@@ -120,34 +124,35 @@ sub delete {
120124
# For Query Select :
121125
# ------------------------------------------------------------------------
122126
sub select {
123-
my $self = shift;
127+
my $self = shift;
124128
my $arg_len = scalar @_;
125129
my $data;
126-
130+
127131
$data = $self->_qSelect_arg3(@_) unless ($arg_len < 2);
128132
return $data;
129133
}
130134

131135
# For Query Select Join :
132136
# ------------------------------------------------------------------------
133137
sub select_join {
134-
my $self = shift;
138+
my $self = shift;
135139
my $arg_len = scalar @_;
136-
my $data = '';
137-
140+
my $data = '';
141+
138142
$data = $self->_qSelectJoin_arg3(@_) unless ($arg_len < 3);
139143
return $data;
140144
}
141145

142146
# For Create Table :
143147
# ------------------------------------------------------------------------
144148
sub create_table {
145-
my $self = shift;
149+
my $self = shift;
146150
my $arg_len = scalar @_;
147-
my $result = '';
148-
151+
my $result = '';
152+
149153
if ($arg_len >= 3) {
150-
my $tables = CellBIS::SQL::Abstract::Table->new(db_type => $self->db_type // 'mysql');
154+
my $tables = CellBIS::SQL::Abstract::Table->new(db_type => $self->db_type
155+
// 'mysql');
151156
$result = $tables->create_query_table(@_);
152157
}
153158
return $result;
@@ -158,41 +163,49 @@ sub create_table {
158163
sub _qSelect_arg3 {
159164
my $self = shift;
160165
my ($table_name, $column, $clause) = @_;
161-
my $data = '';
162-
my @col = @{$column};
166+
my $data = '';
167+
my @col = @{$column};
163168
my $size_col = scalar @col;
164-
169+
165170
if (ref($clause) eq "HASH") {
166171
my $field_change;
167172
my $where_clause;
168-
173+
169174
my $size_clause = scalar keys %{$clause};
170-
175+
171176
if ($size_clause != 0) {
172177
$where_clause = $self->QueryUtil->create_clause($clause);
173178
if (scalar @col == 0) {
174-
$data = 'SELECT * FROM '.$table_name . "\n" . $where_clause;
175-
} else {
179+
$data = 'SELECT * FROM ' . $table_name . "\n" . $where_clause;
180+
}
181+
else {
176182
$field_change = ref($column) eq "ARRAY" ? (join ', ', @col) : '*';
177-
$data = 'SELECT '. $field_change . " \nFROM ". $table_name . "\n" . $where_clause;
183+
$data
184+
= 'SELECT '
185+
. $field_change
186+
. " \nFROM "
187+
. $table_name . "\n"
188+
. $where_clause;
178189
}
179-
190+
180191
}
181192
else {
182193
if ($size_col == 0) {
183194
$data = "SELECT * FROM $table_name";
184-
} else {
195+
}
196+
else {
185197
$field_change = join ', ', @col;
186198
$data = "SELECT $field_change FROM $table_name";
187199
}
188200
}
189201
}
190202
else {
191203
my $field_change = '';
192-
204+
193205
if ($size_col == 0) {
194206
$data = "SELECT * FROM $table_name";
195-
} else {
207+
}
208+
else {
196209
$field_change = join ', ', @col;
197210
$data = "SELECT $field_change FROM $table_name";
198211
}
@@ -206,14 +219,14 @@ sub _qSelectJoin_arg3 {
206219
my $self = shift;
207220
my ($table_name, $column, $clause) = @_;
208221
my $data = '';
209-
210-
my $size_col = scalar @{$column};
222+
223+
my $size_col = scalar @{$column};
211224
my $field_change = '';
212225
$field_change = '*' if $size_col == 0;
213226
$field_change = join ', ', @{$column} if $size_col >= 1;
214227
my $where_clause = '';
215-
my $join_clause = '';
216-
228+
my $join_clause = '';
229+
217230
if (ref($clause) eq "HASH") {
218231
if (exists $clause->{join}) {
219232
$join_clause = $self->QueryUtil->for_onjoin($clause, $table_name);
@@ -222,7 +235,7 @@ sub _qSelectJoin_arg3 {
222235
}
223236
else {
224237
$where_clause = $self->QueryUtil->create_clause($clause);
225-
$data = "SELECT $field_change FROM $table_name";
238+
$data = "SELECT $field_change FROM $table_name";
226239
}
227240
}
228241
else {
@@ -233,7 +246,7 @@ sub _qSelectJoin_arg3 {
233246

234247
sub to_one_liner {
235248
my ($self, $result) = @_;
236-
249+
237250
$result =~ s/\t+//g;
238251
$result =~ s/\,\s+/\, /g;
239252
$result =~ s/\s+/ /g;

0 commit comments

Comments
 (0)