Commit Graph

156 Commits

Author SHA1 Message Date
4064656eb5 remove unneeded call to get_xcatcfg
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8642 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2011-01-13 15:36:49 +00:00
4a5060cd39 more improvements
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8634 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2011-01-12 18:54:19 +00:00
b91b558914 remove more database checkes
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8633 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2011-01-12 18:42:03 +00:00
1e45e60ca1 fix more disable checks
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8632 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2011-01-12 16:23:39 +00:00
a00247706b start to merge the disable attribute checkin
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8617 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2011-01-11 19:31:27 +00:00
9d31ce3f41 update getAttribs with delimitcol
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8615 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2011-01-11 18:56:49 +00:00
238834c1a3 update delEntries routine with delimitcols
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8614 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2011-01-11 18:38:06 +00:00
4f575e78a9 convert setNodesAttribs to use delimitcol
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8613 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2011-01-11 16:55:06 +00:00
8b92d602bb update setAttribsWhere with delimitcol
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8609 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2011-01-11 15:59:48 +00:00
96d3ccfa26 fixed setAttribs routine to use new delimitcol routine
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8605 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2011-01-11 15:01:40 +00:00
7c1df1f1a3 interface with delimitcol routine for updateschema
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8604 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2011-01-11 13:56:33 +00:00
9062415f6f add delimitcol routine and change table create to use it. First step in improving database handling logic
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8595 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2011-01-10 17:50:11 +00:00
7c0fdc9641 addNodeAttribs and addAttribs are not used, putting die at start to verify and setup to remove in the future
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8576 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2011-01-06 19:12:45 +00:00
e846724830 fix for 3108066, for PGsql handling of reserve words
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8575 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2011-01-06 19:02:52 +00:00
bc8f7baf29 -Reinstate fix for inadvertent open transactions
-Also suppress cosmetic error about autocommit
-Comment up some things I had to work to remember


git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8557 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2011-01-05 21:33:03 +00:00
a12eb132de revert change to Table.pm per defect 3138015 causes error everytime we start xcatd on DB2
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8425 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-12-15 18:28:10 +00:00
a1e9afb92d -Fix autocommit defaulting for realautocommit
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8330 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-12-06 16:42:34 +00:00
7afadc07fc Correct mistaken checkin
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8329 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-12-06 16:42:01 +00:00
d80f159f4d -Fix autocommit defaulting for realautocommit
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8327 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-12-06 16:40:25 +00:00
9f56d3f04f fix defect 3103756, setNodesAttribs hash input sql does not work for DB2
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8115 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-11-10 13:22:23 +00:00
82795eb88f -Fix for Did not find opening bracket after prefix
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7959 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-10-28 18:39:34 +00:00
c760a04d27 fix for bug 3091008: special case for DB2 SQL statement
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7928 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-10-26 08:11:34 +00:00
c3e5302619 -Fix getNodeAttribs
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7736 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-09-30 14:30:58 +00:00
f3d80d40a1 add support for setting database engine for mysql in Schema
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7459 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-09-15 12:56:05 +00:00
df0a17d223 -Have 'getAllNodeAttribs' honor nodecol
-Have MacMap use getAllNodeAttribs to allow for noderange described switches/inheritence
-Fix getbmcconfig to use a suffix that will pass complexity rules
-Fix getbmcconfig to pass through bmcport even if genpasswords is in use


git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7437 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-09-13 18:54:26 +00:00
31f5cc6e91 fix reuse of variable
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7436 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-09-13 13:05:14 +00:00
9a7b4ff7ff allow underscore in user defined tables and sql file names, note more work needed if want to allow test_x_mysql.pm for a name
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7383 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-09-08 18:58:59 +00:00
32c4db2c46 in updateschema, tabdump and create backup *.csv file before starting to change keys
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7362 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-09-06 12:01:59 +00:00
d3295bc15e move updateschema from Table->new to xcatd
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7335 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-09-01 14:09:38 +00:00
8216a254ad for db2 add logic to move to larger tablespace on add columns in updateschema
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7325 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-31 19:18:47 +00:00
1eeae6603c add DB2 support for adding keys to tables
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7323 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-31 17:23:28 +00:00
b76b8f87a5 fix add columns for db2
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7320 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-31 13:57:24 +00:00
9bea5c5075 honor type statement on keys
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7313 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-30 20:04:27 +00:00
f2fb69f021 add support for array of file names in get_filelist
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7227 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-25 15:18:04 +00:00
e89dd334f0 -Add 'mknum' directive to nodeattribute expansion
-Try Safe module instead of clunky regexes to protect against bad data


git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7213 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-24 20:46:22 +00:00
d1e30c8f7b fix return structure from get_filelist
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7199 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-24 13:27:45 +00:00
dc27bd58d5 change for new syntax in CNM support to get_filelist
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7198 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-24 12:24:45 +00:00
86a1fc10a7 add get_filelist routine for build the appropriate .sql and .pm files to run for the user, needed by xcatd and runsqlfiles
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7191 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-23 18:03:45 +00:00
7b81722d10 remove foreign key logic from buildcreate routine
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7167 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-20 12:53:05 +00:00
5b4ba54a2d Cross your fingers that this makes the million and a half dependant things happy. Changed the output of getNodeAttributes to merge the data from its different groups and to clone entries from one group for each entry in a folowing group with data in it.
I'm just gonna paste the description Jarrod sent to the group via email:

So if getAttribs ever returns more than one result, then getNodeAttribs will have it's output multiplied by that factor.  I'll draw out a table with changes Chris started adding while he was also trying to flatten the recursion.  Let's say 'n1' is in groups 'g1,g2,g3', and that we request columns 'c1,c2,c3,c4'  Let's also assume the primary key is not simply 'node', allowing the node column to contain duplicates (as in switch table).  I don't expect anyone to actually construct something this convoluted in practice, but:

node    |c1     |c2     |c3     |c4
n1      |v1     |       |       |
g2      |       |V2+=   |       |
g2      |       |v3     |v4     |
g3      |       |v5     |       |v6
g3      |       |v7     |v8     |v9

First, we get n1s record:
[
{ node => 'n1',  c1 => 'v1',}
]
We see that c2-c4 are still unsatisfiad, then we check g1, see there is no record, so no action takes place, then getAttribs node=>'g2' returns two records.  As a result, we clone our results so far and independently populate them:
[
{ node => 'n1', c1=> 'v1', c2 => 'v2+=' },
{ node => 'n1', c1 => 'v1', c2=> 'v3', c3 => 'v4'},
]
Now, in the first record, we are still looking to fill in c3, c4, and we are also still looking at c2 to complete the '+=' operation.
In the second record, we only need c4 now, no other columns will be checked for that record.

Then we hit g3.  We also get two results back (two was easier, but arbitrarily many are possible, btw).  Since both records are still looking to be completed, the two become 4 records (if one of the two records were satisfied before this point, the two would have become three instead):

[
{ node => 'n1', c1=> 'v1', c2 => 'v2v5',c4=>'v6' },
{ node => 'n1', c1 => 'v1', c2=> 'v3', c3 => 'v4',c4=>'v6'},
{ node => 'n1', c1=> 'v1', c2 => 'v2v7',c3=>v8,c4=>'v9' },
{ node => 'n1', c1 => 'v1', c2=> 'v3', c3 => 'v4',c4=>'v9'},
]

And that would be what getNodesAttribs would return in this case.




git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7131 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-18 18:14:48 +00:00
34a349cae0 add support for Foreign keys in Schema
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7127 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-18 15:06:17 +00:00
f8c12d6285 fixed nodels to include mutliple results from the same group and to return [undef] when there are no results instead of [{}]
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7087 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-13 14:40:26 +00:00
37640c0498 More DB2/MYSQl fixes to setNodesAttribs
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7071 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-12 16:26:20 +00:00
30553d8b13 -Remove debug output
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7023 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-10 14:08:49 +00:00
b1c06a86ed fix bad problem in creating tables in db2- I introduces
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7022 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-10 13:29:46 +00:00
e82e3f5f8b -Give up after 30 seconds of starvation
-Actually sleep in the retry loop rather than being a busy loop


git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6992 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-06 12:54:41 +00:00
5f21467bca fix setting of types for attributes to invalid types for DB2 as much as possible for now
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6978 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-04 14:17:31 +00:00
9d7014c2ca fix mysql calls in setNodesAtt
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6954 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-03 14:12:05 +00:00
d1f418d1d7 fix changed code in setNodesAttribs for DB2
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6941 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-08-02 13:24:53 +00:00
6cc88808d4 Fixed a problem with missing attributes from getNodeAttributes
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6894 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2010-07-28 16:19:51 +00:00